Merge pull request #48306 from NixOS/staging-next
Merge staging-next into master
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.8.8";
|
||||
version = "1.9.0";
|
||||
inherit (stdenv.lib) optional optionals optionalString;
|
||||
in
|
||||
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
|
||||
sha256 = "1ag3scnm1fcviqgx2p4858y433mr0ndqw6zccnccrqcr9mpcird8";
|
||||
sha256 = "004b4j812wgfv8pmcypyrlwrjfa6149lwpz5df6rnm5cy0msdv0i";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
version = "1.1";
|
||||
};
|
||||
|
||||
PERL_USE_UNSAFE_INC = stdenv.lib.optionalString (stdenv.lib.versionAtLeast (stdenv.lib.getVersion perl) "5.26") "1";
|
||||
PERL_USE_UNSAFE_INC = "1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}${name}.tar.gz";
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{ stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.23.0";
|
||||
version = "1.23.1";
|
||||
name = "libuv-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libuv";
|
||||
repo = "libuv";
|
||||
rev = "v${version}";
|
||||
sha256 = "1yfx99f7qnq3qvcgbnih27dgwfg6c51xw6n6n2c3c1wb3mh95im0";
|
||||
sha256 = "14h8dcyx81sbckbgmqhagncyz8s6z6qzpx0fy8p79whq5hb3f4jg";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -67,7 +67,7 @@ let
|
||||
in
|
||||
|
||||
let
|
||||
version = "18.2.1";
|
||||
version = "18.2.2";
|
||||
branch = head (splitString "." version);
|
||||
in
|
||||
|
||||
@@ -81,7 +81,7 @@ let self = stdenv.mkDerivation {
|
||||
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
|
||||
"https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
|
||||
];
|
||||
sha256 = "0mhhr1id11s1fbdxbvr4a81xjh1nsznpra9dl36bv2hq7mpxqdln";
|
||||
sha256 = "1i3ky3d210vi3f5hlr9la1kspdyv093npndxsbzdklw95aqq5fn3";
|
||||
};
|
||||
|
||||
prePatch = "patchShebangs .";
|
||||
|
||||
Reference in New Issue
Block a user