From d717d0dfb1d4aac3b0fd04ece91720598ea509b0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 19 Aug 2016 10:58:14 +0200 Subject: [PATCH] haskell-hans: revert commit 983ab7be1e1e8efe922d076f6c2f1ee7aa27f394 https://github.com/NixOS/nixpkgs/pull/17555 added an override that pins the version of haskellPackages.hans to a specific Git revision. This means that any version updates in the Haskell packages set will have no effect and that our users will be stuck at that (arbitrary) version until the override is removed again. Furthermore, it's bad practice to distribute a package dubbed as version X when it's really version Y! The proper way to fix this issue IMHO is to convince upstream to released a fixed version to Hackage. --- .../haskell-modules/configuration-common.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 782c9335779c..12bfbd475f0d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -945,20 +945,6 @@ self: super: { sha256 = "1yh2g45mkfpwxq0vyzcbc4nbxh6wmb2xpp0k7r5byd8jicgvli29"; }); - # https://github.com/GaloisInc/HaNS/pull/12 - hans = overrideCabal super.hans (drv: { - src = pkgs.fetchFromGitHub { - owner = "GaloisInc"; - repo = "HaNS"; - rev = "53e4af3ee46fc06b31754cec620209a81bbef456"; - sha256 = "079205fqglzhh931h4n7qlrih18117m3w82ih19b8ygr55ps4ldj"; - }; - doHaddock = false; - patches = [(pkgs.fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/GaloisInc/HaNS/pull/12.patch"; - sha256 = "0xa5b7i9wx32ji0zzlh1a1pws677iffby3bg39kv3c9srdb4by1g"; - })]; - }); # GLUT uses `dlopen` to link to freeglut, so we need to set the RUNPATH correctly for # it to find `libglut.so` from the nix store. We do this by patching GLUT.cabal to pkg-config