From 6121d9cd59eb5f635bf2422a6f3639856ab1ff29 Mon Sep 17 00:00:00 2001 From: Astro Date: Sat, 17 Sep 2022 01:31:49 +0200 Subject: [PATCH] flake.nix: don't let bevy-julia's naersk.inputs.nixpkgs follow --- flake.lock | 60 ++++++++++++++++++++++++++++++++++++++++-------------- flake.nix | 5 +++-- 2 files changed, 48 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index c7d761d2..1b0d325a 100644 --- a/flake.lock +++ b/flake.lock @@ -23,9 +23,7 @@ }, "bevy-julia": { "inputs": { - "naersk": [ - "naersk" - ], + "naersk": "naersk", "nixpkgs": [ "nixos" ], @@ -294,6 +292,24 @@ } }, "naersk": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1662220400, + "narHash": "sha256-9o2OGQqu4xyLZP9K6kNe1pTHnyPz0Wr3raGYnr9AIgY=", + "owner": "nix-community", + "repo": "naersk", + "rev": "6944160c19cb591eb85bbf9b2f2768a935623ed3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, + "naersk_2": { "inputs": { "nixpkgs": [ "nixos" @@ -313,7 +329,7 @@ "type": "github" } }, - "naersk_2": { + "naersk_3": { "inputs": { "nixpkgs": [ "ticker", @@ -374,7 +390,7 @@ "nix": { "inputs": { "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { @@ -395,7 +411,7 @@ "nix_2": { "inputs": { "lowdown-src": "lowdown-src_2", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-regression": "nixpkgs-regression_2" }, "locked": { @@ -462,18 +478,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1657693803, - "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", + "lastModified": 1663264531, + "narHash": "sha256-2ncO5chPXlTxaebDlhx7MhL0gOEIWxzSyfsl0r0hxQk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", + "rev": "454887a35de6317a30be284e8adc2d2f6d8a07c4", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-22.05-small", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs-mobilizon": { @@ -524,6 +538,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1657693803, + "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.05-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1645296114, "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", @@ -624,7 +654,7 @@ "hydra": "hydra", "hydra-ca": "hydra-ca", "microvm": "microvm", - "naersk": "naersk", + "naersk": "naersk_2", "nixos": "nixos", "nixos-hardware": "nixos-hardware", "nixos-unstable": "nixos-unstable", @@ -787,7 +817,7 @@ "fenix": [ "fenix" ], - "naersk": "naersk_2", + "naersk": "naersk_3", "nixpkgs": [ "nixos" ], diff --git a/flake.nix b/flake.nix index ffd55457..7cb80d3b 100644 --- a/flake.nix +++ b/flake.nix @@ -28,8 +28,9 @@ url = "github:matelab/bevy_julia"; inputs = { nixpkgs.follows = "nixos"; - naersk.follows = "naersk"; - naersk.inputs.nixpkgs.follows = "nixpkgs"; + # breaks the build: + # naersk.follows = "naersk"; + # naersk.inputs.nixpkgs.follows = "nixpkgs"; rust-overlay.follows = "rust-overlay"; }; };