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:
github-actions[bot]
2021-05-15 06:22:25 +00:00
committed by GitHub
parent 2e55b7301b c48794dcef
commit 78ae7ac75e
84 changed files with 2099 additions and 1505 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/admin/clair/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "clair";
version = "4.0.5";
version = "4.1.0";
src = fetchFromGitHub {
owner = "quay";
repo = pname;
rev = "v${version}";
sha256 = "sha256-tpk5Avx2bRQlhOnHpmpDG14X9nk3x68TST+VtIW8rL8=";
sha256 = "sha256-Ns02Yi0FJPOCpjr1P5c1KOkRZ8saxQzXg/Zn5vYLztU=";
};
vendorSha256 = "sha256-O9SEVyBFnmyrQCmccXLyeOqlTwWHzICTLVKGO7rerjI=";
vendorSha256 = "sha256-aFaeRhg+aLOmS7VFbgdxaEtZcBKn9zCVINad6ahpDCo=";
doCheck = false;
pkgs/tools/audio/volctl/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "volctl";
version = "0.8.0";
version = "0.8.2";
src = fetchFromGitHub {
owner = "buzz";
repo = pname;
rev = "v${version}";
sha256 = "02scfscf4mdrphzrd7cbwbhpig9bhvaws8qk4zc81z8vvf3mcfv2";
sha256 = "1cx27j83pz2qffnzb85fbl1x6pp3irv1kbw7g1hri7kaw6ky4xiz";
};
postPatch = ''
pkgs/tools/graphics/dmtx-utils/default.nix
+3 -1
View File
@@ -5,6 +5,7 @@
, pkg-config
, libdmtx
, imagemagick
, Foundation
}:
stdenv.mkDerivation rec {
@@ -20,7 +21,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libdmtx imagemagick ];
buildInputs = [ libdmtx imagemagick ]
++ lib.optional stdenv.isDarwin Foundation;
meta = {
description = "Data matrix command-line utilities";
pkgs/tools/misc/code-minimap/default.nix
+4
View File
@@ -1,6 +1,8 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, libiconv
}:
rustPlatform.buildRustPackage rec {
@@ -16,6 +18,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-xp1ei41HdbSxq8hoQB4JFtYZLb4bIKSlwEwwxUcjojE=";
buildInputs = lib.optional stdenv.isDarwin libiconv;
meta = with lib; {
description = "A high performance code minimap render";
homepage = "https://github.com/wfxr/code-minimap";
pkgs/tools/misc/jdupes/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "jdupes";
version = "1.19.2";
version = "1.20.0";
src = fetchFromGitHub {
owner = "jbruchon";
repo = "jdupes";
rev = "v${version}";
sha256 = "sha256-3lWrSybYp3RrUnydosgsNkGQjrk7JvxuxjMslN4cGfk=";
sha256 = "sha256-G6ixqSIdDoM/OVlPfv2bI4MA/k0x3Jic/kFo5XEsN/M=";
# Unicode file names lead to different checksums on HFS+ vs. other
# filesystems because of unicode normalisation. The testdir
# directories have such files and will be removed.
pkgs/tools/misc/lorri/default.nix
+4 -4
View File
@@ -12,10 +12,10 @@
let
# Run `eval $(nix-build -A lorri.updater)` after updating the revision!
version = "1.4.0";
gitRev = "fee4ffac9ee16fc921d413789cc059b043f2db3d";
sha256 = "sha256:0ix0k85ywlvkxsampajkq521d290gb0n60qwhnk6j0sc55yn558h";
cargoSha256 = "sha256:1ngn4wnyh6cjnyg7mb48zvng0zn5fcn8s75y88nh91xq9x1bi2d9";
version = "1.5.0";
gitRev = "f4b6a135e2efb18b3a679e3946d4d070a1c45a2c";
sha256 = "0irgzw7vwhvm97nmylj44x2dnd8pwf47gvlgw7fj58fj67a0l8fr";
cargoSha256 = "18l7yxciqcvagsg9lykilfhr104a4qqdydjkjysxgd197xalxgzr";
in (rustPlatform.buildRustPackage rec {
pname = "lorri";
pkgs/tools/misc/nix-direnv/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "nix-direnv";
version = "1.2.5";
version = "1.2.6";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nix-direnv";
rev = version;
sha256 = "sha256-sqEodshg6nm3O4RK63ht8u6FU98bF/1i6frS50oyZY8=";
sha256 = "sha256-0dCIHgoyNgpxbrPDv26oLdU+npcIgpCQdpX4HzS0vN0=";
};
# Substitute instead of wrapping because the resulting file is
pkgs/tools/networking/calendar-cli/default.nix
+34
View File
@@ -0,0 +1,34 @@
{ lib
, python3
, fetchFromGitHub
}:
python3.pkgs.buildPythonApplication rec {
pname = "calendar-cli";
version = "0.12.0";
src = fetchFromGitHub {
owner = "tobixen";
repo = "calendar-cli";
rev = "v${version}";
sha256 = "0qjld2m7hl3dx90491pqbjcja82c1f5gwx274kss4lkb8aw0kmlv";
};
propagatedBuildInputs = with python3.pkgs; [
icalendar
caldav
pytz
tzlocal
six
];
# tests require networking
doCheck = false;
meta = with lib; {
description = "Simple command-line CalDav client";
homepage = "https://github.com/tobixen/calendar-cli";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dotlambda ];
};
}
pkgs/tools/networking/chrony/default.nix
+2 -2
View File
@@ -5,11 +5,11 @@ assert stdenv.isLinux -> libcap != null;
stdenv.mkDerivation rec {
pname = "chrony";
version = "4.0";
version = "4.1";
src = fetchurl {
url = "https://download.tuxfamily.org/chrony/${pname}-${version}.tar.gz";
sha256 = "09f6w2x5h5kamb4rhcbaz911q1f730qdalgsn8s48yjyqlafl9xy";
sha256 = "sha256-7Xby0/k0esYiGpGtS9VT3QVlrBiM10kNCAHQj3FxFkw=";
};
postPatch = ''
pkgs/tools/networking/findomain/default.nix
+5 -4
View File
@@ -4,24 +4,25 @@
, rustPlatform
, installShellFiles
, perl
, libiconv
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "findomain";
version = "4.1.1";
version = "4.2.0";
src = fetchFromGitHub {
owner = "Edu4rdSHL";
repo = pname;
rev = version;
sha256 = "sha256-ySpkWAhLS4jPFviKnzcnW7vuUFyojTBhooq7CFz/y3w=";
sha256 = "sha256-bNvgENyBa+BOY7QVPbBGKFKqYd9JNek+fyPnCT9+PUs=";
};
cargoSha256 = "sha256-KWh++MHaCJpJq7mS2lRCUh0nN+e8McKWcTknUC8VFuo=";
cargoSha256 = "sha256-FDiIM1LlWEFmiIvebdCsznkB7egspNKhY6xUXB838g8=";
nativeBuildInputs = [ installShellFiles perl ];
buildInputs = lib.optional stdenv.isDarwin Security;
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
postInstall = ''
installManPage ${pname}.1
pkgs/tools/networking/inetutils/default.nix
+2 -1
View File
@@ -46,7 +46,8 @@ stdenv.mkDerivation rec {
installFlags = [ "SUIDMODE=" ];
postInstall = ''
install -D -m 644 /dev/stdin $apparmor/bin.ping <<EOF
mkdir $apparmor
cat >$apparmor/bin.ping <<EOF
$out/bin/ping {
include <abstractions/base>
include <abstractions/consoles>
pkgs/tools/networking/ofono/default.nix
+2 -2
View File
@@ -12,14 +12,14 @@
stdenv.mkDerivation rec {
pname = "ofono";
version = "1.31";
version = "1.32";
outputs = [ "out" "dev" ];
src = fetchgit {
url = "git://git.kernel.org/pub/scm/network/ofono/ofono.git";
rev = version;
sha256 = "033y3vggjxn1c7mw75j452idp7arrdv51axs727f7l3c5lnxqdjy";
sha256 = "sha256-bJ7Qgau5soPiptrhcMZ8rWxfprRCTeR7OjQ5HZQ9hbc=";
};
patches = [
pkgs/tools/package-management/nix/default.nix
+2 -9
View File
@@ -196,19 +196,12 @@ in rec {
nixStable = callPackage common (rec {
pname = "nix";
version = "2.3.10";
version = "2.3.11";
src = fetchurl {
url = "https://nixos.org/releases/nix/${pname}-${version}/${pname}-${version}.tar.xz";
sha256 = "a8a85e55de43d017abbf13036edfb58674ca136691582f17080c1cd12787b7ab";
sha256 = "89a8d7995305a78b1561e6670bbf1879c791fc4904eb094bc4f180775a61c128";
};
patches = [(
fetchpatch {
url = "https://github.com/NixOS/nix/pull/4316.patch";
sha256 = "0bqlm4n9sac9prgr9xlfng92arisp1hiqvc9pfh4fibsppkgdfc5";
}
)];
inherit storeDir stateDir confDir boehmgc;
});
pkgs/tools/security/metasploit/Gemfile
+1 -1
View File
@@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.43"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.44"
pkgs/tools/security/metasploit/Gemfile.lock
+9 -7
View File
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: 08fd394933eadca2b90e4de4ecce7f478af1f161
ref: refs/tags/6.0.43
revision: dbc17d32977b2e36ead8dafff4f41c607a8bec88
ref: refs/tags/6.0.44
specs:
metasploit-framework (6.0.43)
metasploit-framework (6.0.44)
actionpack (~> 5.2.2)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
@@ -80,6 +80,7 @@ GIT
sinatra
sqlite3
sshkey
swagger-blocks
thin
tzinfo
tzinfo-data
@@ -124,13 +125,13 @@ GEM
arel-helpers (2.12.0)
activerecord (>= 3.1.0, < 7)
aws-eventstream (1.1.1)
aws-partitions (1.452.0)
aws-partitions (1.455.0)
aws-sdk-core (3.114.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-ec2 (1.235.0)
aws-sdk-ec2 (1.236.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.52.0)
@@ -268,7 +269,7 @@ GEM
ttfunk
pg (1.2.3)
public_suffix (4.0.6)
puma (5.3.0)
puma (5.3.1)
nio4r (~> 2.0)
racc (1.5.2)
rack (2.2.3)
@@ -289,7 +290,7 @@ GEM
thor (>= 0.19.0, < 2.0)
rake (13.0.3)
rb-readline (0.5.5)
recog (2.3.19)
recog (2.3.20)
nokogiri
redcarpet (3.5.1)
reline (0.2.5)
@@ -367,6 +368,7 @@ GEM
tilt (~> 2.0)
sqlite3 (1.4.2)
sshkey (2.0.0)
swagger-blocks (3.0.0)
thin (1.8.0)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
pkgs/tools/security/metasploit/default.nix
+2 -2
View File
@@ -8,13 +8,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
version = "6.0.43";
version = "6.0.44";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
sha256 = "sha256-dj+8DodQnCJjwhxTD/TjccJvSA8KSjiwiX65V6CIpuQ=";
sha256 = "sha256-6uhqAJ7nlBROdhda9yU2IlAHZrnpKo0kpKoixXJeJYY=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/tools/security/metasploit/gemset.nix
+21 -11
View File
@@ -114,10 +114,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dsmmsk913b50rs4ihk8pafc1gp1i1k1fnbf63ki0j5xdknpli55";
sha256 = "01i0qysphs0fl7gxg23bbsyn8iwgnaif6lvbfg6rdn6gp6qc8qgx";
type = "gem";
};
version = "1.452.0";
version = "1.455.0";
};
aws-sdk-core = {
groups = ["default"];
@@ -134,10 +134,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kcnfr5rw80d46hwp185jniqvbrxcdjy7srh24x7gjm2gpxmm234";
sha256 = "1x4gq4s5d9834n2p5gm1qchm8jvin1ipirc20z1j5lszjxxpy3c2";
type = "gem";
};
version = "1.235.0";
version = "1.236.0";
};
aws-sdk-iam = {
groups = ["default"];
@@ -554,12 +554,12 @@
platforms = [];
source = {
fetchSubmodules = false;
rev = "08fd394933eadca2b90e4de4ecce7f478af1f161";
sha256 = "1r56i2h5gfbyi6q3hjha1x46zhkiwgs0ylqwq9ij572hhw7bqgvn";
rev = "dbc17d32977b2e36ead8dafff4f41c607a8bec88";
sha256 = "11i5brrca8malhj8sap9p5k0fl126qjzfnhpfr719577kq06ms7a";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "6.0.43";
version = "6.0.44";
};
metasploit-model = {
groups = ["default"];
@@ -846,10 +846,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1q34mqihyg7i46z0pbbkyw58fwmkq7a7315apaqmj41zp6akyjf1";
sha256 = "00839fhvcq73h9a4crbrk87y6bi2z4vp1zazxihn6w0mrwr51c3i";
type = "gem";
};
version = "5.3.0";
version = "5.3.1";
};
racc = {
groups = ["default"];
@@ -946,10 +946,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00czf392immsaff10snjxky2vpnfck1bgszpckx15y2kydag5k9i";
sha256 = "11hc55mdl2d4kb8vrbazydxdnzr5l7dd4v5spqrrgnmp2d7rq3az";
type = "gem";
};
version = "2.3.19";
version = "2.3.20";
};
redcarpet = {
groups = ["default"];
@@ -1281,6 +1281,16 @@
};
version = "2.0.0";
};
swagger-blocks = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bycg5si4pr69b0qqiqzhwcich90mvmn0v0gs39slvxg5nv3h28k";
type = "gem";
};
version = "3.0.0";
};
thin = {
groups = ["default"];
platforms = [];
pkgs/tools/typesetting/tex/auctex/default.nix
+11 -9
View File
@@ -1,22 +1,24 @@
{ lib, stdenv, fetchurl, emacs, texlive, ghostscript }:
let auctex = stdenv.mkDerivation ( rec {
version = "12.3";
# Make this a valid tex(live-new) package;
# the pkgs attribute is provided with a hack below.
pname = "auctex";
version = "12.3";
tlType = "run";
outputs = [ "out" "tex" ];
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
sha256 = "1pd99hbhci3l1n0lmzn803svqwl47kld6172gwkwjmwlnqqgxm1g";
hash = "sha256-L9T+MLaUV8knf+IE0+g8hHK89QDI/kqBDXREBhdMqd0=";
};
buildInputs = [ emacs texlive.combined.scheme-basic ghostscript ];
buildInputs = [
emacs
ghostscript
texlive.combined.scheme-basic
];
preConfigure = ''
mkdir -p "$tex"
@@ -27,11 +29,11 @@ let auctex = stdenv.mkDerivation ( rec {
"--with-texmf-dir=\${tex}"
];
meta = {
description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs";
meta = with lib; {
homepage = "https://www.gnu.org/software/auctex";
platforms = lib.platforms.unix;
license = lib.licenses.gpl3;
description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs";
license = licenses.gpl3Plus;
platforms = platforms.unix;
};
});