Skip to content

Commit

Permalink
build: update nixpkgs to 23.11
Browse files Browse the repository at this point in the history
  • Loading branch information
blaggacao committed Feb 19, 2024
1 parent e31db1b commit 3404827
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 58 deletions.
16 changes: 8 additions & 8 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
};
};
Expand Down
31 changes: 16 additions & 15 deletions src/local/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 4 additions & 7 deletions src/local/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand Down
35 changes: 20 additions & 15 deletions src/tests/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 8 additions & 11 deletions src/tests/flake.nix
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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;
Expand Down

0 comments on commit 3404827

Please sign in to comment.