public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source 
(a trivial conflict in transmission)
This commit is contained in:
Vladimír Čunát
2021-05-09 09:31:55 +02:00
parent 9f024e4c92 90c2fb1f2f
commit 5663b2b2d3
201 changed files with 2565 additions and 1560 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/admin/acme.sh/default.nix
+2 -2
View File
@@ -1,13 +1,13 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute2, unixtools, dnsutils }:
stdenv.mkDerivation rec {
pname = "acme.sh";
version = "2.8.8";
version = "2.8.9";
src = fetchFromGitHub {
owner = "Neilpang";
repo = "acme.sh";
rev = version;
sha256 = "1iqwzqgg26vsg7lwmgmga9y3ap9q8r5xyx799bj8kawnr8n6s4jd";
sha256 = "sha256-xiLAvxly4WbMb6DAXPsXJgQqVmTlX9cbqFECJQ+r0Jk=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/tools/admin/google-cloud-sdk/default.nix
+3 -3
View File
@@ -21,18 +21,18 @@ let
sources = name: system: {
x86_64-darwin = {
url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
sha256 = "0fb0bw16idj810si32fxqx1nl057bdsjk3pvkgzpf7j96v2lkw71";
sha256 = "1xb6s78q0fba45595d868vmbxdb41060jbygypfa5hvvcz8d8ayk";
};
x86_64-linux = {
url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
sha256 = "0gnnp8whcx6ada8a4xs8kxrbza97zivk57r9qzv0q5arg4xslagr";
sha256 = "19ywvp7nm91rc32r7dzb6yf3ss74m3s01fh2xqnmdg382jjlzdby";
};
}.${system};
in stdenv.mkDerivation rec {
pname = "google-cloud-sdk";
version = "336.0.0";
version = "339.0.0";
src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);
pkgs/tools/admin/pebble/default.nix
+5
View File
@@ -1,6 +1,7 @@
{ buildGoPackage
, fetchFromGitHub
, lib
, nixosTests
}:
let
@@ -17,6 +18,10 @@ in buildGoPackage {
sha256 = "1piwzzfqsdx6s2niczzp4mf4r3qn9nfdgpn7882g52cmmm0vzks2";
};
passthru.tests = {
smoke-test = nixosTests.acme;
};
meta = {
homepage = "https://github.com/letsencrypt/pebble";
description = "A miniature version of Boulder, Pebble is a small RFC 8555 ACME test server not suited for a production CA";
pkgs/tools/backup/bacula/default.nix
+2 -2
View File
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "bacula";
version = "11.0.1";
version = "11.0.2";
src = fetchurl {
url = "mirror://sourceforge/bacula/${pname}-${version}.tar.gz";
sha256 = "sha256-Lr2c24hZU8A/Cd8xGA7rfqga67ghz0XJ/cs/z/hSlPU=";
sha256 = "sha256-ooaKsNhUIxubAlGt6fUAkbD+PDMfkq+6lnK4G9lp4C8=";
};
buildInputs = [ postgresql sqlite zlib ncurses openssl readline ]
pkgs/tools/filesystems/bcachefs-tools/default.nix
+5 -1
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, attr, libuuid, libscrypt, libsodium, keyutils
, liburcu, zlib, libaio, udev, zstd, lz4, valgrind, python3Packages
, liburcu, zlib, libaio, udev, zstd, lz4, valgrind, python3Packages, nixosTests
, fuseSupport ? false, fuse3 ? null }:
assert fuseSupport -> fuse3 != null;
@@ -39,6 +39,10 @@ stdenv.mkDerivation {
installFlags = [ "PREFIX=${placeholder "out"}" ];
passthru.tests = {
smoke-test = nixosTests.bcachefs;
};
meta = with lib; {
description = "Tool for managing bcachefs filesystems";
homepage = "https://bcachefs.org/";
pkgs/tools/filesystems/bees/default.nix
+8 -3
View File
@@ -1,4 +1,5 @@
{ lib, stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, python3Packages, util-linux }:
{ lib, stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils
, python3Packages, util-linux, nixosTests }:
let
@@ -55,7 +56,7 @@ let
in
runCommand "bees-service" {
(runCommand "bees-service" {
inherit bash bees coreutils;
utillinux = util-linux; # needs to be a valid shell variable name
btrfsProgs = btrfs-progs; # needs to be a valid shell variable name
@@ -64,4 +65,8 @@ runCommand "bees-service" {
substituteAll ${./bees-service-wrapper} "$out"/bin/bees-service-wrapper
chmod +x "$out"/bin/bees-service-wrapper
ln -s ${bees}/bin/beesd "$out"/bin/beesd
''
'').overrideAttrs (old: {
passthru.tests = {
smoke-test = nixosTests.bees;
};
})
pkgs/tools/filesystems/gcsfuse/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "gcsfuse";
version = "0.34.1";
version = "0.35.0";
src = fetchFromGitHub {
owner = "googlecloudplatform";
repo = "gcsfuse";
rev = "v${version}";
sha256 = "16ns04g4cvp6lfhkifgib5rxpbcxy8ghhavi3mv1cvxawpmdrxnq";
sha256 = "sha256-GJ21Cqd/W/PocmN1p4OeeUdswhH7fSmAMiNTs0X3564=";
};
goPackagePath = "github.com/googlecloudplatform/gcsfuse";
pkgs/tools/graphics/gmic/default.nix
+2 -2
View File
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "gmic";
version = "2.9.6";
version = "2.9.7";
outputs = [ "out" "lib" "dev" "man" ];
src = fetchurl {
url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";
sha256 = "sha256-0i/oUVrxbc0FDQmgvHEn7Cn0eVznMqDGw+r4OTVrwRo=";
sha256 = "sha256-lCU3SH6nIhQSMFeds81DMTaEKcDjPLOP7hsXqulVfxY=";
};
nativeBuildInputs = [
pkgs/tools/graphics/timg/default.nix
+2 -2
View File
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "timg";
version = "1.4.0";
version = "1.4.2";
src = fetchFromGitHub {
owner = "hzeller";
repo = "timg";
rev = "v${version}";
sha256 = "10qhjfkbazncmj07y0a6cpmi7ki0l10qzpvi2zh8369yycqqxr8y";
sha256 = "1zjcaxnik8imkn22g5kz6zly3yxpknrzd093sfxpgqnfw4sq8149";
};
buildInputs = [ graphicsmagick ffmpeg libexif libjpeg zlib ];
pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "fcitx-anthy";
version = "0.2.3";
version = "0.2.4";
src = fetchurl {
url = "http://download.fcitx-im.org/fcitx-anthy/${pname}-${version}.tar.xz";
sha256 = "01jx7wwq0mifqrzkswfglqhwkszbfcl4jinxgdgqx9kc6mb4k6zd";
sha256 = "sha256-Hxhs2RXuFf/bhczcQ3+Zj+gI3+Z4BEfIzMIfUOUNX7M=";
};
nativeBuildInputs = [ cmake pkg-config ];
pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
+2 -2
View File
@@ -12,13 +12,13 @@
mkDerivation rec {
pname = "fcitx5-qt";
version = "5.0.4";
version = "5.0.6";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-qt";
rev = version;
sha256 = "sha256-PZbnxt30Tv7i+Q6G9UpGgWDs65rn0MZVe1ybhz4vN9I=";
sha256 = "sha256-Y7X4pkBSf5FMpf1mdyLvr1QWhqz3yC4iOGXDvvvV9Yw=";
};
preConfigure = ''
pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "ibus-m17n";
version = "1.4.4";
version = "1.4.5";
src = fetchFromGitHub {
owner = "ibus";
repo = "ibus-m17n";
rev = version;
sha256 = "sha256-kPTysHTC+j8BMnzsddRa4Tg54idejApTqmLrP20pu5M=";
sha256 = "sha256-atsfaoA0V9PPwhPTpHI7b7A5JsDiYHfA+0NlNOKYIPg=";
};
nativeBuildInputs = [
pkgs/tools/misc/birdfont/default.nix
+2 -2
View File
@@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "birdfont";
version = "2.29.1";
version = "2.29.4";
src = fetchurl {
url = "https://birdfont.org/releases/${pname}-${version}.tar.xz";
sha256 = "0620bppcbm9pb8l0d4sc56gfwkr97gw4zjirjz5ikk5lj0m801yi";
sha256 = "sha256-caNY6PrsqBrYwC61MxNsf8B9E8it1Ls1d+hdbf8u+o8=";
};
nativeBuildInputs = [ python3 pkg-config vala_0_44 gobject-introspection wrapGAppsHook ];
pkgs/tools/misc/debootstrap/default.nix
+2 -2
View File
@@ -15,13 +15,13 @@ let binPath = lib.makeBinPath [
];
in stdenv.mkDerivation rec {
pname = "debootstrap";
version = "1.0.123";
version = "1.0.124";
src = fetchurl {
# git clone git://git.debian.org/d-i/debootstrap.git
# I'd like to use the source. However it's lacking the lanny script ? (still true?)
url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.gz";
sha256 = "0a53dhfwa74vdhqd6kbl7zlm7iic37c6wkdclppf0syxxi3q2njy";
sha256 = "sha256-dwDphksp8WaybFQVPtjCdbRvS5pgRou2B+AZpkwWzY8=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/tools/misc/gh-ost/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "gh-ost";
version = "1.1.0";
version = "1.1.1";
src = fetchFromGitHub {
owner = "github";
repo = "gh-ost";
rev = "v${version}";
sha256 = "0laj5nmf10qn01mqn0flipmhankgvrcfbdl3bc76wa14qkkg722m";
sha256 = "sha256-srJXzY4TTHZDYKq8OPqin4zRoYlmaJKhHXDzO/GjBV8=";
};
goPackagePath = "github.com/github/gh-ost";
pkgs/tools/misc/ipbt/default.nix
+2 -2
View File
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, perl, ncurses }:
stdenv.mkDerivation rec {
version = "20190601.d1519e0";
version = "20210215.5a9cb02";
pname = "ipbt";
src = fetchurl {
url = "https://www.chiark.greenend.org.uk/~sgtatham/ipbt/ipbt-${version}.tar.gz";
sha256 = "1aj8pajdd81vq2qw6vzfm27i0aj8vfz9m7k3sda30pnsrizm06d5";
sha256 = "0w6blpv22jjivzr58y440zv6djvi5iccdmj4y2md52fbpjngmsha";
};
nativeBuildInputs = [ perl ];
pkgs/tools/networking/findomain/default.nix
+3 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "findomain";
version = "4.0.1";
version = "4.1.0";
src = fetchFromGitHub {
owner = "Edu4rdSHL";
repo = pname;
rev = version;
sha256 = "sha256-uv1boI9iaBeobo/58Di4oslh1eGLuK9HR5EwQQeWn+0=";
sha256 = "sha256-kzB6HIZK1XRxnjg5FvUWESalrYppJiiXVI8DBsDpLu8=";
};
cargoSha256 = "sha256-31OD/sv4br9cdBNqNGr4McypSGkBbKs7b7H1u7mFt3o=";
cargoSha256 = "sha256-2XftJ/T8wSaHXVgqbWY6EAmaVBXEzM+J6TSOJ0QFR3g=";
nativeBuildInputs = [ installShellFiles perl ];
buildInputs = lib.optional stdenv.isDarwin Security;
pkgs/tools/networking/miniupnpd/default.nix
+5
View File
@@ -1,5 +1,6 @@
{ stdenv, lib, fetchurl, iptables, libuuid, pkg-config
, which, iproute2, gnused, coreutils, gawk, makeWrapper
, nixosTests
}:
let
@@ -30,6 +31,10 @@ stdenv.mkDerivation rec {
done
'';
passthru.tests = {
bittorrent-integration = nixosTests.bittorrent;
};
meta = with lib; {
homepage = "http://miniupnp.free.fr/";
description = "A daemon that implements the UPnP Internet Gateway Device (IGD) specification";
pkgs/tools/networking/openssh/common.nix
+5
View File
@@ -22,6 +22,7 @@
, withKerberos ? true
, libkrb5
, libfido2
, nixosTests
, withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl
, linkOpenssl ? true
}:
@@ -111,6 +112,10 @@ stdenv.mkDerivation rec {
"sysconfdir=\${out}/etc/ssh"
];
passthru.tests = {
borgbackup-integration = nixosTests.borgbackup;
};
meta = {
description = "An implementation of the SSH protocol${extraDesc}";
homepage = "https://www.openssh.com/";
pkgs/tools/security/doppler/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "doppler";
version = "3.24.3";
version = "3.24.4";
src = fetchFromGitHub {
owner = "dopplerhq";
repo = "cli";
rev = version;
sha256 = "sha256-G7oyyvrn+19N0C0V5MBwls+dQNzHh+DJmMTmsln8rC4=";
sha256 = "sha256-j1HTWC/YDER2LPJ1ELoxA5ZOxrdQOnDiHNOc7aVgWlk=";
};
vendorSha256 = "sha256-UaR/xYGMI+C9aID85aPSfVzmTWXj4KcjfOJ6TTJ8KoY=";
pkgs/tools/text/chroma/default.nix
+1 -1
View File
@@ -8,7 +8,7 @@ buildGoModule rec {
owner = "alecthomas";
repo = pname;
rev = "v${version}";
sha256 = "0zzk4wcjgxa9lsx8kwpmxvcw67f2fr7ai37jxmdahnws0ai2c2f7";
sha256 = "sha256-+4UaQrJh3PBf68rlW1lOEyEVw3vWxfc+Casa5+H8F9A=";
leaveDotGit = true;
};