Skip to content

Commit

Permalink
build(nix): Bump version of nixpkgs
Browse files Browse the repository at this point in the history
  • Loading branch information
symbiont-daniel-gustafsson committed Apr 12, 2021
1 parent d40707a commit efbc07e
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
6 changes: 3 additions & 3 deletions nix/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
"homepage": "",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "772406c2a4e22a85620854056a4cd02856fa10f0",
"sha256": "0kdckm2wlxdpaslwhlvi6mlbl33p3wcn5677wwmm1anqz7287pap",
"rev": "842f900e73c7ce985218cc4f455e34d1d56475c1",
"sha256": "0ygg3zkvcxy7yhl00d5l07sfpnbld4321qpcw8z68mkc3ncyv3ws",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/772406c2a4e22a85620854056a4cd02856fa10f0.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/842f900e73c7ce985218cc4f455e34d1d56475c1.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}
5 changes: 4 additions & 1 deletion nix/sources.nix
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,10 @@ let
saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name;
ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}";
in
if ersatz == "" then drv else ersatz;
if ersatz == "" then drv else
# this turns the string into an actual Nix path (for both absolute and
# relative paths)
if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}";

# Ports of functions for older nix versions

Expand Down
2 changes: 1 addition & 1 deletion shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pkgs.mkShell {
pythonEnv
fake-lsb-release
mypy
haskell.compiler.ghc8103
haskell.compiler.ghc8104
haskellPackages.cabal-install
haskellPackages.tasty-discover
haskellPackages.cabal-fmt # For formatting .cabal files, example
Expand Down
2 changes: 1 addition & 1 deletion src/ldfi/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ sources ? import ./../../nix/sources.nix
, compiler ? "ghc8103"
, compiler ? "ghc8104"
}:
let
inherit (import sources.gitignore { }) gitignoreSource;
Expand Down
2 changes: 1 addition & 1 deletion src/ltl/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ sources ? import ./../../nix/sources.nix
, compiler ? "ghc8103"
, compiler ? "ghc8104"
}:
let
inherit (import sources.gitignore { }) gitignoreSource;
Expand Down

0 comments on commit efbc07e

Please sign in to comment.