diff --git a/flake.lock b/flake.lock index 9701e5c..b64cb03 100644 --- a/flake.lock +++ b/flake.lock @@ -1,146 +1,73 @@ { "nodes": { - "eris": { - "inputs": { - "nixpkgs": [ - "ops", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1678641368, - "narHash": "sha256-MS53Xj3tqpgBOJNeAaYE3SXzbXqIR1Hjvesw9L0gxkQ=", - "ref": "refs/heads/trunk", - "rev": "d1d66d816b59ab18ccd53b8b6e0f410610336bd4", - "revCount": 73, - "type": "git", - "url": "https://codeberg.org/eris/nix-eris" - }, - "original": { - "type": "git", - "url": "https://codeberg.org/eris/nix-eris" - } - }, "flake-utils": { - "locked": { - "lastModified": 1656928814, - "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "gemini": { "inputs": { - "nixpkgs": "nixpkgs" + "systems": "systems" }, "locked": { - "lastModified": 1639155521, - "narHash": "sha256-Lh74QEjPIPZSZNvz1zPKEqEjSA6eIci0eDRoZJKIYeE=", - "owner": "nix-community", - "repo": "flake-gemini", - "rev": "2900f752c983974a03e66077f1e6522764486aed", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { - "id": "gemini", - "type": "indirect" - } - }, - "nixos-hardware": { - "locked": { - "lastModified": 1678397099, - "narHash": "sha256-5xq8YJe+h19TlD+EI4AE/3H3jcCcQ2AWU6CWBVc5tRc=", - "owner": "NixOS", - "repo": "nixos-hardware", - "rev": "556101ff85bd6e20900ec73ee525b935154bc8ea", + "owner": "numtide", + "repo": "flake-utils", "type": "github" - }, - "original": { - "id": "nixos-hardware", - "type": "indirect" } }, "nixpkgs": { "locked": { - "lastModified": 1639153468, - "narHash": "sha256-AXlstb8jjYs8HKGTLOuSjIdFLyPQSI5aYPN34qUy+Rc=", + "lastModified": 1684141842, + "narHash": "sha256-sbdzOwBDcyzz/Dr1ztdF+tElMyM/cgx+4XxVgz+NLRM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf8f41fe116c8e733c833acd4759d9261ecd6d1f", + "rev": "2eb0795720849ae19c068e39b17362d3ebcd585c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-21.11", + "ref": "release-22.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1678470307, - "narHash": "sha256-OEeMUr3ueLIXyW/OaFUX5jUdimyQwMg/7e+/Q0gC/QE=", - "owner": "nixos", + "lastModified": 1682960002, + "narHash": "sha256-5Zjh4pT3lAjFGN1gVrjqj1LLJHKCAlGdLD8raU7oEMc=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c4800d579af4ed98ecc47d464a5e7b0870c4b1f", + "rev": "8670e496ffd093b60e74e7fa53526aa5920d09eb", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "ops": { - "inputs": { - "eris": "eris", - "gemini": "gemini", - "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", - "syndicate": "syndicate" - }, - "locked": { - "lastModified": 1678656750, - "narHash": "sha256-DUAF80An6iEMo8qPuYVpVQfjGBU04qEeXLql5vfzL/Y=", - "ref": "trunk", - "rev": "f56de05100d59da423aa9cd9609621181c6af79f", - "revCount": 776, - "type": "git", - "url": "git://[20a:c3d2:8cf8:f8e5:80fe:9194:3800:87e6]/ops" - }, - "original": { - "id": "ops", + "id": "nixpkgs", "type": "indirect" } }, "root": { "inputs": { - "ops": "ops" + "nixpkgs": "nixpkgs", + "syndicate": "syndicate" } }, "rust": { "inputs": { "flake-utils": "flake-utils", "nixpkgs": [ - "ops", "syndicate", "nixpkgs" ] }, "locked": { - "lastModified": 1663038100, - "narHash": "sha256-DpqF/1FYpUo3Fm54oBaXzdqIG7BuRkHHFOgLM0uVVF0=", + "lastModified": 1682993975, + "narHash": "sha256-LlI5vwUw97NLAwcOYHRLRfhICVdp7MK2KFcUSj0Zwdg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "dbd08f5b5469e1e24f00de45ddc73c26290a2bcb", + "rev": "07f421299826591e2b28e03bbbe19a5292395afe", "type": "github" }, "original": { @@ -151,25 +78,36 @@ }, "syndicate": { "inputs": { - "nixpkgs": [ - "ops", - "nixpkgs" - ], + "nixpkgs": "nixpkgs_2", "rust": "rust" }, "locked": { - "lastModified": 1663517796, - "narHash": "sha256-9ay9RvgR2hh0ClQ8P6NkbJKIz4gmgcT/vZ7qXiK0Hik=", - "ref": "synit", - "rev": "3cf46ea6e18cd72c917a2431b716767481262409", - "revCount": 68, + "lastModified": 1683631238, + "narHash": "sha256-7yk++GfD8/sxOm4DLPK7IpoECVXPJ4exsdYZveisRgE=", + "ref": "refs/heads/trunk", + "rev": "673b2aaf1f6b130d8f9a63d04fd8d88d39509d3c", + "revCount": 78, "type": "git", - "url": "https://git.syndicate-lang.org/ehmry/syndicate-flake" + "url": "https://git.syndicate-lang.org/ehmry/syndicate-flake.git" }, "original": { - "ref": "synit", - "type": "git", - "url": "https://git.syndicate-lang.org/ehmry/syndicate-flake" + "id": "syndicate", + "type": "indirect" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 61f97d7..96a12ee 100644 --- a/flake.nix +++ b/flake.nix @@ -1,12 +1,12 @@ { + inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-22.11"; + description = "Packages pin"; - outputs = { self, ops }: - let - nixpkgs = ops; - inherit (ops.inputs.nixpkgs) lib; + outputs = { self, nixpkgs, syndicate }: + let inherit (nixpkgs) lib; in { - overlay = final: prev: { + overlays.default = final: prev: { tup = let tup' = prev.tup.overrideAttrs ({ patches ? [ ], ... }: { patches = patches ++ [ ./tup.patch ]; }); @@ -17,14 +17,15 @@ ''; }; - legacyPackages = lib.mapAttrs (_: { extend, ... }: extend self.overlay) + legacyPackages = + lib.mapAttrs (_: { extend, ... }: extend self.overlays.default) nixpkgs.legacyPackages; packages = lib.mapAttrs (_: pkgs: { inherit (pkgs) tup; }) self.legacyPackages; devShells = lib.mapAttrs (_: pkgs: - with pkgs.extend self.overlay; { + with pkgs.extend self.overlays.default; { default = mkShell { packages = [ ccacheWrapper gdb tup ]; }; nim = mkShell { packages = [ ccacheWrapper nim-unwrapped nodejs openssl solo5 ]; @@ -44,7 +45,8 @@ movement = mkShell { packages = [ emscripten gcc-arm-embedded python3Minimal ]; }; - simplex_history_actor = mkShell { packages = [ pkg-config sqlcipher ]; }; + simplex_history_actor = + mkShell { packages = [ pkg-config sqlcipher ]; }; zua = mkShell { packages = [ fontconfig pkg-config SDL2 ]; }; }) nixpkgs.legacyPackages;