fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(nix): update nixpkgs

Browse Source
This commit is contained in:
Gregor Kleen 2020-08-24 13:11:34 +02:00
parent 0261b3979d
commit 397078886a
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixpkgs.nix
View File

@ -4,6 +4,7 @@
import ((nixpkgs {}).fetchFromGitHub { import ((nixpkgs {}).fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "nixpkgs"; repo = "nixpkgs";
rev = "0d97ef510bdc9d66f1023f970be58fdab2eb87fa"; rev = "bc00ecedfa709f4fa91d445dd76ecd792cb2c728";
sha256 = "00lnna6097wzrlmwqk8bqayh4qd2gz61zcd4yh7amirqflz3z2ll"; sha256 = "0plhwb04srr4b0h7w8qlqi207a19szz2wqz6r4gmic856jlkchaa";
fetchSubmodules = true;
}) })

5
shell.nix
View File

@ -2,7 +2,8 @@
let let
inherit (nixpkgs {}) pkgs; inherit (nixpkgs {}) pkgs;
haskellPackages = import ./stackage.nix { inherit nixpkgs; }; # haskellPackages = import ./stackage.nix { inherit nixpkgs; };
haskellPackages = pkgs.haskellPackages;
drv = haskellPackages.callPackage ./uniworx.nix {}; drv = haskellPackages.callPackage ./uniworx.nix {};
@ -19,7 +20,7 @@ let
''; '';
override = oldAttrs: { 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 = '' shellHook = ''
export PROMPT_INFO="${oldAttrs.name}" export PROMPT_INFO="${oldAttrs.name}"

3
stack.nix
View File

@ -1,7 +1,8 @@
{ ghc, nixpkgs ? import ./nixpkgs.nix {} }: { ghc, nixpkgs ? import ./nixpkgs.nix {} }:
let let
haskellPackages = import ./stackage.nix { inherit nixpkgs; }; # haskellPackages = import ./stackage.nix { inherit nixpkgs; };
haskellPackages = pkgs.haskellPackages;
inherit (nixpkgs {}) pkgs; inherit (nixpkgs {}) pkgs;
in pkgs.haskell.lib.buildStackProject { in pkgs.haskell.lib.buildStackProject {
inherit ghc; inherit ghc;

1
stack.yaml
View File

@ -4,6 +4,7 @@ nix:
packages: [] packages: []
pure: false pure: false
shell-file: ./stack.nix shell-file: ./stack.nix
add-gc-roots: true
extra-package-dbs: [] extra-package-dbs: []