Merge master into staging-next
This commit is contained in:
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "janet";
|
||||
version = "1.3.1";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janet-lang";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "160wd3436cl50wkvqpaf6mbb69qlzzammcg5yb07wx9yw31g399p";
|
||||
sha256 = "0xszmgw5nl5b6gd3344h1mic1c1a3hj7nivp4d9hqzzh131qvbn5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja ];
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "joker";
|
||||
version = "0.12.7";
|
||||
version = "0.12.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "candid82";
|
||||
repo = "joker";
|
||||
sha256 = "0panmhrg1i158xbvqvq3s3217smbj7ynwlaiks18pmss36xx9dk4";
|
||||
sha256 = "19n2pzs045mflyzgq3cpa4w2fbd0f77j5k6c4yc3gk0mcwgdxhs2";
|
||||
};
|
||||
|
||||
modSha256 = "0i16vf7n1xfz5kp9w3fvyc9y9wgz4h396glgpdaznpxjr12rb43j";
|
||||
|
||||
@@ -46,7 +46,7 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "racket";
|
||||
version = "7.3"; # always change at once with ./minimal.nix
|
||||
version = "7.4"; # always change at once with ./minimal.nix
|
||||
|
||||
src = (stdenv.lib.makeOverridable ({ name, sha256 }:
|
||||
fetchurl {
|
||||
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
||||
}
|
||||
)) {
|
||||
inherit ;name = "${pname}-${version}";
|
||||
sha256 = "0h6072njhb87rkz4arijvahxgjzn8r14s4wns0ijvxm89bg136yl";
|
||||
sha256 = "07rf8sakwssl0gn9g4d3ls2cr10zlhghz0pscrh0jc6mnprrb10i";
|
||||
};
|
||||
|
||||
FONTCONFIG_FILE = fontsConf;
|
||||
|
||||
@@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec {
|
||||
name = "racket-minimal-${oldAttrs.version}";
|
||||
src = oldAttrs.src.override {
|
||||
inherit name;
|
||||
sha256 = "1byvg1vy8hn1j64d5gjiwzfbghdp7lhja9xwz9x8iicwfldkjybj";
|
||||
sha256 = "0ixha4hcxlrsqjszjlr7xv6nn3mc5pb6szlbn4cq0880avakmml7";
|
||||
};
|
||||
|
||||
meta = oldAttrs.meta // {
|
||||
|
||||
Reference in New Issue
Block a user