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:26:01 +00:00 committed by Lucas
parent d2dbae1cbf
commit c6253d6074
3 changed files with 890 additions and 880 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1651
Cargo.nix generated vendored
View File

File diff suppressed because it is too large Load Diff

107
flake.lock generated vendored
View File

@ -3,8 +3,12 @@
"cargo2nix": { "cargo2nix": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-utils": "flake-utils", "flake-utils": [
"nixpkgs": "nixpkgs", "flake-utils"
],
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
@ -24,15 +28,15 @@
}, },
"devshell": { "devshell": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1678957337, "lastModified": 1682700442,
"narHash": "sha256-Gw4nVbuKRdTwPngeOZQOzH/IFowmz4LryMPDiJN/ah4=", "narHash": "sha256-qjaAAcCYgp1pBBG7mY9z95ODUBZMtUpf0Qp3Gt/Wha0=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "3e0e60ab37cd0bf7ab59888f5c32499d851edb47", "rev": "fb6673fe9fe4409e3f43ca86968261e970918a83",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -58,21 +62,6 @@
} }
}, },
"flake-utils": { "flake-utils": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"locked": { "locked": {
"lastModified": 1642700792, "lastModified": 1642700792,
"narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
@ -87,23 +76,25 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "flake-utils_2": {
"inputs": {
"systems": "systems"
},
"locked": { "locked": {
"lastModified": 1682109264, "lastModified": 1681202837,
"narHash": "sha256-z8qXEYVPGarBZud/bETBEGblJAQ28EX/Uy9PWH8EYRQ=", "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "nixos", "owner": "numtide",
"repo": "nixpkgs", "repo": "flake-utils",
"rev": "abd6db5708e12c2c5e5c42076b195a04c6032ba2", "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "numtide",
"ref": "release-22.05", "repo": "flake-utils",
"repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1677383253, "lastModified": 1677383253,
"narHash": "sha256-UfpzWfSxkfXHnb4boXZNaKsAcUrZT9Hw+tao1oZxd08=", "narHash": "sha256-UfpzWfSxkfXHnb4boXZNaKsAcUrZT9Hw+tao1oZxd08=",
@ -119,18 +110,27 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1682773483,
"narHash": "sha256-FN7Zf+gQpYQUzt9LeJv6yGnvbqaBb97RjFtNnfu9OB4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d7fa40f31e8c8fa46f5d06b0cd0cb02f0d4c3fa0",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"cargo2nix": "cargo2nix", "cargo2nix": "cargo2nix",
"devshell": "devshell", "devshell": "devshell",
"flake-utils": [ "flake-utils": "flake-utils_2",
"cargo2nix", "nixpkgs": "nixpkgs_2",
"flake-utils"
],
"nixpkgs": [
"cargo2nix",
"nixpkgs"
],
"unstable": "unstable" "unstable": "unstable"
} }
}, },
@ -146,11 +146,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1673490397, "lastModified": 1653878966,
"narHash": "sha256-VCSmIYJy/ZzTvEGjdfITmTYfybXBgZpMjyjDndbou+8=", "narHash": "sha256-T51Gck/vrJZi1m+uTbhEFTRgZmE59sydVONadADv358=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "0833f4d063a2bb75aa31680f703ba594a384ffe6", "rev": "8526d618af012a923ca116be9603e818b502a8db",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -159,13 +159,28 @@
"type": "github" "type": "github"
} }
}, },
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1682504783, "lastModified": 1682773483,
"narHash": "sha256-XZX9IKaZvW6DbVwQTJBTlT8GUSmFp/H76k3xR4/s8HY=", "narHash": "sha256-FN7Zf+gQpYQUzt9LeJv6yGnvbqaBb97RjFtNnfu9OB4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "92d5bc4563c80647228696d6cf5d6d11b7a430a7", "rev": "d7fa40f31e8c8fa46f5d06b0cd0cb02f0d4c3fa0",
"type": "github" "type": "github"
}, },
"original": { "original": {

12
flake.nix
View File

@ -6,9 +6,13 @@
# #
{ {
inputs = { inputs = {
cargo2nix.url = "github:cargo2nix/cargo2nix/release-0.11.0"; cargo2nix = {
flake-utils.follows = "cargo2nix/flake-utils"; url = "github:cargo2nix/cargo2nix/release-0.11.0";
nixpkgs.follows = "cargo2nix/nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
flake-utils.url = "github:numtide/flake-utils";
nixpkgs.url = "github:nixos/nixpkgs";
devshell.url = "github:numtide/devshell"; devshell.url = "github:numtide/devshell";
unstable.url = "github:nixos/nixpkgs"; unstable.url = "github:nixos/nixpkgs";
}; };
@ -31,7 +35,7 @@
deno = unstable.legacyPackages.${system}.deno; deno = unstable.legacyPackages.${system}.deno;
rustPkgs = pkgs.rustBuilder.makePackageSet { rustPkgs = pkgs.rustBuilder.makePackageSet {
rustVersion = "1.66.1"; rustVersion = "1.69.0";
packageFun = import ./Cargo.nix; packageFun = import ./Cargo.nix;
}; };