flake update

This commit is contained in:
Robin Appelman 2025-10-27 00:20:12 +01:00
commit df19787ac6
2 changed files with 47 additions and 60 deletions

89
flake.lock generated
View file

@ -1,46 +1,66 @@
{ {
"nodes": { "nodes": {
"flakelight": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1761420461,
"narHash": "sha256-gXjG2PzDOcORQkPMybYqA2fnPWYAeKWb17elDI6q/Fg=",
"owner": "nix-community",
"repo": "flakelight",
"rev": "82054a2d93c13188997e30b0697f0708f16d4752",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "flakelight",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1699646590, "lastModified": 1761516808,
"narHash": "sha256-f81xS0qN6H1ULTyArpZgdjsly4FY0BnvPXdmSb7hq+o=", "narHash": "sha256-4ZdXt+vhA+qyE/TNCp16v2sBJyr0pteKqgiLTXxM4eU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1d55765508b8316798429875712dc1ef5e62a2fa", "rev": "2ab7841f414ccdefea889707b2d5e4b32cda9729",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "release-23.05", "ref": "release-25.05",
"type": "indirect" "type": "indirect"
} }
}, },
"root": { "root": {
"inputs": { "inputs": {
"flakelight": "flakelight",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"spire": "spire", "spire": "spire",
"utils": "utils_2" "utils": "utils"
} }
}, },
"spire": { "spire": {
"inputs": { "inputs": {
"nixpkgs": [ "flakelight": [
"nixpkgs" "flakelight"
], ]
"utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1699654291, "lastModified": 1750433696,
"narHash": "sha256-+hzjb53GoBqtba9uwBwcEbaDeztjmiQGSDkWndDDduY=", "narHash": "sha256-UVtSgRUzgHKUWcjsVQQM/6J8x35ly/7+P9/xbXeGLtc=",
"owner": "spiretf", "ref": "refs/heads/main",
"repo": "nix", "rev": "f3b763c6b9c0c31924ac2ba1b6541c2b08ed9852",
"rev": "2c9023b27e01d6119688792fee7707ba7854c1ad", "revCount": 33,
"type": "github" "type": "git",
"url": "https://codeberg.org/spire/nix"
}, },
"original": { "original": {
"owner": "spiretf", "type": "git",
"repo": "nix", "url": "https://codeberg.org/spire/nix"
"type": "github"
} }
}, },
"systems": { "systems": {
@ -58,43 +78,10 @@
"type": "github" "type": "github"
} }
}, },
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": { "utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
}, },
"locked": {
"lastModified": 1687709756,
"narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": { "locked": {
"lastModified": 1694529238, "lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",

View file

@ -1,26 +1,26 @@
{ {
inputs = { inputs = {
utils.url = "github:numtide/flake-utils"; utils.url = "github:numtide/flake-utils";
nixpkgs.url = "nixpkgs/release-23.05"; nixpkgs.url = "nixpkgs/release-25.05";
spire.url = "github:spiretf/nix"; flakelight.url = "github:nix-community/flakelight";
spire.inputs.nixpkgs.follows = "nixpkgs"; spire.url = "git+https://codeberg.org/spire/nix";
spire.inputs.flake-utils.follows = "utils"; flakelight.inputs.nixpkgs.follows = "nixpkgs";
spire.inputs.flakelight.follows = "flakelight";
}; };
outputs = { outputs = {
self,
nixpkgs, nixpkgs,
utils, utils,
spire, spire,
...
}: }:
utils.lib.eachSystem spire.systems (system: let utils.lib.eachSystem ["x86_64-linux" "i686-linux"] (system: let
overlays = [spire.overlays.default]; overlays = [spire.overlays.default];
pkgs = (import nixpkgs) { pkgs = (import nixpkgs) {
inherit system overlays; inherit system overlays;
}; };
inherit (pkgs) lib;
spEnv = pkgs.sourcepawn.buildEnv (with pkgs.sourcepawn.includes; [sourcemod curl]); spEnv = pkgs.sourcepawn.buildEnv (with pkgs.sourcepawn.includes; [sourcemod curl]);
in rec { in {
packages = rec { packages = rec {
mapdownloader = pkgs.buildSourcePawnScript { mapdownloader = pkgs.buildSourcePawnScript {
name = "mapdownloader"; name = "mapdownloader";
@ -30,7 +30,7 @@
default = mapdownloader; default = mapdownloader;
}; };
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
nativeBuildInputs = with pkgs; [spEnv]; nativeBuildInputs = [spEnv];
}; };
}); });
} }