Skip to content

Commit

Permalink
Automated update (#134)
Browse files Browse the repository at this point in the history
  • Loading branch information
infinisil authored Dec 9, 2024
2 parents 4854495 + 0db25ba commit d6f01cf
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 33 deletions.
39 changes: 15 additions & 24 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"
[dependencies]
rnix = "0.11.0"
regex = "1.11.1"
clap = { version = "4.5.21", features = ["derive"] }
clap = { version = "4.5.23", features = ["derive"] }
serde_json = "1.0.133"
tempfile = "3.14.0"
serde = { version = "1.0.215", features = ["derive"] }
Expand Down
10 changes: 5 additions & 5 deletions npins/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"nixpkgs": {
"type": "Channel",
"name": "nixpkgs-unstable",
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.05pre715208.2c15aa59df00/nixexprs.tar.xz",
"hash": "1grhv1ryj80261zf0k92jqpvlwbna2r2r2a48as4fgcihv8sn076"
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.05pre716975.929116e31606/nixexprs.tar.xz",
"hash": "1cprm71jkm2m1s5b94z9s4fbvr0f431dl3qdbvy315s6sd870jfp"
},
"treefmt-nix": {
"type": "Git",
Expand All @@ -14,9 +14,9 @@
"repo": "treefmt-nix"
},
"branch": "main",
"revision": "49717b5af6f80172275d47a418c9719a31a78b53",
"url": "https://github.com/numtide/treefmt-nix/archive/49717b5af6f80172275d47a418c9719a31a78b53.tar.gz",
"hash": "1lqmya394jiycxdz5mpz8s626bsivix14757dl17b9gbag7xr0r4"
"revision": "357cda84af1d74626afb7fb3bc12d6957167cda9",
"url": "https://github.com/numtide/treefmt-nix/archive/357cda84af1d74626afb7fb3bc12d6957167cda9.tar.gz",
"hash": "17x9xlbzy8mjgwz7mandfsqfixaqv6jmsc0w6g5kqysx6gmak8zn"
}
},
"version": 3
Expand Down
10 changes: 7 additions & 3 deletions tests/mock-nixpkgs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,13 @@ let
[ ];

# All the overlays in the right order, including the user-supplied ones
allOverlays = [
autoCalledPackages
] ++ optionalAllPackagesOverlay ++ optionalAliasesOverlay ++ overlays;
allOverlays =
[
autoCalledPackages
]
++ optionalAllPackagesOverlay
++ optionalAliasesOverlay
++ overlays;

# Apply all the overlays in order to the base fixed-point function pkgsFun
f = builtins.foldl' (f: overlay: lib.extends overlay f) pkgsFun allOverlays;
Expand Down

0 comments on commit d6f01cf

Please sign in to comment.