forked from mirrors/nixpkgs
Merge pull request #34326 from ThomasMader/dub1.7.1
dub: 1.6.0 -> 1.7.1
This commit is contained in:
commit
f85163e89c
|
@ -1,10 +1,10 @@
|
||||||
{ stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }:
|
{ stdenv, fetchFromGitHub, fetchpatch, curl, dmd, libevent, rsync }:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
dubBuild = stdenv.mkDerivation rec {
|
dubBuild = stdenv.mkDerivation rec {
|
||||||
name = "dubBuild-${version}";
|
name = "dubBuild-${version}";
|
||||||
version = "1.6.0";
|
version = "1.7.1";
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
@ -12,9 +12,17 @@ let
|
||||||
owner = "dlang";
|
owner = "dlang";
|
||||||
repo = "dub";
|
repo = "dub";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1xjr5pp263lbcd4harxy1ybh7q0kzj9iyy63ji6pn66fizrgm7zk";
|
sha256 = "09bcc9bq2z1rbm8sdip1l81y5p8q13r30k02lzifyasiplrnpvlv";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# TODO Remove with next release which contains https://github.com/dlang/dub/pull/1354
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://patch-diff.githubusercontent.com/raw/dlang/dub/pull/1354.patch";
|
||||||
|
sha256 = "01alky8a91qwjmlnfjbrn8kiivwr69f3j4c84cjlxrzfp1ph20ah";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
# Avoid that the version file is overwritten
|
# Avoid that the version file is overwritten
|
||||||
substituteInPlace build.sh \
|
substituteInPlace build.sh \
|
||||||
|
@ -59,6 +67,8 @@ let
|
||||||
outputHash = builtins.hashString "sha256" inputString;
|
outputHash = builtins.hashString "sha256" inputString;
|
||||||
|
|
||||||
src = dubBuild.src;
|
src = dubBuild.src;
|
||||||
|
|
||||||
|
patches = dubBuild.patches;
|
||||||
|
|
||||||
postPatch = dubBuild.postPatch;
|
postPatch = dubBuild.postPatch;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue