Skip to content

Commit

Permalink
Merge branch 'staging-20.09' into release-20.09
Browse files Browse the repository at this point in the history
Darwin hasn't fully rebuilt yet, but we have security fix(es) inside
and I don't think other platforms need to wait for that.
  • Loading branch information
vcunat committed Dec 19, 2020
2 parents 0e4be1d + b618e0f commit 10d7725
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions pkgs/development/libraries/mesa/default.nix
Expand Up @@ -31,7 +31,7 @@ with stdenv.lib;
let
# Release calendar: https://www.mesa3d.org/release-calendar.html
# Release frequency: https://www.mesa3d.org/releasing.html#schedule
version = "20.1.7";
version = "20.1.10";
branch = versions.major version;
in

Expand All @@ -46,7 +46,7 @@ stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
];
sha256 = "1252mgwiy05nz8mm4gjkzmnjfvdz5yv1shnsr837cdnan86dvsad";
sha256 = "17zfqvc3q2pxy2bjwg8zp5sqqjlsv4rpizdx9k5rzb5d22csdnxi";
};

prePatch = "patchShebangs .";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/tools/networking/curl/default.nix
Expand Up @@ -34,14 +34,14 @@ assert gssSupport -> libkrb5 != null;

stdenv.mkDerivation rec {
pname = "curl";
version = "7.72.0";
version = "7.74.0";

src = fetchurl {
urls = [
"https://curl.haxx.se/download/${pname}-${version}.tar.bz2"
"https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2"
];
sha256 = "1vq3ay87vayfrv67l7s7h79nm7gwdqhidki0brv5jahhch49g4dd";
sha256 = "19bp3d91xq9vqwlbzq261j23mk9lz4lyka4gr2fm6dhnd3k66k8g";
};

outputs = [ "bin" "dev" "out" "man" "devdoc" ];
Expand Down

0 comments on commit 10d7725

Please sign in to comment.