[flake] Add nickel input

This commit is contained in:
Malte Tammena 2022-03-24 08:55:34 +01:00
parent b41bb0bea3
commit 2ea6d9dd48
4 changed files with 112 additions and 1 deletions

View file

@ -294,6 +294,21 @@
"type": "github"
}
},
"flake-utils_3": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"glados": {
"inputs": {
"nixCargoIntegration": "nixCargoIntegration_2"
@ -349,6 +364,21 @@
"type": "github"
}
},
"import-cargo": {
"locked": {
"lastModified": 1594305518,
"narHash": "sha256-frtArgN42rSaEcEOYWg8sVPMUK+Zgch3c+wejcpX3DY=",
"owner": "edolstra",
"repo": "import-cargo",
"rev": "25d40be4a73d40a2572e0cc233b83253554f06c5",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "import-cargo",
"type": "github"
}
},
"mensa": {
"inputs": {
"fenix": "fenix_3",
@ -387,6 +417,29 @@
"type": "github"
}
},
"nickel": {
"inputs": {
"flake-utils": "flake-utils_2",
"import-cargo": "import-cargo",
"nixpkgs": [
"nixpkgs"
],
"pre-commit-hooks": "pre-commit-hooks",
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1648032314,
"narHash": "sha256-aSx/nqJIMzSfN8qQvwHbqDp6I06Qe1oV2YGQbHidVmI=",
"owner": "tweag",
"repo": "nickel",
"rev": "652a304aa48c6b4e00ff964ef8a30ea57e738a93",
"type": "github"
},
"original": {
"id": "nickel",
"type": "indirect"
}
},
"nixCargoIntegration": {
"inputs": {
"devshell": "devshell",
@ -623,6 +676,31 @@
"type": "github"
}
},
"pre-commit-hooks": {
"inputs": {
"flake-utils": [
"nickel",
"flake-utils"
],
"nixpkgs": [
"nickel",
"nixpkgs"
]
},
"locked": {
"lastModified": 1646153636,
"narHash": "sha256-AlWHMzK+xJ1mG267FdT8dCq/HvLCA6jwmx2ZUy5O8tY=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "b6bc0b21e1617e2b07d8205e7fae7224036dfa4b",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"type": "github"
}
},
"qmk-udev-rules": {
"flake": false,
"locked": {
@ -684,6 +762,7 @@
"gruvbox-material-gtk": "gruvbox-material-gtk",
"home-manager": "home-manager",
"mensa": "mensa",
"nickel": "nickel",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_8",
"nixpkgs-wayland": "nixpkgs-wayland",
@ -764,6 +843,31 @@
"type": "github"
}
},
"rust-overlay_2": {
"inputs": {
"flake-utils": [
"nickel",
"flake-utils"
],
"nixpkgs": [
"nickel",
"nixpkgs"
]
},
"locked": {
"lastModified": 1647656634,
"narHash": "sha256-f3VQSat3L2ObJm7DDr72HFCa9e7WAjKPqW70o2Bb7pg=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "a21c163919cd90dd67bcd03345fac5441e53cccc",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rustOverlay": {
"flake": false,
"locked": {
@ -880,7 +984,7 @@
},
"utils_3": {
"inputs": {
"flake-utils": "flake-utils_2"
"flake-utils": "flake-utils_3"
},
"locked": {
"lastModified": 1647259887,

View file

@ -7,6 +7,9 @@
utils.url = "github:gytis-ivaskevicius/flake-utils-plus";
custom-udev-rules.url = "github:MalteT/custom-udev-rules";
nickel = {
inputs.nixpkgs.follows = "nixpkgs";
};
nixpkgs-wayland = {
url = "github:nix-community/nixpkgs-wayland";
inputs.nixpkgs.follows = "nixpkgs";
@ -116,6 +119,7 @@
mensa = inputs.mensa.packages.x86_64-linux.mensa;
# TODO: Replace with upstream
fend = inputs.fend.packages.x86_64-linux.fend;
nickel = inputs.nickel.defaultPackage.x86_64-linux;
})
# Override cataclysm to use git
(import ./overlays/cataclysm-dda.nix)

View file

@ -44,12 +44,14 @@
"nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
"2a-emulator.cachix.org-1:ijJDEqNsMqhamxxWvqOiaCQNoYhWNw7A+gGICgAH1mE="
"colmena.cachix.org-1:7BzpDnjjH8ki2CT3f6GdOk7QAzPOl+1t3LvTLXqYcSg="
"nickel.cachix.org-1:ABoCOGpTJbAum7U6c+04VbjvLxG9f0gJP5kYihRRdQs="
];
substituters = [
"https://cache.nixos.org"
"https://nixpkgs-wayland.cachix.org"
"https://2a-emulator.cachix.org"
"https://colmena.cachix.org"
"https://nickel.cachix.org"
];
};

View file

@ -103,6 +103,7 @@ in {
lutrisWithLibs
mensa
mosh
nickel
patchelf
pavucontrol
pdftk