diff --git a/flake.lock b/flake.lock index af4ad947..f458f8f1 100644 --- a/flake.lock +++ b/flake.lock @@ -115,16 +115,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1675940568, - "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=", + "lastModified": 1708343346, + "narHash": "sha256-qlzHvterVRzS8fS0ophQpkh0rqw0abijHEOAKm0HmV0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6ccc4a59c3f1b56d039d93da52696633e641bc71", + "rev": "9312b935a538684049cb668885e60f15547d4c5f", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", + "ref": "release-23.11", "repo": "nixpkgs", "type": "github" } @@ -172,16 +172,16 @@ "paisano-tui": { "flake": false, "locked": { - "lastModified": 1708336955, - "narHash": "sha256-+pQNeuDe45DMxSNhSrgvivq2u+AuJmhSQ/xEYoezaqM=", + "lastModified": 1708353388, + "narHash": "sha256-RzNQ5P4fdYYAXb5Bmazh5KLjlbeCtyMX7WNiOFsqN68=", "owner": "paisano-nix", "repo": "tui", - "rev": "723a8500840392544889df7a14d0ec1dcecb7f33", + "rev": "db1f97e3d5213e66e5c1251d23d1401d7068b5f5", "type": "github" }, "original": { "owner": "paisano-nix", - "ref": "v0.4.2", + "ref": "v0.4.3", "repo": "tui", "type": "github" } diff --git a/flake.nix b/flake.nix index 18ecb505..8f3bebff 100644 --- a/flake.nix +++ b/flake.nix @@ -5,14 +5,14 @@ { description = "The Nix Flakes framework for perfectionists with deadlines"; # override downstream with inputs.std.inputs.nixpkgs.follows = ... - inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + inputs.nixpkgs.url = "github:nixos/nixpkgs/release-23.11"; inputs.lib.url = "github:nix-community/nixpkgs.lib"; inputs = { paisano.url = "github:paisano-nix/core"; paisano.inputs.nixpkgs.follows = "nixpkgs"; paisano.inputs.yants.follows = "yants"; paisano-tui = { - url = "github:paisano-nix/tui/v0.4.2"; + url = "github:paisano-nix/tui/v0.4.3"; flake = false; # we're after the source code, only }; }; diff --git a/src/local/flake.lock b/src/local/flake.lock index cc6262e1..698d3903 100644 --- a/src/local/flake.lock +++ b/src/local/flake.lock @@ -33,6 +33,7 @@ "devshell": { "inputs": { "nixpkgs": [ + "std", "nixpkgs" ], "systems": "systems" @@ -173,6 +174,7 @@ "inputs": { "flake-utils": "flake-utils", "nixpkgs": [ + "std", "nixpkgs" ] }, @@ -197,6 +199,7 @@ "haumea" ], "nixpkgs": [ + "std", "nixpkgs" ] }, @@ -220,6 +223,7 @@ "flake-utils": "flake-utils_2", "nixago-exts": [], "nixpkgs": [ + "std", "nixpkgs" ] }, @@ -239,16 +243,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1687274257, - "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", + "lastModified": 1708343346, + "narHash": "sha256-qlzHvterVRzS8fS0ophQpkh0rqw0abijHEOAKm0HmV0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5", + "rev": "9312b935a538684049cb668885e60f15547d4c5f", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", + "ref": "release-23.11", "repo": "nixpkgs", "type": "github" } @@ -298,16 +302,16 @@ "paisano-tui": { "flake": false, "locked": { - "lastModified": 1694014205, - "narHash": "sha256-u0+T6vMznzfjDMUd01ZXQsrQPMEhMjrQwUPTFsPBR1k=", + "lastModified": 1708353388, + "narHash": "sha256-RzNQ5P4fdYYAXb5Bmazh5KLjlbeCtyMX7WNiOFsqN68=", "owner": "paisano-nix", "repo": "tui", - "rev": "587ab9fd07bd969d59df73bfe527b5f8a4e752d1", + "rev": "db1f97e3d5213e66e5c1251d23d1401d7068b5f5", "type": "github" }, "original": { "owner": "paisano-nix", - "ref": "0.2.0", + "ref": "v0.4.3", "repo": "tui", "type": "github" } @@ -318,7 +322,6 @@ "n2c": "n2c", "namaka": "namaka", "nixago": "nixago", - "nixpkgs": "nixpkgs", "std": "std" } }, @@ -350,9 +353,7 @@ "nixago": [ "nixago" ], - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "paisano": "paisano", "paisano-tui": "paisano-tui", "terranix": [ @@ -363,12 +364,12 @@ }, "locked": { "lastModified": 0, - "narHash": "sha256-UIgHO0Th/bdamo5H3eamvjczpbnyglRbk4/xZ54g3+c=", - "path": "/nix/store/nmp7kyh862rsc7ghasyk660gkh536w1m-source", + "narHash": "sha256-zWg6A0Qk8yx7rxYeXrG0H8ETFQ6n/moii3EvH/OQR24=", + "path": "/nix/store/c7nj1magdflds2hxhji429g8ihqpyb3c-source", "type": "path" }, "original": { - "path": "/nix/store/nmp7kyh862rsc7ghasyk660gkh536w1m-source", + "path": "/nix/store/c7nj1magdflds2hxhji429g8ihqpyb3c-source", "type": "path" } }, diff --git a/src/local/flake.nix b/src/local/flake.nix index 890da0f5..6315a203 100644 --- a/src/local/flake.nix +++ b/src/local/flake.nix @@ -3,17 +3,16 @@ # injected (private) inputs namaka.url = "github:nix-community/namaka/v0.2.0"; namaka.inputs.haumea.follows = "std/haumea"; - namaka.inputs.nixpkgs.follows = "nixpkgs"; + namaka.inputs.nixpkgs.follows = "std/nixpkgs"; # injected inputs to override std's defaults - nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; devshell.url = "github:numtide/devshell"; - devshell.inputs.nixpkgs.follows = "nixpkgs"; + devshell.inputs.nixpkgs.follows = "std/nixpkgs"; nixago.url = "github:nix-community/nixago"; - nixago.inputs.nixpkgs.follows = "nixpkgs"; + nixago.inputs.nixpkgs.follows = "std/nixpkgs"; nixago.inputs.nixago-exts.follows = ""; n2c.url = "github:nlewo/nix2container"; - n2c.inputs.nixpkgs.follows = "nixpkgs"; + n2c.inputs.nixpkgs.follows = "std/nixpkgs"; # The only purpose of this is to construe the correct follows spec in flake.lock. # `std` will be fully shadowed below @@ -22,8 +21,6 @@ inputs.devshell.follows = "devshell"; inputs.nixago.follows = "nixago"; inputs.n2c.follows = "n2c"; - # we might want to use newer nixpkgs for newer tools - inputs.nixpkgs.follows = "nixpkgs"; }; }; outputs = i: i; diff --git a/src/tests/flake.lock b/src/tests/flake.lock index f98cffbb..f4e29e9c 100644 --- a/src/tests/flake.lock +++ b/src/tests/flake.lock @@ -5,6 +5,7 @@ "flake-parts": "flake-parts", "haskell-flake": "haskell-flake", "nixpkgs": [ + "std", "nixpkgs" ] }, @@ -55,6 +56,7 @@ "devshell": { "inputs": { "nixpkgs": [ + "std", "nixpkgs" ], "systems": "systems" @@ -282,6 +284,7 @@ "makes": { "inputs": { "nixpkgs": [ + "std", "nixpkgs" ] }, @@ -303,6 +306,7 @@ "inputs": { "flake-utils": "flake-utils", "nixpkgs": [ + "std", "nixpkgs" ] }, @@ -324,6 +328,7 @@ "inputs": { "flake-utils": "flake-utils_2", "nixpkgs": [ + "std", "nixpkgs" ] }, @@ -348,6 +353,7 @@ "haumea" ], "nixpkgs": [ + "std", "nixpkgs" ] }, @@ -371,6 +377,7 @@ "flake-utils": "flake-utils_3", "nixago-exts": [], "nixpkgs": [ + "std", "nixpkgs" ] }, @@ -390,16 +397,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1687829761, - "narHash": "sha256-QRe1Y8SS3M4GeC58F/6ajz6V0ZLUVWX3ZAMgov2N3/g=", + "lastModified": 1708343346, + "narHash": "sha256-qlzHvterVRzS8fS0ophQpkh0rqw0abijHEOAKm0HmV0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9790f3242da2152d5aa1976e3e4b8b414f4dd206", + "rev": "9312b935a538684049cb668885e60f15547d4c5f", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "release-23.11", "repo": "nixpkgs", "type": "github" } @@ -467,16 +474,16 @@ "paisano-tui": { "flake": false, "locked": { - "lastModified": 1694014205, - "narHash": "sha256-u0+T6vMznzfjDMUd01ZXQsrQPMEhMjrQwUPTFsPBR1k=", + "lastModified": 1708353388, + "narHash": "sha256-RzNQ5P4fdYYAXb5Bmazh5KLjlbeCtyMX7WNiOFsqN68=", "owner": "paisano-nix", "repo": "tui", - "rev": "587ab9fd07bd969d59df73bfe527b5f8a4e752d1", + "rev": "db1f97e3d5213e66e5c1251d23d1401d7068b5f5", "type": "github" }, "original": { "owner": "paisano-nix", - "ref": "0.2.0", + "ref": "v0.4.3", "repo": "tui", "type": "github" } @@ -491,7 +498,6 @@ "n2c": "n2c", "namaka": "namaka", "nixago": "nixago", - "nixpkgs": "nixpkgs", "std": "std", "terranix": "terranix" } @@ -521,9 +527,7 @@ "nixago": [ "nixago" ], - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "paisano": "paisano", "paisano-tui": "paisano-tui", "terranix": [ @@ -534,12 +538,12 @@ }, "locked": { "lastModified": 0, - "narHash": "sha256-c+krYSi/VpFJZao8RSLCZmC++/r6leLsr4JlCHsT6hY=", - "path": "/nix/store/jy7sjazvkrr0l3v7n7905g987rfk4bw2-source", + "narHash": "sha256-nSZdhIb+95DduiVOTN7xgptmYMZxAKtedNRHV7NOZAI=", + "path": "/nix/store/9hgy6g5i6rg3n0hsg847r0jxliam480b-source", "type": "path" }, "original": { - "path": "/nix/store/jy7sjazvkrr0l3v7n7905g987rfk4bw2-source", + "path": "/nix/store/9hgy6g5i6rg3n0hsg847r0jxliam480b-source", "type": "path" } }, @@ -579,6 +583,7 @@ "bats-support": [], "flake-utils": "flake-utils_4", "nixpkgs": [ + "std", "nixpkgs" ], "terranix-examples": [] diff --git a/src/tests/flake.nix b/src/tests/flake.nix index b6d4e529..76e9ac4b 100644 --- a/src/tests/flake.nix +++ b/src/tests/flake.nix @@ -1,28 +1,27 @@ { inputs = { # injected inputs to override std's defaults - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; devshell.url = "github:numtide/devshell"; - devshell.inputs.nixpkgs.follows = "nixpkgs"; + devshell.inputs.nixpkgs.follows = "std/nixpkgs"; nixago.url = "github:nix-community/nixago"; - nixago.inputs.nixpkgs.follows = "nixpkgs"; + nixago.inputs.nixpkgs.follows = "std/nixpkgs"; nixago.inputs.nixago-exts.follows = ""; n2c.url = "github:nlewo/nix2container"; - n2c.inputs.nixpkgs.follows = "nixpkgs"; + n2c.inputs.nixpkgs.follows = "std/nixpkgs"; terranix.url = "github:terranix/terranix"; - terranix.inputs.nixpkgs.follows = "nixpkgs"; + terranix.inputs.nixpkgs.follows = "std/nixpkgs"; terranix.inputs.terranix-examples.follows = ""; terranix.inputs.bats-support.follows = ""; terranix.inputs.bats-assert.follows = ""; namaka.url = "github:nix-community/namaka/v0.2.0"; namaka.inputs.haumea.follows = "std/haumea"; - namaka.inputs.nixpkgs.follows = "nixpkgs"; + namaka.inputs.nixpkgs.follows = "std/nixpkgs"; makes.url = "github:fluidattacks/makes"; - makes.inputs.nixpkgs.follows = "nixpkgs"; + makes.inputs.nixpkgs.follows = "std/nixpkgs"; arion.url = "github:hercules-ci/arion"; - arion.inputs.nixpkgs.follows = "nixpkgs"; + arion.inputs.nixpkgs.follows = "std/nixpkgs"; microvm.url = "github:astro/microvm.nix"; - microvm.inputs.nixpkgs.follows = "nixpkgs"; + microvm.inputs.nixpkgs.follows = "std/nixpkgs"; flake-parts.url = "github:hercules-ci/flake-parts"; # The only purpose of this is to construe the correct follows spec in flake.lock. @@ -35,8 +34,6 @@ inputs.makes.follows = "makes"; inputs.arion.follows = "arion"; inputs.microvm.follows = "microvm"; - # we might want to use newer nixpkgs for testing - inputs.nixpkgs.follows = "nixpkgs"; }; }; outputs = i: i;