diff --git a/flake.lock b/flake.lock index 83c762394..33933cc83 100644 --- a/flake.lock +++ b/flake.lock @@ -295,11 +295,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1704846187, - "narHash": "sha256-eCxEI6PXPsxHSTgnnpEg2fxVbGxIn4ZFYX1M394Tcwc=", + "lastModified": 1705105403, + "narHash": "sha256-OzpeU3iYComU+Ep4IPe3z0sYIV4cjBYh3woJQLpRDvM=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "5889a4e063c158261aaad4ad0720ddc4ee6a4a20", + "rev": "126ec4f648711d1b7ddc8b2234ed6fe1568cf40e", "type": "github" }, "original": { @@ -344,11 +344,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1704847818, - "narHash": "sha256-LQzIY21CkCirSSR+7fB5uQjlFGBzCvjA0x/TuPXT3V8=", + "lastModified": 1705107002, + "narHash": "sha256-xwH3x8ljPf+IJDt0lC3p7e3kZu7FWZJ4QyTGBy0BYT4=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "28fceff2ef63b5bd0717371df5500a58ace98ee6", + "rev": "50638506277e495219b732d53b414c06b743e9f4", "type": "github" }, "original": { @@ -820,11 +820,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1704845382, - "narHash": "sha256-nzbV0Z9KIEjglN/I1qNIRvi80y8EqebxLI7hn8EvJMI=", + "lastModified": 1705104600, + "narHash": "sha256-zGLKl+7rq7IFcET1szsc0o1Ul6gogyV7w0b6iXzDLYk=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "518634e42dfbecf2bae7f3af3eb6fa8fe4fcdca2", + "rev": "c74cb02b63524a705900f61363632b336f67c344", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1e1751bf8..6a7d3e080 100644 --- a/flake.nix +++ b/flake.nix @@ -107,7 +107,7 @@ (final: prev: let pkgs = import nixpkgs { inherit system; }; in { - inherit (pkgs) dockerTools node2nix yarn glibcLocalesUtf8 tzdata chromium minio minio-client skopeo; inherit (pkgs.stdenv) fetchurlBoot; + inherit (pkgs) dockerTools yarn yarn2nix glibcLocalesUtf8 tzdata chromium minio minio-client skopeo; inherit (pkgs.stdenv) fetchurlBoot; stack = pkgs.symlinkJoin { inherit (pkgs.stack) name; paths = [pkgs.stack]; diff --git a/shell.nix b/shell.nix index cab597fdb..1147455ea 100644 --- a/shell.nix +++ b/shell.nix @@ -275,7 +275,7 @@ in pkgs.mkShell { ++ (with pkgs; [ stack nodejs_21 yarn postgresql_12 openldap exiftool expat memcached minio minio-client gup reuse pre-commit - node2nix + yarn2nix # busybox # for print services, but interferes with build commands in develop-shell htop pdftk # pdftk just for testing pdf-passwords