gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stack: unset pin to Stackage LTS

Browse Source
This commit is contained in:
Dennis Gosnell
2023-07-26 11:49:49 +09:00
parent 6f41cccb9e
commit 645dfb80b8
4 changed files with 2 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/haskell-modules/configuration-common.nix
+1 -36
View File
@@ -1164,44 +1164,9 @@ self: super: {
jailbreak = assert drv.version == "1.0.9" && drv.revision == "1"; true;
}) super.dhall-nixpkgs);
stack_2_11_1 =
lib.pipe
super.stack_2_11_1
[
(self.generateOptparseApplicativeCompletions [ "stack" ])
# Seems to be an unnecessarily strict dep on ansi-terminal
doJailbreak
# The below patch has unix line endings, but the actual file
# has CRLF line endings. The following override changes the
# file to unix line endings before applying the patch.
(overrideCabal (oldAttrs: {
prePatch = oldAttrs.prePatch or "" + ''
"${lib.getBin pkgs.buildPackages.dos2unix}/bin/dos2unix" src/main/BuildInfo.hs
'';
}))
# stack-2.11.1 has a bug when building without git.
# https://github.com/commercialhaskell/stack/pull/6127
(appendPatch
(fetchpatch {
name = "stack-fix-building-without-git.patch";
url = "https://github.com/commercialhaskell/stack/pull/6127/commits/086f93933d547736a7007fc4110f7816ef21f691.patch";
hash = "sha256-1nwzMoumWceVu8RNnH2mmSxYT24G1FAnFRJvUMeD3po=";
includes = [ "src/main/BuildInfo.hs" ];
})
)
];
stack =
lib.pipe
(super.stack.override {
# stack needs to use an exact hpack version. When changing or removing
# this override, double-check the upstream stack release to confirm
# that we are using the correct hpack version. See
# https://github.com/NixOS/nixpkgs/issues/223390 for more information.
hpack = assert self.hpack.version == "0.35.2"; self.hpack;
})
super.stack
[
(self.generateOptparseApplicativeCompletions [ "stack" ])
pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
-1
View File
@@ -2357,7 +2357,6 @@ default-package-overrides:
- srt ==0.1.2.0
- srtree ==1.0.0.5
- stache ==2.3.4
- stack ==2.9.3.1
- stack-all ==0.4.1
- stack-clean-old ==0.4.6
- stack-templatizer ==0.1.1.0
pkgs/development/haskell-modules/hackage-packages.nix
Generated
-97
View File
@@ -274059,102 +274059,6 @@ self: {
}) {};
"stack" = callPackage
({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array
, async, attoparsec, base, base64-bytestring, bytestring, Cabal
, casa-client, casa-types, colour, conduit, conduit-extra
, containers, cryptonite, cryptonite-conduit, deepseq, directory
, echo, exceptions, extra, file-embed, filelock, filepath, fsnotify
, generic-deriving, hackage-security, hashable, hi-file-parser
, hpack, hpc, hspec, hspec-discover, http-client, http-client-tls
, http-conduit, http-download, http-types, memory, microlens
, mintty, mono-traversable, mtl, mustache, neat-interpolation
, network-uri, open-browser, optparse-applicative, pantry, path
, path-io, persistent, persistent-sqlite, persistent-template
, pretty, primitive, process, project-template, QuickCheck, random
, raw-strings-qq, retry, rio, rio-prettyprint, semigroups
, smallcheck, split, stm, streaming-commons, tar, template-haskell
, temporary, text, text-metrics, th-reify-many, time, tls
, transformers, typed-process, unicode-transforms, unix
, unix-compat, unliftio, unordered-containers, vector, yaml
, zip-archive, zlib
}:
mkDerivation {
pname = "stack";
version = "2.9.3.1";
sha256 = "1mi0qp951qgcpc84v05gspkfdii9m32gzl47bbx6jczy6vjqmdq6";
configureFlags = [
"-fdisable-git-info" "-fhide-dependency-versions"
"-fsupported-build"
];
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal filepath ];
libraryHaskellDepends = [
aeson annotated-wl-pprint ansi-terminal array async attoparsec base
base64-bytestring bytestring Cabal casa-client casa-types colour
conduit conduit-extra containers cryptonite cryptonite-conduit
deepseq directory echo exceptions extra file-embed filelock
filepath fsnotify generic-deriving hackage-security hashable
hi-file-parser hpack hpc http-client http-client-tls http-conduit
http-download http-types memory microlens mintty mono-traversable
mtl mustache neat-interpolation network-uri open-browser
optparse-applicative pantry path path-io persistent
persistent-sqlite persistent-template pretty primitive process
project-template random retry rio rio-prettyprint semigroups split
stm streaming-commons tar template-haskell temporary text
text-metrics th-reify-many time tls transformers typed-process
unicode-transforms unix unix-compat unliftio unordered-containers
vector yaml zip-archive zlib
];
executableHaskellDepends = [
aeson annotated-wl-pprint ansi-terminal array async attoparsec base
base64-bytestring bytestring Cabal casa-client casa-types colour
conduit conduit-extra containers cryptonite cryptonite-conduit
deepseq directory echo exceptions extra file-embed filelock
filepath fsnotify generic-deriving hackage-security hashable
hi-file-parser hpack hpc http-client http-client-tls http-conduit
http-download http-types memory microlens mintty mono-traversable
mtl mustache neat-interpolation network-uri open-browser
optparse-applicative pantry path path-io persistent
persistent-sqlite persistent-template pretty primitive process
project-template random retry rio rio-prettyprint semigroups split
stm streaming-commons tar template-haskell temporary text
text-metrics th-reify-many time tls transformers typed-process
unicode-transforms unix unix-compat unliftio unordered-containers
vector yaml zip-archive zlib
];
testHaskellDepends = [
aeson annotated-wl-pprint ansi-terminal array async attoparsec base
base64-bytestring bytestring Cabal casa-client casa-types colour
conduit conduit-extra containers cryptonite cryptonite-conduit
deepseq directory echo exceptions extra file-embed filelock
filepath fsnotify generic-deriving hackage-security hashable
hi-file-parser hpack hpc hspec http-client http-client-tls
http-conduit http-download http-types memory microlens mintty
mono-traversable mtl mustache neat-interpolation network-uri
open-browser optparse-applicative pantry path path-io persistent
persistent-sqlite persistent-template pretty primitive process
project-template QuickCheck random raw-strings-qq retry rio
rio-prettyprint semigroups smallcheck split stm streaming-commons
tar template-haskell temporary text text-metrics th-reify-many time
tls transformers typed-process unicode-transforms unix unix-compat
unliftio unordered-containers vector yaml zip-archive zlib
];
testToolDepends = [ hspec-discover ];
doCheck = false;
preCheck = "export HOME=$TMPDIR";
postInstall = ''
exe=$out/bin/stack
mkdir -p $out/share/bash-completion/completions
$exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack
'';
description = "The Haskell Tool Stack";
license = lib.licenses.bsd3;
mainProgram = "stack";
maintainers = [ lib.maintainers.cdepillabout ];
}) {};
"stack_2_11_1" = callPackage
({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array
, async, attoparsec, base, base64-bytestring, bytestring, Cabal
, casa-client, casa-types, colour, conduit, conduit-extra
@@ -274245,7 +274149,6 @@ self: {
'';
description = "The Haskell Tool Stack";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
mainProgram = "stack";
maintainers = [ lib.maintainers.cdepillabout ];
}) {};
pkgs/top-level/all-packages.nix
+1 -1
View File
@@ -15997,7 +15997,7 @@ with pkgs;
cabal-install = haskell.lib.compose.justStaticExecutables haskellPackages.cabal-install;
stack = haskell.lib.compose.justStaticExecutables haskellPackages.stack_2_11_1;
stack = haskell.lib.compose.justStaticExecutables haskellPackages.stack;
hlint = haskell.lib.compose.justStaticExecutables haskellPackages.hlint;