diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-03-30 13:30:47 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-31 10:13:20 +0000 |
| commit | f2e61678de300336b3666afd19af7565efb0c4cf (patch) | |
| tree | 49f6906c9d557f7fdd58257ff85ec17fc4495f31 /nixpkgs/pkgs/development/compilers/ghcjs/ghcjs-base.nix | |
| parent | f920d5e07c29a9aa1b77d9b88bd604cf1a1f3664 (diff) | |
| parent | 00e27c78d3d2de6964096ceee8d70e5b487365e3 (diff) | |
| download | nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.gz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.bz2 nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.lz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.xz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.zst nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.zip | |
Merge commit '00e27c78d3d2de6964096ceee8d70e5b487365e3'
Conflicts: nixpkgs/nixos/modules/system/boot/systemd.nix nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/pink.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/ghcjs/ghcjs-base.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/ghcjs/ghcjs-base.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/compilers/ghcjs/ghcjs-base.nix b/nixpkgs/pkgs/development/compilers/ghcjs/ghcjs-base.nix index ca0086a918ab..b0c604a4aeac 100644 --- a/nixpkgs/pkgs/development/compilers/ghcjs/ghcjs-base.nix +++ b/nixpkgs/pkgs/development/compilers/ghcjs/ghcjs-base.nix @@ -1,5 +1,5 @@ { mkDerivation, aeson, array, attoparsec, base, binary, bytestring -, containers, deepseq, directory, dlist, fetchgit, ghc-prim +, containers, deepseq, directory, dlist, fetchFromGitHub, ghc-prim , ghcjs-prim, hashable, HUnit, integer-gmp, primitive, QuickCheck , quickcheck-unicode, random, scientific, test-framework , test-framework-hunit, test-framework-quickcheck2, text, time @@ -9,10 +9,11 @@ mkDerivation { pname = "ghcjs-base"; version = "0.2.0.3"; - src = fetchgit { - url = "git://github.com/ghcjs/ghcjs-base"; - sha256 = "15fdkjv0l7hpbbsn5238xxgzfdg61g666nzbv2sgxkwryn5rycv0"; + src = fetchFromGitHub { + owner = "ghcjs"; + repo = "ghcjs-base"; rev = "85e31beab9beffc3ea91b954b61a5d04e708b8f2"; + sha256 = "sha256-YDOfi/WZz/602OtbY8wL5jX3X+9oiGL1WhceCraczZU="; }; libraryHaskellDepends = [ aeson attoparsec base binary bytestring containers deepseq dlist |