Unverified Commit fe6d94b8 authored by Vladimír Čunát's avatar Vladimír Čunát Committed by GitHub
Browse files

Revert "haskellPackages: update stackage and hackage"

parent 8991dc8e

doc/languages-frameworks/haskell.section.md

+2 −2
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ Available compilers are collected under `haskell.compiler`. 
Each of those compiler versions has a corresponding attribute set `packages` built with

it. However, the non-standard package sets are not tested regularly and, as a

result, contain fewer working packages. The corresponding package set for GHC

9.4.5 is `haskell.packages.ghc945`. In fact `haskellPackages` (at the time of writing) is just an alias

for `haskell.packages.ghc966`:

9.4.5 is `haskell.packages.ghc945`. In fact `haskellPackages` is just an alias

for `haskell.packages.ghc964`:



Every package set also re-exposes the GHC used to build its packages as `haskell.packages.*.ghc`.

pkgs/applications/editors/yi/wrapper.nix

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
# To use this for hacking of your Yi config file, drop into a shell

# with env attribute.

{

  lib,

  stdenv,

  makeWrapper,

  haskellPackages,

  extraPackages ? (s: [ ]),

}:

let

  yiEnv = haskellPackages.ghcWithPackages (self: [ self.yi ] ++ extraPackages self);

in

stdenv.mkDerivation {

  pname = "yi-custom";

  dontUnpack = true;

  nativeBuildInputs = [ makeWrapper ];



  buildCommand = ''

    mkdir -p $out/bin

    makeWrapper ${haskellPackages.yi}/bin/yi $out/bin/yi \

      --set NIX_GHC ${yiEnv}/bin/ghc

  '';



  # For hacking purposes

  passthru.env = yiEnv;



  inherit (haskellPackages.yi) meta version;

}

pkgs/by-name/oa/oama/package.nix

+8 −1
Original line number Diff line number Diff line
@@ -15,7 +15,14 @@ let 
    passthru.updateScript = ./update.sh;

  };



  raw-pkg = haskellPackages.callPackage ./generated-package.nix { };

  raw-pkg = (haskellPackages.callPackage ./generated-package.nix { }).overrideScope (

    final: prev: {

      # Dependency twain requires an older version of http2, and we cannot mix

      # versions of transitive dependencies.

      http2 = final.http2_3_0_3;

      warp = final.warp_3_3_30;

    }

  );

in

lib.pipe raw-pkg [

  (overrideCabal overrides)

pkgs/data/misc/hackage/pin.json

+4 −4
Original line number Diff line number Diff line 
{

  "commit": "0b0765b206e909965c9a65d28e87ebc9aae4d8af",

  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0b0765b206e909965c9a65d28e87ebc9aae4d8af.tar.gz",

  "sha256": "1rh4jmbj2v4n1lf8cv8qkj5rx10gjib2cmfsdxaf2d3n0c4cr4bn",

  "msg": "Update from Hackage at 2024-10-25T11:10:52Z"

  "commit": "750067bc36e810a96c066c8800438e0ce9ced327",

  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/750067bc36e810a96c066c8800438e0ce9ced327.tar.gz",

  "sha256": "1bfr8r14rkisjp1f3iln12h4f5n66k8wkk09jvk7adal4grlpjny",

  "msg": "Update from Hackage at 2024-10-05T14:46:54Z"

}

pkgs/development/compilers/ghc/head.nix

+3 −3
Original line number Diff line number Diff line 
import ./common-hadrian.nix {

  version = "9.13.20241031";

  rev = "0b11cdc022ce33d089db95b2b2e7c1f4bb326d37";

  sha256 = "0kqnpcgv49ricbr950lffs8gx7jrcg6anzc0qvwy5pb518w0d37i";

  version = "9.11.20240423";

  rev = "dddc9dff0547733a10e7f505612ab9df3a7c21b6";

  sha256 = "0993sdmzzyymllck8mcpa1zgrjqjfxcvk1ykvfc18bvbs4145cm9";

}