waalge
/
aiken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bump flake and change inputs

This commit is contained in:
waalge 2023-04-29 13:58:31 +00:00 committed by Lucas
parent c6253d6074
commit d19fc5b7a3
2 changed files with 55 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
flake.lock generated vendored
View File

@ -9,7 +9,9 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"rust-overlay": "rust-overlay" "rust-overlay": [
"rust-overlay"
]
}, },
"locked": { "locked": {
"lastModified": 1655189312, "lastModified": 1655189312,
@ -94,6 +96,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1677383253, "lastModified": 1677383253,
@ -125,32 +145,42 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": {
"locked": {
"lastModified": 1681358109,
"narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"cargo2nix": "cargo2nix", "cargo2nix": "cargo2nix",
"devshell": "devshell", "devshell": "devshell",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"unstable": "unstable" "rust-overlay": "rust-overlay"
} }
}, },
"rust-overlay": { "rust-overlay": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": "flake-utils_3",
"cargo2nix", "nixpkgs": "nixpkgs_3"
"flake-utils"
],
"nixpkgs": [
"cargo2nix",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1653878966, "lastModified": 1682734733,
"narHash": "sha256-T51Gck/vrJZi1m+uTbhEFTRgZmE59sydVONadADv358=", "narHash": "sha256-oAoNMgWQveSF1Vv16OJ2GVU+BGGdzazTHpPu/VKy/BQ=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "8526d618af012a923ca116be9603e818b502a8db", "rev": "0bb45c519ebd64f6b4223e1bb6b4e08df80834ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -174,18 +204,18 @@
"type": "github" "type": "github"
} }
}, },
"unstable": { "systems_2": {
"locked": { "locked": {
"lastModified": 1682773483, "lastModified": 1681028828,
"narHash": "sha256-FN7Zf+gQpYQUzt9LeJv6yGnvbqaBb97RjFtNnfu9OB4=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nixos", "owner": "nix-systems",
"repo": "nixpkgs", "repo": "default",
"rev": "d7fa40f31e8c8fa46f5d06b0cd0cb02f0d4c3fa0", "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nix-systems",
"repo": "nixpkgs", "repo": "default",
"type": "github" "type": "github"
} }
} }

7
flake.nix
View File

@ -10,20 +10,21 @@
url = "github:cargo2nix/cargo2nix/release-0.11.0"; url = "github:cargo2nix/cargo2nix/release-0.11.0";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils"; inputs.flake-utils.follows = "flake-utils";
inputs.rust-overlay.follows = "rust-overlay";
}; };
rust-overlay.url = "github:oxalica/rust-overlay";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
nixpkgs.url = "github:nixos/nixpkgs"; nixpkgs.url = "github:nixos/nixpkgs";
devshell.url = "github:numtide/devshell"; devshell.url = "github:numtide/devshell";
unstable.url = "github:nixos/nixpkgs";
}; };
outputs = { outputs = {
self, self,
cargo2nix, cargo2nix,
rust-overlay,
nixpkgs, nixpkgs,
flake-utils, flake-utils,
devshell, devshell,
unstable,
}: }:
flake-utils.lib.eachDefaultSystem ( flake-utils.lib.eachDefaultSystem (
system: let system: let
@ -32,7 +33,7 @@
overlays = [cargo2nix.overlays.default devshell.overlays.default]; overlays = [cargo2nix.overlays.default devshell.overlays.default];
}; };
deno = unstable.legacyPackages.${system}.deno; deno = nixpkgs.legacyPackages.${system}.deno;
rustPkgs = pkgs.rustBuilder.makePackageSet { rustPkgs = pkgs.rustBuilder.makePackageSet {
rustVersion = "1.69.0"; rustVersion = "1.69.0";