Merge branch 'staging-next' into staging

This commit is contained in:
Vladimír Čunát
2019-05-26 09:48:55 +02:00
717 changed files with 15953 additions and 13514 deletions

View File

@@ -4,15 +4,15 @@
let hashes = {
"8.0" = "1x1giy2c1y6krg3kf8pf9wrmvk981shv0pxcwi483yjqm90xng4r";
"8.1" = "0isi75j94q79x4341rhd94c60228iwvccy71ssnyvh1025m93xcd";
"8.2" = "1x33kv6w9cbqzvyrihn61pzmqlvnk3drm8ksd5v0arg38i95awi3";
};
revs = {
"8.0" = "8.0";
"8.1" = "8.1";
"8.2" = "8.2";
};
in stdenv.mkDerivation rec {
name = "acl2-${version}";
version = "8.1";
version = "8.2";
src = fetchFromGitHub {
owner = "acl2-devel";

View File

@@ -1,7 +1,7 @@
{ mkDerivation }:
mkDerivation rec {
version = "1.8.1";
sha256 = "1npnrkn21kqqfqrsn06mr78jxs6n5l8c935jpxvnmj7iysp50pf9";
version = "1.8.2";
sha256 = "1n77cpcl2b773gmj3m9s24akvj9gph9byqbmj2pvlsmby4aqwckq";
minimumOTPVersion = "20";
}

View File

@@ -46,7 +46,7 @@ in
stdenv.mkDerivation rec {
name = "racket-${version}";
version = "7.2"; # always change at once with ./minimal.nix
version = "7.3"; # always change at once with ./minimal.nix
src = (stdenv.lib.makeOverridable ({ name, sha256 }:
fetchurl rec {
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
}
)) {
inherit name;
sha256 = "12cq0kiigmf9bxb4rcgxdhwc2fcdwvlyb1q3f8x4hswcpgq1ybg4";
sha256 = "0h6072njhb87rkz4arijvahxgjzn8r14s4wns0ijvxm89bg136yl";
};
FONTCONFIG_FILE = fontsConf;

View File

@@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec {
name = "racket-minimal-${oldAttrs.version}";
src = oldAttrs.src.override {
inherit name;
sha256 = "01wsiyqfiiwn2n4xxk8d8di92l2ng7yhc4bfmgrvkgaqzy3zfhhx";
sha256 = "1byvg1vy8hn1j64d5gjiwzfbghdp7lhja9xwz9x8iicwfldkjybj";
};
meta = oldAttrs.meta // {