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

Merge staging-next into staging

Browse Source
This commit is contained in:
zowoq
2021-05-14 16:32:43 +10:00
parent 76c58493d7 bfb5f4cc5e
commit 004f8cd986
100 changed files with 2454 additions and 2943 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/admin/ansible/default.nix
+3 -23
View File
@@ -3,30 +3,10 @@
rec {
ansible = ansible_2_10;
# The python module stays at v2.9.x until the related package set has caught up. Therefore v2.10 gets an override
# for now.
ansible_2_10 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec {
pname = "ansible";
version = "2.10.0";
# TODO: migrate to fetchurl, when release becomes available on releases.ansible.com
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "0k9rs5ajx0chaq0xr1cj4x7fr5n8kd4y856miss6k01iv2m7yx42";
};
}));
ansible_2_10 = python3Packages.toPythonApplication python3Packages.ansible-base;
# End of support 2021/10/02, End of life 2021/12/31
ansible_2_9 = python3Packages.toPythonApplication python3Packages.ansible;
ansible_2_8 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec {
pname = "ansible";
version = "2.8.14";
src = fetchurl {
url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
sha256 = "19ga0c9qs2b216qjg5k2yknz8ksjn8qskicqspg2d4b8x2nr1294";
};
}));
ansible_2_8 = throw "Ansible 2.8 went end of life on 2021/01/03 and has subsequently been dropped";
}
pkgs/tools/archivers/xarchiver/default.nix
+5 -5
View File
@@ -2,18 +2,18 @@
coreutils, zip, unzip, p7zip, unrar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }:
stdenv.mkDerivation rec {
version = "0.5.4.14";
version = "0.5.4.17";
pname = "xarchiver";
src = fetchFromGitHub {
owner = "ib";
repo = "xarchiver";
rev = version;
sha256 = "1iklwgykgymrwcc5p1cdbh91v0ih1m58s3w9ndl5kyd44bwlb7px";
sha256 = "00adrjpxqlaccrwjf65w3vhxfswdj0as8aj263c6f9b85llypc5v";
};
nativeBuildInputs = [ pkg-config makeWrapper wrapGAppsHook ];
buildInputs = [ gtk3 intltool libxslt ];
nativeBuildInputs = [ intltool pkg-config makeWrapper wrapGAppsHook ];
buildInputs = [ gtk3 libxslt ];
postFixup = ''
wrapProgram $out/bin/xarchiver \
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
description = "GTK frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)";
homepage = "https://github.com/ib/xarchiver";
maintainers = [ lib.maintainers.domenkozar ];
license = lib.licenses.gpl2;
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.all;
};
}
pkgs/tools/audio/beets/default.nix
+3 -3
View File
@@ -105,13 +105,13 @@ in pythonPackages.buildPythonApplication rec {
# unstable does not require bs1770gain[2].
# [1]: https://discourse.beets.io/t/forming-a-beets-core-team/639
# [2]: https://github.com/NixOS/nixpkgs/pull/90504
version = "unstable-2021-04-17";
version = "unstable-2021-05-13";
src = fetchFromGitHub {
owner = "beetbox";
repo = "beets";
rev = "50163b373f527d1b1f8b2442240ca547e846744e";
sha256 = "sha256-l7drav4Qx2JCF+F5OA0s641idcKM3S4Yx2lM2evJQWE=";
rev = "1faa41f8c558d3f4415e5e48cf4513d50b466d34";
sha256 = "sha256-P0bV7WNqCYe9+3lqnFmAoRlb2asdsBUjzRMc24RngpU=";
};
propagatedBuildInputs = [
pkgs/tools/misc/bat/default.nix
+3 -3
View File
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "bat";
version = "0.18.0";
version = "0.18.1";
src = fetchFromGitHub {
owner = "sharkdp";
repo = pname;
rev = "v${version}";
sha256 = "113i11sgna82i4c4zk66qmbypmnmzh0lzp4kkgqnxxcdvyj00rb8";
sha256 = "sha256-kyl+clL/4uxVaDH/9zPDGQTir4/JVgtHo9kNQ31gXTo=";
};
cargoSha256 = "1jrjj999sgiypyv3gs038g4xqq39fzzpsc54j680w6inhd9g9css";
cargoSha256 = "sha256-j9HbOXiwN4CWv9wMBrNxY3jehh+KRkXlwmDqChNy1Dk=";
nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ];
pkgs/tools/misc/gparted/default.nix
+5 -4
View File
@@ -1,14 +1,15 @@
{ lib, stdenv, fetchurl, intltool, gettext, makeWrapper, coreutils, gnused, gnome
{ lib, stdenv, fetchurl, intltool, gettext, coreutils, gnused, gnome
, gnugrep, parted, glib, libuuid, pkg-config, gtkmm3, libxml2
, gpart, hdparm, procps, util-linux, polkit, wrapGAppsHook, substituteAll
}:
stdenv.mkDerivation rec {
name = "gparted-1.2.0";
pname = "gparted";
version = "1.3.0";
src = fetchurl {
url = "mirror://sourceforge/gparted/${name}.tar.gz";
sha256 = "sha256-bJBxXSVNen7AIIspAHtkFg3Z+330xKp/jsLJ0jEUxxk=";
url = "mirror://sourceforge/gparted/${pname}-${version}.tar.gz";
sha256 = "sha256-jcGAJF3Z6kXm4vS8aVEvGH4Ivn95nJioJaCwTBYcvSo=";
};
# Tries to run `pkexec --version` to get version.
pkgs/tools/misc/topgrade/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "topgrade";
version = "6.9.0";
version = "6.9.1";
src = fetchFromGitHub {
owner = "r-darwish";
repo = pname;
rev = "v${version}";
sha256 = "sha256-FW0vGwMHUgFSMggZoT+koSkub4xSKeQ+PNlvFjGIy7o=";
sha256 = "sha256-FaN1/S/VzHnaQp+UOmvNGaWDEFijVEI7GWkAmnln3jE=";
};
cargoSha256 = "sha256-+JNQITHP5rwbfavBeb4/IUo5FThhKcKDRwGeT5m6k5k=";
cargoSha256 = "sha256-Vq2gorQJbLfxKWKbYYOVaHPN0uITbGs1CgkwBtPwSrk=";
buildInputs = lib.optional stdenv.isDarwin Foundation;
pkgs/tools/text/wrap/default.nix
+36
View File
@@ -0,0 +1,36 @@
{ lib, buildGoModule, fetchFromGitHub, fetchpatch, makeWrapper, courier-prime }:
buildGoModule rec {
pname = "wrap";
version = "0.3.1";
src = fetchFromGitHub {
owner = "Wraparound";
repo = "wrap";
rev = "v${version}";
sha256 = "0scf7v83p40r9k7k5v41rwiy9yyanfv3jm6jxs9bspxpywgjrk77";
};
nativeBuildInputs = [ makeWrapper ];
vendorSha256 = "03q5a5lm8zj1523gxkbc0y6a3mjj1z2h7nrr2qcz8nlghvp4cfaz";
patches = [
(fetchpatch {
name = "courier-prime-variants.patch";
url = "https://github.com/Wraparound/wrap/commit/b72c280b6eddba9ec7b3507c1f143eb28a85c9c1.patch";
sha256 = "1d9v0agfd7mgd17k4a8l6vr2kyswyfsyq3933dz56pgs5d3jric5";
})
];
postInstall = ''
wrapProgram $out/bin/wrap --prefix XDG_DATA_DIRS : ${courier-prime}/share/
'';
meta = with lib; {
description = "A Fountain export tool with some extras";
homepage = "https://github.com/Wraparound/wrap";
license = licenses.gpl3Only;
maintainers = [ maintainers.austinbutler ];
};
}