Merge branch 'staging-next' into staging

In particular, this fixes ISO evaluation.
This commit is contained in:
Vladimír Čunát 2020-06-10 09:42:36 +02:00
commit 16024fcaec
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
18 changed files with 61 additions and 36 deletions

View File

@ -12,7 +12,7 @@ compat53,,,,,vcunat
cosmo,,,,,marsam
coxpcall,,,1.17.0-1,,
cqueues,,,,,vcunat
cyrussasl,,,,,vcunat
cyrussasl,,,,,
digestif,,,,lua5_3,
dkjson,,,,,
fifo,,,,,
@ -50,9 +50,9 @@ luaepnf,,,,,
luaevent,,,,,
luaexpat,,,1.3.0-1,,arobyn flosse
luaffi,,http://luarocks.org/dev,,,
luafilesystem,,,1.7.0-2,,flosse vcunat
luafilesystem,,,1.7.0-2,,flosse
lualogging,,,,,
luaossl,,,,lua5_1,vcunat
luaossl,,,,lua5_1,
luaposix,,,,,vyp lblasc
luarepl,,,,,
luasec,,,,,flosse

1 # nix name luarocks name server version luaversion maintainers
12 cosmo marsam
13 coxpcall 1.17.0-1
14 cqueues vcunat
15 cyrussasl vcunat
16 digestif lua5_3
17 dkjson
18 fifo
50 luaevent
51 luaexpat 1.3.0-1 arobyn flosse
52 luaffi http://luarocks.org/dev
53 luafilesystem 1.7.0-2 flosse vcunat flosse
54 lualogging
55 luaossl lua5_1 vcunat
56 luaposix vyp lblasc
57 luarepl
58 luasec flosse

View File

@ -35,7 +35,7 @@
isohybridMbrImage ? ""
, # Whether to compress the resulting ISO image with zstd.
compressImage ? false
compressImage ? false, zstd
, # The volume ID.
volumeID ? ""

View File

@ -436,6 +436,8 @@ let
"session required ${pkgs.pam}/lib/security/pam_lastlog.so silent"}
${optionalString config.security.pam.enableEcryptfs
"session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}
${optionalString cfg.pamMount
"session optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
${optionalString use_ldap
"session optional ${pam_ldap}/lib/security/pam_ldap.so"}
${optionalString config.services.sssd.enable
@ -452,8 +454,6 @@ let
"session required ${pkgs.pam}/lib/security/pam_limits.so conf=${makeLimitsConf cfg.limits}"}
${optionalString (cfg.showMotd && config.users.motd != null)
"session optional ${pkgs.pam}/lib/security/pam_motd.so motd=${motd}"}
${optionalString cfg.pamMount
"session optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
${optionalString (cfg.enableAppArmor && config.security.apparmor.enable)
"session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"}
${optionalString (cfg.enableKwallet)

View File

@ -53,6 +53,6 @@ buildGoModule rec {
homepage = "https://geth.ethereum.org/";
description = "Official golang implementation of the Ethereum protocol";
license = with licenses; [ lgpl3 gpl3 ];
maintainers = with maintainers; [ adisbladis asymmetric lionello xrelkd ];
maintainers = with maintainers; [ adisbladis lionello xrelkd ];
};
}

View File

@ -1,18 +1,17 @@
{ stdenv, buildGoModule, fetchFromGitHub, runCommand }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "cloudflared";
version = "2020.3.2";
version = "2020.5.1";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflared";
rev = version;
sha256 = "1vbxm5z72y9zfg4carmja3fc1vhkanmc25pgnlw550p1l14y6404";
sha256 = "0r1n3a8h8gyww4p2amb24jmp8zkyxy1ava3nbqgwlfjr3zagga00";
};
vendorSha256 = "14w2iz3ycbzfvlr8a6qn86aaa8687cm203d73wpfkfskp277hwz0";
deleteVendor = true;
vendorSha256 = null;
buildFlagsArray = "-ldflags=-X main.Version=${version}";

View File

@ -10,7 +10,7 @@ buildGoModule rec {
rev = "v${version}";
sha256 = "1453qkd9s4z4r0xzmv8ym7qfg33szf6gizfkb5zxj590fcbsgnd7";
};
vendorSha256 = "0j25m56cwzjd9b75v7xlb26q81bsmln77k23h9n8v2f2gqwwpkrl";
vendorSha256 = null;
subPackages = [ "cmd/helm" ];
buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ];

View File

@ -51,11 +51,11 @@
stdenv.mkDerivation rec {
pname = "gnome-boxes";
version = "3.36.3";
version = "3.36.4";
src = fetchurl {
url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "18imxv1859gr53z4yay02611p5f1rd2pwnbaq093gmn77l0j9292";
sha256 = "16l0mq2ydmywcdya1795mcy8syg4zkmz9ws3pzjcqv5y4m7cjj03";
};
doCheck = true;

View File

@ -36,11 +36,11 @@
stdenv.mkDerivation rec {
pname = "gnome-initial-setup";
version = "3.36.2";
version = "3.36.3";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0mjp2j4smikmr4fa0y8wrw2srlfjahiixzphz3dmc30hx8df92sg";
sha256 = "11f2yj8q844gks3jkfbi4ap448snz1wjflqbq4y2kk12r3w37afq";
};
nativeBuildInputs = [

View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "gnome-system-monitor";
version = "3.36.0";
version = "3.36.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1gipjaw708lv1zj1c9g09x4h4226kawam2kzdhdd6zjkzfghp9s0";
sha256 = "18dwwwmw4m2kzvfmxyaxmnm66d1plwvh6c6naznb0xac1ymlfsw6";
};
doCheck = true;

View File

@ -1,6 +1,6 @@
import ./generic.nix {
major_version = "4";
minor_version = "11";
patch_version = "0+alpha1";
sha256 = "02sbwm00h2zxzyq5q90lg2a6m93zr797azshkb2qcwcf1kr7ddqg";
patch_version = "0+alpha2";
sha256 = "131ixp5kkgk9y42vrprhc2x0gpxhkapmdmb26pwkyl58vrbr8xqg";
}

View File

@ -0,0 +1,22 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "gore";
version = "0.5.0";
src = fetchFromGitHub {
owner = "motemen";
repo = pname;
rev = "v${version}";
sha256 = "61Hn3Vs4BZtAX8WNJlUeodvEWvwLo+lXKsc8JxRwOE4=";
};
vendorSha256 = "3bq6sRKS5dq7WCPpKGm2q5gFajthR3zhrTFGve9zXhY=";
meta = with stdenv.lib; {
description = "Yet another Go REPL that works nicely.";
homepage = "https://github.com/motemen/gore";
license = licenses.mit;
maintainers = with maintainers; [ offline ];
};
}

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "tokei";
version = "11.2.0";
version = "11.2.1";
src = fetchFromGitHub {
owner = "XAMPPRocky";
repo = pname;
rev = "v${version}";
sha256 = "1nyv73bawmshzzp8hkbcac5bgq0yf8f51ps5hycdw0c5qhrsjwns";
sha256 = "1bdq66si9vvvyf5nia8ww77imp0f8jas0yfcvq1rialwm9922dfl";
};
cargoSha256 = "18a0rg3hgisjd6zh4dk6rflaipmrxxszpigqg8fa816rg0f4bdc7";
cargoSha256 = "17666wh4sfzhgxngymd02892mqpkr8jm6a4w95wwsc9iinzbygrm";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [
libiconv darwin.apple_sdk.frameworks.Security

View File

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "groonga";
version = "10.0.2";
version = "10.0.3";
src = fetchurl {
url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz";
sha256 = "0851sdzgg5krf05b1pg29gmwzvzxvawfp37ny3lrb5xcdqbr379c";
sha256 = "0vnrpzd7gkjh4bc0lgvh5l11ym6pls4lp1pl5jjlkyx505635k8d";
};
buildInputs = with stdenv.lib;

View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "dash-0.5.10.2";
name = "dash-0.5.11";
src = fetchurl {
url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz";
sha256 = "0wb0bwmqc661hylqcfdp7l7x12myw3vpqk513ncyqrjwvhckjriw";
sha256 = "1jwilfsy249d3q7fagg1ga4bgc2bg1fzw63r2nan0m77bznsdnad";
};
hardeningDisable = [ "format" ];

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "eksctl";
version = "0.19.0";
version = "0.21.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
sha256 = "0xlr7hsncih4nzydi6sphp7j7k82cbhmi7jb0sd954i8kzl3sc1q";
sha256 = "0pfjv5m1fly7n9hmxy8bnpblfh5rzbjkiav3dczy4hkmq226gjsa";
};
vendorSha256 = "14d9hl01z7ixp1wa8kp1zs0z1p3pvz6hkp49z582nqllpb2xjmkx";
vendorSha256 = "09c3a5g27aqmy4ml42c6zwzrv8yas7i04w3j9jbvp90npwvc62cz";
subPackages = [ "cmd/eksctl" ];

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ibm-sw-tpm2";
version = "1563";
version = "1628";
src = fetchurl {
url = "mirror://sourceforge/ibmswtpm2/ibmtpm${version}.tar.gz";
sha256 = "1sfi7drmbm08rgd2414s3sxd7h5g8d4kiwk40xklf7sw67w1ffpw";
sha256 = "18wywbsdp5sjrapznk2ydbmx0whz513dhybn1lls24xfl7kp9s58";
};
buildInputs = [ openssl ];

View File

@ -21,10 +21,12 @@ stdenv.mkDerivation {
install -Dm 444 docs/* -t "$out/doc"
'';
meta = {
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
meta = with stdenv.lib; {
description = "Approximate grep for fast fuzzy string searching";
homepage = "https://www.tgries.de/agrep/";
license = stdenv.lib.licenses.isc;
platforms = stdenv.lib.platforms.linux;
license = licenses.isc;
platforms = with platforms; linux ++ darwin;
};
}

View File

@ -17448,6 +17448,8 @@ in
gopls = callPackage ../development/tools/gopls { };
gore = callPackage ../development/tools/gore { };
gotests = callPackage ../development/tools/gotests { };
gotestsum = callPackage ../development/tools/gotestsum { };