diff --git a/pix-purenix/flake.lock b/pix-purenix/flake.lock index ef33d0b..8c01b63 100644 --- a/pix-purenix/flake.lock +++ b/pix-purenix/flake.lock @@ -21,27 +21,6 @@ "type": "github" } }, - "deadnix_2": { - "inputs": { - "fenix": "fenix_2", - "naersk": "naersk_2", - "nixpkgs": "nixpkgs_23", - "utils": "utils_5" - }, - "locked": { - "lastModified": 1656370114, - "narHash": "sha256-XBbSWeBuF6Ck0jc634yAp2hjPXWM2JyRDPCdK0dh3w4=", - "owner": "astro", - "repo": "deadnix", - "rev": "9f450f7250ad7680cb5f12ce5985cc18496c2d5f", - "type": "github" - }, - "original": { - "owner": "astro", - "repo": "deadnix", - "type": "github" - } - }, "docs-search": { "flake": false, "locked": { @@ -58,22 +37,6 @@ "type": "github" } }, - "docs-search_2": { - "flake": false, - "locked": { - "lastModified": 1675992564, - "narHash": "sha256-Tk9VSogFHXtXe9O9vuCEfM/PV/S7plMIO0I++fCZn7U=", - "owner": "purs-nix", - "repo": "purescript-docs-search", - "rev": "35822b1d6ce65b1a07f80dd9e2caf15c3ee83e2c", - "type": "github" - }, - "original": { - "owner": "purs-nix", - "repo": "purescript-docs-search", - "type": "github" - } - }, "easy-purescript-nix": { "flake": false, "locked": { @@ -125,25 +88,6 @@ "type": "github" } }, - "fenix_2": { - "inputs": { - "nixpkgs": "nixpkgs_21", - "rust-analyzer-src": "rust-analyzer-src_2" - }, - "locked": { - "lastModified": 1655533500, - "narHash": "sha256-qJJmLVoMYfDLywI9MNL7sb0W/GsKQF9HDatdHm1tSl0=", - "owner": "nix-community", - "repo": "fenix", - "rev": "b6630603af13df17d0dd4df8629e9a24e6ba0fbd", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -281,36 +225,6 @@ "type": "github" } }, - "flake-utils_15": { - "locked": { - "lastModified": 1618217525, - "narHash": "sha256-WGrhVczjXTiswQaoxQ+0PTfbLNeOQM6M36zvLn78AYg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c6169a2772643c4a93a0b5ac1c61e296cba68544", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_16": { - "locked": { - "lastModified": 1618217525, - "narHash": "sha256-WGrhVczjXTiswQaoxQ+0PTfbLNeOQM6M36zvLn78AYg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c6169a2772643c4a93a0b5ac1c61e296cba68544", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flake-utils_2": { "locked": { "lastModified": 1678901627, @@ -446,21 +360,6 @@ "type": "github" } }, - "get-flake_2": { - "locked": { - "lastModified": 1644686428, - "narHash": "sha256-zkhYsURWFrvEZLkIoBeqFBzSu+cA2u5mo6M8vq9LN7M=", - "owner": "ursi", - "repo": "get-flake", - "rev": "703f15558daa56dfae19d1858bb3046afe68831a", - "type": "github" - }, - "original": { - "owner": "ursi", - "repo": "get-flake", - "type": "github" - } - }, "make-shell": { "locked": { "lastModified": 1634940815, @@ -493,38 +392,6 @@ "type": "github" } }, - "make-shell_3": { - "locked": { - "lastModified": 1634940815, - "narHash": "sha256-P69OmveboXzS+es1vQGS4bt+ckwbeIExqxfGLjGuJqA=", - "owner": "ursi", - "repo": "nix-make-shell", - "rev": "8add91681170924e4d0591b22f294aee3f5516f9", - "type": "github" - }, - "original": { - "owner": "ursi", - "ref": "1", - "repo": "nix-make-shell", - "type": "github" - } - }, - "make-shell_4": { - "locked": { - "lastModified": 1634940815, - "narHash": "sha256-P69OmveboXzS+es1vQGS4bt+ckwbeIExqxfGLjGuJqA=", - "owner": "ursi", - "repo": "nix-make-shell", - "rev": "8add91681170924e4d0591b22f294aee3f5516f9", - "type": "github" - }, - "original": { - "owner": "ursi", - "ref": "1", - "repo": "nix-make-shell", - "type": "github" - } - }, "naersk": { "inputs": { "nixpkgs": "nixpkgs_17" @@ -543,24 +410,6 @@ "type": "github" } }, - "naersk_2": { - "inputs": { - "nixpkgs": "nixpkgs_22" - }, - "locked": { - "lastModified": 1655042882, - "narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=", - "owner": "nix-community", - "repo": "naersk", - "rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "naersk", - "type": "github" - } - }, "nix-build-results": { "inputs": { "flake-utils": "flake-utils_3", @@ -818,82 +667,6 @@ "type": "github" } }, - "nixpkgs_20": { - "locked": { - "lastModified": 1646506091, - "narHash": "sha256-sWNAJE2m+HOh1jtXlHcnhxsj6/sXrHgbqVNcVRlveK4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3e644bd62489b516292c816f70bf0052c693b3c7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_21": { - "locked": { - "lastModified": 1655400192, - "narHash": "sha256-49OBVVRgb9H/PSmNT9W61+NRdDbuSJVuDDflwXlaUKU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "3d7435c638baffaa826b85459df0fff47f12317d", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_22": { - "locked": { - "lastModified": 1655481042, - "narHash": "sha256-XHbcywq2vIQ5CeH1OK3TN793jkiNAAZsSctS1PFgseo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "103a4c0ae46afa9cf008c30744175315ca38e9f9", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_23": { - "locked": { - "lastModified": 1655481042, - "narHash": "sha256-XHbcywq2vIQ5CeH1OK3TN793jkiNAAZsSctS1PFgseo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "103a4c0ae46afa9cf008c30744175315ca38e9f9", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_24": { - "locked": { - "lastModified": 1656549732, - "narHash": "sha256-eILutFZGjfk2bEzfim8S/qyYc//0S1KsCeO+OWbtoR0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d3248619647234b5dc74a6921bcdf6dd8323eb22", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_3": { "locked": { "lastModified": 1679271670, @@ -1003,22 +776,6 @@ "type": "github" } }, - "official-package-set-repo": { - "flake": false, - "locked": { - "lastModified": 1686382059, - "narHash": "sha256-s94KOuLWAR72Bel3PffkkdKffrXAv5sdzBDu+SAfaCs=", - "owner": "purescript", - "repo": "package-sets", - "rev": "ed59df71f19626e47e0c0a655357d3973e4a5f92", - "type": "github" - }, - "original": { - "owner": "purescript", - "repo": "package-sets", - "type": "github" - } - }, "package-set-repo": { "inputs": { "flake-utils": "flake-utils_2", @@ -1058,21 +815,6 @@ "type": "github" } }, - "parsec_2": { - "locked": { - "lastModified": 1635533376, - "narHash": "sha256-/HrG0UPGnI5VdkhrNrpDiM2+nhdL6lD/bqyGtYv0QDE=", - "owner": "nprindle", - "repo": "nix-parsec", - "rev": "1bf25dd9c5de1257a1c67de3c81c96d05e8beb5e", - "type": "github" - }, - "original": { - "owner": "nprindle", - "repo": "nix-parsec", - "type": "github" - } - }, "ps-tools": { "inputs": { "deadnix": "deadnix", @@ -1094,27 +836,6 @@ "type": "github" } }, - "ps-tools_2": { - "inputs": { - "deadnix": "deadnix_2", - "make-shell": "make-shell_4", - "nixpkgs": "nixpkgs_24", - "utils": "utils_6" - }, - "locked": { - "lastModified": 1675987041, - "narHash": "sha256-0aHIrngBLXO95SH+PjyTWJ7LWoFdJtx8y6oSln0l5Ak=", - "owner": "purs-nix", - "repo": "purescript-tools", - "rev": "7929148939325f1fed916884c53cad3c0dfa4be7", - "type": "github" - }, - "original": { - "owner": "purs-nix", - "repo": "purescript-tools", - "type": "github" - } - }, "purenix": { "inputs": { "flake-utils": "flake-utils", @@ -1165,22 +886,27 @@ "purs-nix", "nixpkgs" ], - "official-package-set-repo": "official-package-set-repo", "package-set-repo": "package-set-repo", + "ps-tools": [ + "purenix-pkgs", + "purs-nix", + "ps-tools" + ], "purenix": "purenix_6", "purs-nix": "purs-nix", "utils": "utils_4" }, "locked": { - "lastModified": 1686845224, - "narHash": "sha256-QKTMSBkfiQMOU4CfuHLkc1qoEJFD70pyc8lyaZ+fKQM=", + "lastModified": 1689486409, + "narHash": "sha256-+pi7RXZ7bW0Q0Q3NMzfvQcZtiXifvP4MQxr3ZZPxEMQ=", "owner": "klarkc", "repo": "purenix-packages", - "rev": "d55443b6c544d1bdcc7983b7778404c44727dfe7", + "rev": "726f9796331c5db703ce74e3d42e1cc4eb0ffe65", "type": "github" }, "original": { "owner": "klarkc", + "ref": "add-registry", "repo": "purenix-packages", "type": "github" } @@ -1412,45 +1138,19 @@ "type": "github" } }, - "purs-nix_2": { - "inputs": { - "docs-search": "docs-search_2", - "get-flake": "get-flake_2", - "make-shell": "make-shell_3", - "nixpkgs": "nixpkgs_20", - "parsec": "parsec_2", - "ps-tools": "ps-tools_2", - "utils": "utils_7" - }, - "locked": { - "lastModified": 1678328044, - "narHash": "sha256-c62tsBs89dzy8/y1D6KZbbl8bT+kaXbpZE3gwkbzMmg=", - "owner": "purs-nix", - "repo": "purs-nix", - "rev": "789bc800c854c7ce068e0e66a78362625d3043a1", - "type": "github" - }, - "original": { - "owner": "purs-nix", - "ref": "ps-0.14", - "repo": "purs-nix", - "type": "github" - } - }, "root": { "inputs": { "nixpkgs": [ "purenix-pkgs", "nixpkgs" ], - "ps-tools": [ - "purs-nix", - "ps-tools" - ], "purenix": "purenix", "purenix-pkgs": "purenix-pkgs", - "purs-nix": "purs-nix_2", - "utils": "utils_8" + "purs-nix": [ + "purenix-pkgs", + "purs-nix" + ], + "utils": "utils_5" } }, "rust-analyzer-src": { @@ -1470,23 +1170,6 @@ "type": "github" } }, - "rust-analyzer-src_2": { - "flake": false, - "locked": { - "lastModified": 1655507737, - "narHash": "sha256-o+AqNsjL6o2RHh4InZHQVpkmqg570YFJL4Db8mKq+fs=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "12dd81092e37df28b7a3591cae9675e668927198", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "utils": { "locked": { "lastModified": 1653893745, @@ -1559,62 +1242,9 @@ } }, "utils_5": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_6": { "inputs": { "flake-utils": "flake-utils_14" }, - "locked": { - "lastModified": 1656044990, - "narHash": "sha256-f01BB7CaOyntOab9XnpH9HD63rGcnu2iyL4M2ubs5F8=", - "owner": "ursi", - "repo": "flake-utils", - "rev": "f53b674a2c90f6202a2f4cd491aba121775490b5", - "type": "github" - }, - "original": { - "owner": "ursi", - "ref": "8", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_7": { - "inputs": { - "flake-utils": "flake-utils_15" - }, - "locked": { - "lastModified": 1656044990, - "narHash": "sha256-f01BB7CaOyntOab9XnpH9HD63rGcnu2iyL4M2ubs5F8=", - "owner": "ursi", - "repo": "flake-utils", - "rev": "f53b674a2c90f6202a2f4cd491aba121775490b5", - "type": "github" - }, - "original": { - "owner": "ursi", - "ref": "8", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_8": { - "inputs": { - "flake-utils": "flake-utils_16" - }, "locked": { "lastModified": 1658606827, "narHash": "sha256-3kSWTDpV4+uApt/Xd0kv2m7TR1Y6A7SgYUeX86/qYuU=", diff --git a/pix-purenix/flake.nix b/pix-purenix/flake.nix index 6fbbde1..d95222f 100644 --- a/pix-purenix/flake.nix +++ b/pix-purenix/flake.nix @@ -1,10 +1,9 @@ { inputs = { - purenix-pkgs.url = "github:klarkc/purenix-packages"; + purenix-pkgs.url = "github:klarkc/purenix-packages/add-registry"; nixpkgs.follows = "purenix-pkgs/nixpkgs"; - # FIXME purenix-packages is supposed to work with purs 0.15 - purs-nix.url = "github:purs-nix/purs-nix/ps-0.14"; - ps-tools.follows = "purs-nix/ps-tools"; + purs-nix.follows = "purenix-pkgs/purs-nix"; + #ps-tools.follows = "purenix-pkgs/ps-tools"; purenix.url = "github:purenix-org/purenix"; utils.url = "github:ursi/flake-utils"; }; @@ -17,13 +16,13 @@ in utils.apply-systems { inherit inputs systems; } - ({ system, pkgs, purenix-pkgs, ps-tools, ... }: + ({ system, pkgs, purenix-pkgs, ... }: let compile = { codegen = "corefn"; }; purs-nix = inputs.purs-nix { inherit system; defaults = { inherit compile; }; - overlays = [ purenix-pkgs ]; + overlays = [ purenix-pkgs.overlay ]; }; ps = purs-nix.purs { @@ -35,6 +34,8 @@ [ prelude ]; + # use compatible compiler + inherit (purenix-pkgs) purescript; }; prefix = "output"; purenix-output = pkgs.stdenv.mkDerivation @@ -42,7 +43,7 @@ inherit prefix; name = "purenix-output"; src = ps.output { }; - nativeBuildInputs = with pkgs; [ purenix ]; + nativeBuildInputs = with pkgs; [ purenix tree ]; dontInstall = true; postBuild = '' mkdir -p $out @@ -64,8 +65,8 @@ [ (ps.command { inherit compile; }) # optional devShell tools - # ps-tools.for-0_14.purescript-language-server - # ps-tools.for-0_14.purty + # ps-tools.for-0_15.purescript-language-server + # ps-tools.for-0_15.purty # purs-nix.esbuild # purs-nix.purescript # nodejs