diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-02-22 18:01:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-22 18:01:22 +0000 |
| commit | 631007df410b6b62237dc16f096351af092b9b8d (patch) | |
| tree | 0afd3b4181fa82f6df10005cd09cc0904bd661cf /pkgs/development/compilers | |
| parent | 0388cc6aa423c4134f802e87f81c5df2bb3838ec (diff) | |
| parent | 125f3f7d6db5ba92574bb92a1d8eea82b4b6eda0 (diff) | |
| download | nixpkgs-631007df410b6b62237dc16f096351af092b9b8d.tar nixpkgs-631007df410b6b62237dc16f096351af092b9b8d.tar.gz nixpkgs-631007df410b6b62237dc16f096351af092b9b8d.tar.bz2 nixpkgs-631007df410b6b62237dc16f096351af092b9b8d.tar.lz nixpkgs-631007df410b6b62237dc16f096351af092b9b8d.tar.xz nixpkgs-631007df410b6b62237dc16f096351af092b9b8d.tar.zst nixpkgs-631007df410b6b62237dc16f096351af092b9b8d.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/elm/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/nim/default.nix | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 149d8115054..ab19ac42d24 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -7,7 +7,7 @@ let fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { }; - hsPkgs = self: pkgs.haskellPackages.override { + hsPkgs = self: pkgs.haskell.packages.ghc8107.override { overrides = self: super: with pkgs.haskell.lib.compose; with lib; let elmPkgs = rec { elm = overrideCabal (drv: { @@ -200,4 +200,3 @@ in lib.makeScope pkgs.newScope (self: with self; { inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse elm-git-install; }) ) - diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 06b19b547b6..4f3b200477f 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -98,12 +98,12 @@ in { nim-unwrapped = stdenv.mkDerivation rec { pname = "nim-unwrapped"; - version = "1.6.2"; + version = "1.6.4"; strictDeps = true; src = fetchurl { url = "https://nim-lang.org/download/nim-${version}.tar.xz"; - hash = "sha256-msRxT6bDFdaR2n9diUHBsZDU1Dc5fZdC4yfC1RiT43M="; + hash = "sha256-f8MJKFW1wiAM2f7tEz0EYFgj8lDXO01KxQEwA3DgoMI="; }; buildInputs = [ boehmgc openssl pcre readline sqlite ]; |