MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-09-05 12:01:20 +00:00 committed by GitHub
commit 5b6c2380ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 92 additions and 141 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/misc/reddsaver/default.nix
View file

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "reddsaver";
version = "0.3.3";
version = "0.4.0";
src = fetchFromGitHub {
owner = "manojkarthick";
repo = "reddsaver";
rev = "v${version}";
sha256 = "1czsy1bb0ja650sndwzq9rcbbhcci7s7ablw0agaynhi403shavv";
sha256 = "07xsrc0w0z7w2w0q44aqnn1ybf9vqry01v3xr96l1xzzc5mkqdzf";
};
cargoSha256 = "0wr6y7mfffaqdh6i5nqhx692dih159121sm6k0i37wcdvxhvd51z";
cargoSha256 = "0y94dywligcsqs01d228w454ssrzg31p4j8mni9flcr4v29z3rwp";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]

10
pkgs/applications/office/qownnotes/default.nix
View file

@ -1,15 +1,17 @@
{ mkDerivation, lib, stdenv, fetchurl, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwebsockets, qtx11extras
, qtwayland }:
{ mkDerivation, lib, stdenv, fetchurl
, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwebsockets
, qtx11extras, qtwayland
}:
mkDerivation rec {
pname = "qownnotes";
version = "21.7.4";
version = "21.8.12";
src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
# Fetch the checksum of current version with curl:
# curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256
sha256 = "3957dc623b419582ef7ccc5cb04b8f97bed4e96e8ecc2e99bef9dca7ce255b8e";
sha256 = "85fbfb6288411ed585de85dd2cfcf3b3308eb4634824b96c5842d091da4cd476";
};
nativeBuildInputs = [ qmake qttools ];

63
pkgs/applications/office/timetable/default.nix
View file

@ -1,63 +0,0 @@
{ lib, stdenv
, fetchFromGitHub
, nix-update-script
, glib
, gtk3
, vala
, json-glib
, libgee
, meson
, ninja
, pkg-config
, pantheon
, python3
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "timetable";
version = "1.1.0";
src = fetchFromGitHub {
owner = "lainsce";
repo = pname;
rev = version;
sha256 = "12c8kdrbz6x2mlrvr0nq9y5khj0qiiwlxf7aqc2z3dnrawjgy1rb";
};
nativeBuildInputs = [
meson
ninja
pkg-config
vala
python3
wrapGAppsHook
];
buildInputs = [
glib
gtk3
json-glib
libgee
pantheon.granite
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = pname;
};
};
meta = with lib; {
description = "Plot out your own timetable for the week and organize it";
homepage = "https://github.com/lainsce/timetable";
maintainers = [ maintainers.xiorcale ] ++ pantheon.maintainers;
license = licenses.gpl2Plus;
};
}

19
pkgs/applications/version-management/mercurial/default.nix
View file

@ -13,26 +13,13 @@ let
self = python3Packages.buildPythonApplication rec {
pname = "mercurial";
version = "5.8";
version = "5.9.1";
src = fetchurl {
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
sha256 = "17rhlmmkqz5ll3k68jfzpcifg3nndbcbc2nx7kw8xn3qcj7nlpgw";
sha256 = "09wzyhyajy1dbp5kxkmvs9x8jk964wri19p5jgf83mv27i1zkvrj";
};
patches = [
# https://phab.mercurial-scm.org/D10638, needed for below patch to apply
(fetchpatch {
url = "https://www.mercurial-scm.org/repo/hg/raw-rev/c365850b611490a5fdb235eb1cea310a542c2f84";
sha256 = "1gn3xvahbjdhbglffqpmj559w1bkqqsk70wqcanwv7nh972aqy9g";
})
# https://phab.mercurial-scm.org/D10639, fixes https://bz.mercurial-scm.org/show_bug.cgi?id=6514
(fetchpatch {
url = "https://www.mercurial-scm.org/repo/hg/raw-rev/c8f62920f07a40af3403ba9aefa1dac8a97d53ea";
sha256 = "1kw0xjg2c4jby0ncarjvpa5qafsyl1wzbk6jxls4hnxlxdl53nmn";
})
];
format = "other";
passthru = { inherit python; }; # pass it so that the same version can be used in hg2git
@ -40,7 +27,7 @@ let
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
sha256 = "1kc2giqvfwsdl5fb0qmz96ws1gdrs3skfdzvpiif2i8f7r4nqlhd";
sha256 = "1f7q0kmp46rphw38rlzh1yvpn3rdjdnzzbxzjkrjks8n1gm8baca";
sourceRoot = "${pname}-${version}/rust";
} else null;
cargoRoot = if rustSupport then "rust" else null;

4
pkgs/applications/version-management/tortoisehg/default.nix
View file

@ -4,11 +4,11 @@
python3Packages.buildPythonApplication rec {
pname = "tortoisehg";
version = "5.8";
version = "5.9";
src = fetchurl {
url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz";
sha256 = "154q7kyrdk045wx7rsblzx41k3wbvp2f40kzkxmiiaa5n35srsm3";
sha256 = "1y8nb2b9j9qx11k1wrb9hydc94dgbsqx4yf2bv8y878hqmk1z57a";
};
# Extension point for when thg's mercurial is lagging behind mainline.

12
pkgs/development/libraries/intel-gmmlib/default.nix
View file

@ -1,4 +1,6 @@
{ lib, stdenv, fetchFromGitHub
{ lib
, stdenv
, fetchFromGitHub
, cmake
}:
@ -7,9 +9,9 @@ stdenv.mkDerivation rec {
version = "21.2.2";
src = fetchFromGitHub {
owner = "intel";
repo = "gmmlib";
rev = "${pname}-${version}";
owner = "intel";
repo = "gmmlib";
rev = "${pname}-${version}";
sha256 = "134l0d74ai4mqlp244nvkvg3mgzbzy20mjd274yay8g8hvb1g90v";
};
@ -24,7 +26,7 @@ stdenv.mkDerivation rec {
and buffer management for the Intel(R) Graphics Compute Runtime for
OpenCL(TM) and the Intel(R) Media Driver for VAAPI.
'';
platforms = [ "x86_64-linux" ];
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = with maintainers; [ primeos ];
};
}

4
pkgs/development/python-modules/cogapp/default.nix
View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "cogapp";
version = "3.0.0";
version = "3.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "5e5da2bcfc4e4750c66cecb80ea4eaed1ef4fddd3787c989d4f5bfffb1152d6a";
sha256 = "c43e374ee5ca2a35fbc68556f598bd8578eabe8a890487980bba56945b5ce9c6";
};
# there are no tests

4
pkgs/development/python-modules/exchangelib/default.nix
View file

@ -27,14 +27,14 @@
buildPythonPackage rec {
pname = "exchangelib";
version = "4.5.0";
version = "4.5.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "ecederstrand";
repo = pname;
rev = "v${version}";
sha256 = "sha256-MtWcqsbKls9I7Oj0UlJzWtHsNfAxk4+ojSgK50ljEfs=";
sha256 = "0pj6rcink4awjyq1v30camilqr03kd0sb2p03fk9v4lm63d8w28f";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/numpy-stl/default.nix
View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "numpy-stl";
version = "2.16.0";
version = "2.16.2";
src = fetchPypi {
inherit pname version;
sha256 = "411c633d2a03c295d98fb26023a6e7f574ceead04015d06e80cdab20b630a742";
sha256 = "3e635b6fb6112a3c5e00e9e20eedab93b9b0c45ff1cc34eb7bdc0b3e922e2d77";
};
checkInputs = [ pytest pytest-runner ];

6
pkgs/development/python-modules/python-nomad/default.nix
View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "python-nomad";
version = "1.2.1";
version = "1.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "0ivkfdrmb4wpyawvwrgm3jvx6hn49vqjpwbkmkmamigghqqwacx3";
sha256 = "67731d050472923581c43a39a8f01567468e8b3c8e83465b762c99eb0e5e23bc";
};
propagatedBuildInputs = [ requests ];
@ -14,6 +14,8 @@ buildPythonPackage rec {
# Tests require nomad agent
doCheck = false;
pythonImportsCheck = [ "nomad" ];
meta = with lib; {
description = "Python client library for Hashicorp Nomad";
homepage = "https://github.com/jrxFive/python-nomad";

4
pkgs/development/python-modules/uproot/default.nix
View file

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "uproot";
version = "4.0.8";
version = "4.1.1";
# fetch from github for tests
src = fetchFromGitHub {
owner = "scikit-hep";
repo = "uproot4";
rev = version;
sha256 = "sha256-E9BRgyMz+3Xl8Q1zsnVtvW44FXTqs29U1oK4te0myq4=";
sha256 = "sha256-qh/rtZDE6L1IQJjzE+ns0eSG1BKbES7s3A/35hc+tXg=";
};
propagatedBuildInputs = [

6
pkgs/os-specific/linux/pax-utils/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pax-utils";
version = "1.2.8";
version = "1.3.3";
src = fetchurl {
url = "http://distfiles.gentoo.org/distfiles/${pname}-${version}.tar.xz";
sha256 = "sha256-urTIhG4dLMNmnPqSMdIdszWEHX1Y+eGc0Jn+bOYmsVc=";
sha256 = "sha256-7sp/vZi8Zr6tSncADCAl2fF+qCAbhCRYgkBs4AubaxQ=";
};
makeFlags = [ "PREFIX=$(out)" ];
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
binary files.
'';
homepage = "https://wiki.gentoo.org/wiki/Hardened/PaX_Utilities";
license = licenses.gpl2;
license = licenses.gpl2Only;
platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice joachifm ];
};

4
pkgs/servers/tracing/tempo/default.nix
View file

@ -1,14 +1,14 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
version = "1.0.1";
version = "1.1.0";
pname = "tempo";
src = fetchFromGitHub {
rev = "v${version}";
owner = "grafana";
repo = "tempo";
sha256 = "sha256-4QrCoz4taNXV13g+Pi0j7pTWy0hLY/qAdTOIMMuDWIA=";
sha256 = "sha256-qKsgcc62HTwl7Usmp8zk4vKDo4XEJnwL+A3hoLhgBkk=";
};
vendorSha256 = null;

6
pkgs/tools/filesystems/rdfind/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "rdfind";
version = "1.4.1";
version = "1.5.0";
src = fetchurl {
url = "https://rdfind.pauldreik.se/${pname}-${version}.tar.gz";
sha256 = "132y3wwgnbpdx6f90q0yahd3nkr4cjzcy815ilc8p97b4vn17iih";
sha256 = "103hfqzgr6izmj57fcy4jsa2nmb1ax43q4b5ij92pcgpaq9fsl21";
};
buildInputs = [ nettle ];
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://rdfind.pauldreik.se/";
description = "Removes or hardlinks duplicate files very swiftly";
license = lib.licenses.gpl2;
license = licenses.gpl2Plus;
maintainers = [ maintainers.wmertens ];
platforms = platforms.all;
};

22
pkgs/tools/networking/sstp/default.nix
View file

@ -2,18 +2,17 @@
stdenv.mkDerivation rec {
pname = "sstp-client";
version = "1.0.13";
version = "1.0.15";
src = fetchurl {
url = "mirror://sourceforge/sstp-client/sstp-client/sstp-client-${version}.tar.gz";
sha256 = "06rjyncmgdy212xf9l9z6mfh4gdmgk7l4y841gb8lpbrl3y5h4ln";
sha256 = "sha256-hISqUfv75Big661YrSCo7hxG7XH4AL4YvNI7Qua6rWQ=";
};
patchPhase =
''
sed 's,/usr/sbin/pppd,${ppp}/sbin/pppd,' -i src/sstp-pppd.c
sed "s,sstp-pppd-plugin.so,$out/lib/pppd/sstp-pppd-plugin.so," -i src/sstp-pppd.c
'';
postPatch = ''
sed 's,/usr/sbin/pppd,${ppp}/sbin/pppd,' -i src/sstp-pppd.c
sed "s,sstp-pppd-plugin.so,$out/lib/pppd/sstp-pppd-plugin.so," -i src/sstp-pppd.c
'';
configureFlags = [
"--with-openssl=${openssl.dev}"
@ -22,13 +21,14 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libevent openssl ppp ];
meta = {
meta = with lib; {
description = "SSTP client for Linux";
homepage = "http://sstp-client.sourceforge.net/";
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.ktosiek ];
license = lib.licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ ktosiek ];
license = licenses.gpl2Plus;
};
}

50
pkgs/tools/security/cowpatty/default.nix
View file

@ -1,26 +1,48 @@
{ lib, stdenv, fetchurl, openssl, libpcap
{ lib
, stdenv
, clang
, fetchFromGitHub
, installShellFiles
, openssl
, libpcap
}:
with lib;
stdenv.mkDerivation rec {
pname = "cowpatty";
version = "4.6";
version = "4.8";
buildInputs = [ openssl libpcap ];
src = fetchurl {
url = "http://www.willhackforsushi.com/code/cowpatty/${version}/${pname}-${version}.tgz";
sha256 = "1hivh3bq2maxvqzwfw06fr7h8bbpvxzah6mpibh3wb85wl9w2gyd";
src = fetchFromGitHub {
owner = "joswr1ght";
repo = pname;
rev = version;
sha256 = "0fvwwghhd7wsx0lw2dj9rdsjnirawnq3c6silzvhi0yfnzn5fs0s";
};
installPhase = "make DESTDIR=$out BINDIR=/bin install";
nativeBuildInputs = [
clang
installShellFiles
];
meta = {
buildInputs = [
openssl
libpcap
];
makeFlags = [
"DESTDIR=$(out)"
"BINDIR=/bin"
];
postInstall = ''
installManPage cowpatty.1
installManPage genpmk.1
'';
meta = with lib; {
description = "Offline dictionary attack against WPA/WPA2 networks";
license = licenses.gpl2;
homepage = "https://www.willhackforsushi.com/?page_id=50";
maintainers = with maintainers; [ nico202 ];
homepage = "https://github.com/joswr1ght/cowpatty";
license = licenses.bsd3;
maintainers = with maintainers; [ nico202 fab ];
platforms = platforms.linux;
};
}

6
pkgs/tools/text/hck/default.nix
View file

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "hck";
version = "0.6.1";
version = "0.6.2";
src = fetchFromGitHub {
owner = "sstadick";
repo = pname;
rev = "v${version}";
sha256 = "1l1v02rvb30bcq13ww56k04nc231f7q73zgf281974d6s2qwjdwh";
sha256 = "1xjp56asfn37kr0fsrjkil20nf372q70cijqb5ll2sq2zwjnyyzn";
};
cargoSha256 = "1isgbzi8afbr2xkw70nxakwcb5zjzw28rgp4p7ammhfxjjxw7y93";
cargoSha256 = "12n33gwxcym5z5n762wmzcck4zmmn42kh04nwpdb3az4apghdp3z";
nativeBuildInputs = [ cmake ];

1
pkgs/top-level/aliases.nix
View file

@ -926,6 +926,7 @@ mapAliases ({
tex-gyre-termes-math = tex-gyre-math.termes; # added 2018-04-03
tftp_hpa = tftp-hpa; # added 2015-04-03
timescale-prometheus = promscale; # added 2020-09-29
timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # added 2021-09-05
tomcat7 = throw "tomcat7 has been removed from nixpkgs as it has reached end of life."; # added 2022-06-16
tomcat8 = throw "tomcat8 has been removed from nixpkgs as it has reached end of life."; # added 2022-06-16
tomcat85 = throw "tomcat85 has been removed from nixpkgs as it has reached end of life."; # added 2020-03-11

2
pkgs/top-level/all-packages.nix
View file

@ -9483,8 +9483,6 @@ with pkgs;
timetrap = callPackage ../applications/office/timetrap { };
timetable = callPackage ../applications/office/timetable { };
timekeeper = callPackage ../applications/office/timekeeper { };
timezonemap = callPackage ../development/libraries/timezonemap { };