diff --git a/flake.lock b/flake.lock index b5aaa86bd..e7db699df 100644 --- a/flake.lock +++ b/flake.lock @@ -448,6 +448,22 @@ "type": "github" } }, + "nixpkgs-recent": { + "locked": { + "lastModified": 1669833724, + "narHash": "sha256-/HEZNyGbnQecrgJnfE8d0WC5c1xuPSD2LUpB6YXlg4c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4d2b37a84fad1091b9de401eb450aae66f1a741e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "22.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1628785280, @@ -466,16 +482,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1628785280, - "narHash": "sha256-2B5eMrEr6O8ff2aQNeVxTB+9WrGE80OB4+oM6T7fOcc=", + "lastModified": 1622516815, + "narHash": "sha256-ZjBd81a6J3TwtlBr3rHsZspYUwT9OdhDk+a/SgSEf7I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6525bbc06a39f26750ad8ee0d40000ddfdc24acb", + "rev": "7e9b0dff974c89e070da1ad85713ff3c20b0ca97", "type": "github" }, "original": { "owner": "NixOS", - "ref": "6525bbc06a39f26750ad8ee0d40000ddfdc24acb", + "ref": "21.05", "repo": "nixpkgs", "type": "github" } @@ -513,6 +529,7 @@ "memcached-binary": "memcached-binary", "minio-hs": "minio-hs", "nixpkgs": "nixpkgs_2", + "nixpkgs-recent": "nixpkgs-recent", "serversession": "serversession", "xss-sanitize": "xss-sanitize", "yesod": "yesod", diff --git a/flake.nix b/flake.nix index 161000fe7..7ac27f64c 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,14 @@ type = "github"; owner = "NixOS"; repo = "nixpkgs"; - ref = "6525bbc06a39f26750ad8ee0d40000ddfdc24acb"; + # ref = "6525bbc06a39f26750ad8ee0d40000ddfdc24acb"; + ref = "21.05"; + }; + nixpkgs-recent = { + type = "github"; + owner = "NixOS"; + repo = "nixpkgs"; + ref = "22.11"; }; flake-utils = { type = "github"; @@ -84,7 +91,7 @@ }; }; - outputs = inputs@{ self, nixpkgs, docker-nixpkgs, flake-utils, haskell-nix, ... }: flake-utils.lib.eachSystem ["x86_64-linux"] + outputs = inputs@{ self, nixpkgs, nixpkgs-recent, docker-nixpkgs, flake-utils, haskell-nix, ... }: flake-utils.lib.eachSystem ["x86_64-linux"] (system: let frontendSource = pkgs.lib.sourceByRegex ./. [ "^(assets|frontend)(/.*)?$" @@ -111,6 +118,10 @@ overlays = [ (import "${docker-nixpkgs}/overlay.nix") + (final: prev: let + pkgs-recent = import nixpkgs-recent { inherit system; }; + in { inherit (pkgs-recent) dockerTools node2nix stack; inherit (pkgs-recent.stdenv) fetchurlBoot; }) + (import ./nix/maildev) haskell-nix.overlay (import ./nix/uniworx { inherit inputs frontendSource backendSource; gitRevision = if self ? rev then self.rev else null; }) diff --git a/nix/frontend/default.nix b/nix/frontend/default.nix index 30650db51..fa4b2bf86 100644 --- a/nix/frontend/default.nix +++ b/nix/frontend/default.nix @@ -14,7 +14,6 @@ let }; in import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit (pkgs.stdenv) fetchurlBoot; + inherit (pkgs) fetchurl fetchurlBoot nix-gitignore stdenv lib fetchgit; inherit nodeEnv; } diff --git a/nix/frontend/node-packages.nix b/nix/frontend/node-packages.nix index 6c66ff114..d985d3771 100644 --- a/nix/frontend/node-packages.nix +++ b/nix/frontend/node-packages.nix @@ -1270,7 +1270,7 @@ let version = "6.1.1"; src = fetchurlBoot { url = "https://npm.fontawesome.com/@fortawesome/fontawesome-pro/-/6.1.1/fontawesome-pro-6.1.1.tgz"; - sha256 = "Pq+n8YWCwwQ9B1Etfqs5sypghBMPWPAJFQ49UAlnS18="; + hash = "sha256-Pq+n8YWCwwQ9B1Etfqs5sypghBMPWPAJFQ49UAlnS18="; }; }; "@humanwhocodes/config-array-0.9.5" = { diff --git a/shell.nix b/shell.nix index c7e1f9f8d..9d891d877 100644 --- a/shell.nix +++ b/shell.nix @@ -273,9 +273,9 @@ in pkgs.mkShell { ''; nativeBuildInputs = [develop inDevelop killallUni2work diffRunning] ++ (with pkgs; - [ nodejs-14_x postgresql_12 openldap exiftool memcached minio minio-client + [ stack nodejs-14_x postgresql_12 openldap exiftool memcached minio minio-client gup reuse pre-commit - # node2nix + node2nix # busybox # for print services, but interferes with build commands in develop-shell htop pdftk # pdftk just for testing pdf-passwords @@ -290,5 +290,5 @@ in pkgs.mkShell { ; }) ] - ) ++ (with pkgs.haskellPackages; [ stack yesod-bin hlint cabal-install weeder profiteur ]); + ) ++ (with pkgs.haskellPackages; [ yesod-bin hlint cabal-install weeder profiteur ]); }