Merge staging-next into staging
This commit is contained in:
commit
9e2d428683
|
@ -4,11 +4,11 @@ let
|
|||
configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf);
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "cinny";
|
||||
version = "2.0.4";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz";
|
||||
sha256 = "0p5s25nkjs9514a16c7kl0m78vn5f14mv6nbi79yz0sxb7hc12qg";
|
||||
sha256 = "0qzg790yd23ja3a782ga085vgd5vvh7rgmdy8kpvc3wf8plvw5nm";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -52,13 +52,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freerdp";
|
||||
version = "2.7.0";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeRDP";
|
||||
repo = "FreeRDP";
|
||||
rev = version;
|
||||
sha256 = "sha256-XBYRhbwknVa8eXxk31b7n9gMWBcTjCecDN+j2FGcpw0=";
|
||||
sha256 = "sha256-bVq/99jMkxTjckMjWoK4pBa0jD/AYezgKUPJziNSqI0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
, pkgsMusl # for passthru.tests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bmake";
|
||||
version = "20220208";
|
||||
version = "20220726";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-ewDB4UYrLh5Upk2ND88n/HfursPxOSDv+NlST/BZ1to=";
|
||||
url = "http://www.crufty.net/ftp/pub/sjg/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-G/N3B4lyJyHcp7C/+K/EqVINog8CGbt7xSNQrwEz8KA=";
|
||||
};
|
||||
|
||||
# Make tests work with musl
|
||||
|
@ -60,10 +60,15 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
# Disabled tests:
|
||||
# opt-chdir: ofborg complains about it somehow
|
||||
# opt-keep-going-indirect: not yet known
|
||||
# varmod-localtime: musl doesn't support TZDIR and this test relies on impure,
|
||||
# implicit paths
|
||||
# opt-chdir: ofborg complains about it somehow
|
||||
BROKEN_TESTS = "varmod-localtime opt-chdir";
|
||||
BROKEN_TESTS = builtins.concatStringsSep " " [
|
||||
"opt-chdir"
|
||||
"opt-keep-going-indirect"
|
||||
"varmod-localtime"
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
@ -105,9 +110,8 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ thoughtpolice AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
broken = with stdenv; isAarch64 && !isDarwin; # ofborg complains
|
||||
};
|
||||
|
||||
passthru.tests.bmakeMusl = pkgsMusl.bmake;
|
||||
}
|
||||
})
|
||||
# TODO: report the quirks and patches to bmake devteam (especially the Musl one)
|
||||
|
|
Loading…
Reference in a new issue