chore(nix): update nixpkgs
This commit is contained in:
parent
0261b3979d
commit
397078886a
@ -4,6 +4,7 @@
|
||||
import ((nixpkgs {}).fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "nixpkgs";
|
||||
rev = "0d97ef510bdc9d66f1023f970be58fdab2eb87fa";
|
||||
sha256 = "00lnna6097wzrlmwqk8bqayh4qd2gz61zcd4yh7amirqflz3z2ll";
|
||||
rev = "bc00ecedfa709f4fa91d445dd76ecd792cb2c728";
|
||||
sha256 = "0plhwb04srr4b0h7w8qlqi207a19szz2wqz6r4gmic856jlkchaa";
|
||||
fetchSubmodules = true;
|
||||
})
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
|
||||
let
|
||||
inherit (nixpkgs {}) pkgs;
|
||||
haskellPackages = import ./stackage.nix { inherit nixpkgs; };
|
||||
# haskellPackages = import ./stackage.nix { inherit nixpkgs; };
|
||||
haskellPackages = pkgs.haskellPackages;
|
||||
|
||||
drv = haskellPackages.callPackage ./uniworx.nix {};
|
||||
|
||||
@ -19,7 +20,7 @@ let
|
||||
'';
|
||||
|
||||
override = oldAttrs: {
|
||||
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ (with pkgs; [ nodejs-13_x postgresql openldap google-chrome exiftool memcached minio minio-client ]) ++ (with pkgs.haskellPackages; [ stack yesod-bin hlint cabal-install weeder profiteur ]);
|
||||
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ (with pkgs; [ nodejs-14_x postgresql openldap google-chrome exiftool memcached minio minio-client ]) ++ (with pkgs.haskellPackages; [ stack yesod-bin hlint cabal-install weeder profiteur ]);
|
||||
shellHook = ''
|
||||
export PROMPT_INFO="${oldAttrs.name}"
|
||||
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
{ ghc, nixpkgs ? import ./nixpkgs.nix {} }:
|
||||
|
||||
let
|
||||
haskellPackages = import ./stackage.nix { inherit nixpkgs; };
|
||||
# haskellPackages = import ./stackage.nix { inherit nixpkgs; };
|
||||
haskellPackages = pkgs.haskellPackages;
|
||||
inherit (nixpkgs {}) pkgs;
|
||||
in pkgs.haskell.lib.buildStackProject {
|
||||
inherit ghc;
|
||||
|
||||
@ -4,6 +4,7 @@ nix:
|
||||
packages: []
|
||||
pure: false
|
||||
shell-file: ./stack.nix
|
||||
add-gc-roots: true
|
||||
|
||||
extra-package-dbs: []
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user