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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk 2020-11-20 08:12:39 +01:00
commit cbb4e4733b
47 changed files with 165 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/release-combined.nix
View File

@ -49,7 +49,7 @@ in rec {
[ "nixos.channel" ]
(onFullSupported "nixos.dummy")
(onAllSupported "nixos.iso_minimal")
(onAllSupported "nixos.amazonImage")
(onSystems ["x86_64-linux" "aarch64-linux"] "nixos.amazonImage")
(onSystems ["x86_64-linux"] "nixos.iso_plasma5")
(onSystems ["x86_64-linux"] "nixos.iso_gnome")
(onFullSupported "nixos.manual")

5
pkgs/applications/editors/emacs/generic.nix
View File

@ -22,6 +22,7 @@
, srcRepo ? false, autoreconfHook ? null, texinfo ? null
, siteStart ? ./site-start.el
, nativeComp ? false
, withImageMagick ? lib.versionOlder version "27" && (withX || withNS)
, toolkit ? (
if withGTK2 then "gtk2"
else if withGTK3 then "gtk3"
@ -101,7 +102,8 @@ in stdenv.mkDerivation {
++ lib.optionals withX
[ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff libXft
gconf cairo ]
++ lib.optionals (withX || withNS) [ imagemagick librsvg ]
++ lib.optionals (withX || withNS) [ librsvg ]
++ lib.optionals withImageMagick [ imagemagick ]
++ lib.optionals (stdenv.isLinux && withX) [ m17n_lib libotf ]
++ lib.optional (withX && withGTK2) gtk2-x11
++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ]
@ -126,6 +128,7 @@ in stdenv.mkDerivation {
"--with-gif=no" "--with-tiff=no" ])
++ lib.optional withXwidgets "--with-xwidgets"
++ lib.optional nativeComp "--with-nativecomp"
++ lib.optional withImageMagick "--with-imagemagick"
;
installTargets = [ "tags" "install" ];

4
pkgs/applications/misc/xmrig/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "xmrig";
version = "5.11.3";
version = "6.2.2";
src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig";
rev = "v${version}";
sha256 = "019g64rp6g0b0w17bm9l4q5lh7szc6ai8r3bfmy98ngi929r4rl7";
sha256 = "0ph9mrg8i6cv2xjx79118hlm1gcynfavcmp0x2mvvlraxmghfp7a";
};
nativeBuildInputs = [ cmake ];

4
pkgs/applications/networking/msmtp/default.nix
View File

@ -9,11 +9,11 @@ let
in stdenv.mkDerivation rec {
pname = "msmtp";
version = "1.8.12";
version = "1.8.13";
src = fetchurl {
url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
sha256 = "0m33m5bc7ajmgy7vivnzj3mhybg37259hx79xypj769kfyafyvx8";
sha256 = "1fcv99nis7c6yc63n04cncjysv9jndrp469gcfxh54aiinmlbadd";
};
patches = [

4
pkgs/applications/science/electronics/ngspice/default.nix
View File

@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "ngspice";
version = "32";
version = "33";
src = fetchurl {
url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz";
sha256 = "1wiys30c9mqzxr7iv1sws0jnn4xi0mj3lanhnk2qfvaiji70rn9w";
sha256 = "1wa1hmpn13spmxqgbb1m7vgy32mwvjqwrxhymzll8z65q5nbd7dr";
};
nativeBuildInputs = [ flex bison ];

3
pkgs/applications/science/math/mathematica/default.nix
View File

@ -144,6 +144,9 @@ stdenv.mkDerivation rec {
'';
dontBuild = true;
# This is primarily an IO bound build; there's little benefit to building remotely.
preferLocalBuild = true;
# all binaries are already stripped
dontStrip = true;

5
pkgs/applications/science/misc/snakemake/default.nix
View File

@ -2,7 +2,7 @@
python3Packages.buildPythonApplication rec {
pname = "snakemake";
version = "5.19.3";
version = "5.28.0";
propagatedBuildInputs = with python3Packages; [
appdirs
@ -13,6 +13,7 @@ python3Packages.buildPythonApplication rec {
jsonschema
nbformat
psutil
pulp
pyyaml
ratelimiter
requests
@ -22,7 +23,7 @@ python3Packages.buildPythonApplication rec {
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "b83f3ef73e25dafcb39b3565030e33fa2f7e80ed70256c535dc7e58ea762305d";
sha256 = "2367ce91baf7f8fa7738d33aff9670ffdf5410bbac49aeb209f73b45a3425046";
};
doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json

6
pkgs/applications/window-managers/leftwm/default.nix
View File

@ -6,16 +6,16 @@ in
rustPlatform.buildRustPackage rec {
pname = "leftwm";
version = "0.2.4";
version = "0.2.5";
src = fetchFromGitHub {
owner = "leftwm";
repo = "leftwm";
rev = version;
sha256 = "0xmkhkdpz1bpczrar9y6assdzhd7qxybnkjqs36h099fk9xqmsav";
sha256 = "03kk3vg0r88317zv8j2bj44wq2fwxi25rv1aasvayrh1i5j6zr10";
};
cargoSha256 = "06wnx81fhs19pz5qnir6h2v2kmj73y1g354nadcx6650q9pnhdv4";
cargoSha256 = "0m4sv4chxzk60njixlyja44rpn04apf3bm04fgd3v7abpr169f2s";
buildInputs = [ makeWrapper libX11 libXinerama ];

4
pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-workspace-matrix";
version = "4.0.1";
version = "4.0.2";
src = fetchFromGitHub {
owner = "mzur";
repo = "gnome-shell-wsmatrix";
rev = "v${version}";
sha256 = "1xx2h8k981657lws614f7x4mqjk900xq9907j2h5jdhbbic5ppy6";
sha256 = "0dbn6b3fdd7yblk0mhsmaiqs3mwgcf3khkx1dsnlqn5hcs0a3myd";
};
uuid = "wsmatrix@martin.zurowietz.de";

6
pkgs/development/compilers/gleam/default.nix
View File

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "gleam";
version = "0.12.0";
version = "0.12.1";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = pname;
rev = "v${version}";
sha256 = "1hlbskpfqdh5avmqnry69s7x0wj6l6yaqkayx7lj6z99p58p9zrz";
sha256 = "0n23pn7jk4i2waczw5cczsb7v4lal4x6xqmp01y280hb2vk176fg";
};
nativeBuildInputs = [ pkg-config ];
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++
stdenv.lib.optionals stdenv.isDarwin [ Security ];
cargoSha256 = "1djznh7v6ha4ks8l8arwwn301qclmb7iih774q5y7sbzqrv7sw0q";
cargoSha256 = "0rnf9agpzlvk53x8zrg32w6r0gxcbank3fs32ydv53frvqv1spj3";
meta = with stdenv.lib; {
description = "A statically typed language for the Erlang VM";

4
pkgs/development/libraries/enet/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "enet-1.3.16";
name = "enet-1.3.17";
src = fetchurl {
url = "http://enet.bespin.org/download/${name}.tar.gz";
sha256 = "1lggc82rbzscci057dqqyhkbq4j6mr5k01hbrvn06jkzc2xpxdxv";
sha256 = "1p6f9mby86af6cs7pv6h48032ip9g32c05cb7d9mimam8lchz3x3";
};
meta = {

4
pkgs/development/libraries/libinsane/default.nix
View File

@ -17,7 +17,7 @@
stdenv.mkDerivation rec {
pname = "libinsane";
version = "1.0.7";
version = "1.0.8";
outputs = [ "out" "dev" "devdoc" ];
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
group = "World";
owner = "OpenPaperwork";
rev = version;
sha256 = "03r6niyzfahnlpvhn68h59i6926ciwz88krqbf0akd9f42y9zf2k";
sha256 = "0mcvqpixilzs4d4afkbxa1nqm6ddmhpaz5j56pfvc5wpv6s99h44";
};
nativeBuildInputs = [ meson pkg-config ninja doxygen gtk-doc docbook_xsl gobject-introspection vala ];

4
pkgs/development/libraries/matio/default.nix
View File

@ -1,9 +1,9 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "matio-1.5.18";
name = "matio-1.5.19";
src = fetchurl {
url = "mirror://sourceforge/matio/${name}.tar.gz";
sha256 = "09gy507zm1gxxyxf5qapzgars51pm16wis7lqqf84kc57ak73baz";
sha256 = "0vr8c1mz1k6mz0sgh6n3scl5c3a71iqmy5fnydrgq504icj4vym4";
};
meta = with stdenv.lib; {

22
pkgs/development/ocaml-modules/httpaf/default.nix
View File

@ -1,19 +1,31 @@
{ lib, fetchFromGitHub, buildDunePackage, ocaml, angstrom, faraday, alcotest }:
{ lib, fetchFromGitHub, fetchpatch, buildDunePackage
, angstrom, faraday, alcotest
}:
buildDunePackage rec {
pname = "httpaf";
version = "0.4.1";
version = "0.6.6";
useDune2 = true;
src = fetchFromGitHub {
owner = "inhabitedtype";
repo = pname;
rev = version;
sha256 = "0i2r004ihj00hd97475y8nhjqjln58xx087zcjl0dfp0n7q80517";
sha256 = "065ikryv8zw9cbk6ddcjcind88ckk0inz9m3sqj9nwyfw4v4scm6";
};
checkInputs = lib.optional doCheck alcotest;
patches = [
# Fix tests with angstrom ≥ 0.14
(fetchpatch {
url = "https://github.com/inhabitedtype/httpaf/commit/fc0de5f2f1bd8df953ae4d4c9a61032392436c84.patch";
sha256 = "1a8ca76ifbgyaq1bqfyq18mmxinjjparzkrr7ljbj0y1z1rl748z";
})
];
checkInputs = [ alcotest ];
propagatedBuildInputs = [ angstrom faraday ];
doCheck = lib.versions.majorMinor ocaml.version != "4.07";
doCheck = true;
meta = {
description = "A high-performance, memory-efficient, and scalable web server for OCaml";

4
pkgs/development/php-packages/composer/2.0.nix
View File

@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, pkgs, lib, php }:
let
pname = "composer";
version = "2.0.4";
version = "2.0.7";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://getcomposer.org/download/${version}/composer.phar";
sha256 = "03bnaifywh8pmpzl0b8r3rm3radj0rz176vzkz327j99fi3vrcn3";
sha256 = "1sgbawai2jwriyfdlc7xp0qz535hd61xcbsnqiaxwp0xmy60w1ha";
};
dontUnpack = true;

4
pkgs/development/php-packages/mongodb/default.nix
View File

@ -3,8 +3,8 @@
buildPecl {
pname = "mongodb";
version = "1.8.1";
sha256 = "0xxrll17c7nz146g9gww4cg41xc3qg41n73syb06546q9skqabyl";
version = "1.8.2";
sha256 = "01l300204ph9nd7khd9qazpdbi1biqvmjqbxbngdfjk9n5d8vvzw";
nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = with pkgs; [

4
pkgs/development/php-packages/phpstan/default.nix
View File

@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, pkgs, lib, php }:
let
pname = "phpstan";
version = "0.12.52";
version = "0.12.55";
in
mkDerivation {
inherit pname version;
src = pkgs.fetchurl {
url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
sha256 = "0zhbpcja7fyhqi2p8mky7v3dv50dgi4yxpj2hvmxs61kp9irf0nb";
sha256 = "1qyywsivfal1d8485v2iyg5x3f9krnviv5nidgfv53ywrm9k4lgp";
};
phases = [ "installPhase" ];

4
pkgs/development/php-packages/protobuf/default.nix
View File

@ -3,8 +3,8 @@
buildPecl {
pname = "protobuf";
version = "3.13.0.1";
sha256 = "0vzxwisa8g3xgzcwa5b6cx6nyf41gkm71rxiisnnz1axz4q0hzqf";
version = "3.14.0";
sha256 = "1ldc4s28hq61cfg8l4c06pgicj0ng7k37f28a0dnnbs7xkr7cibd";
buildInputs = [ pcre' ];

4
pkgs/development/python-modules/aiounifi/default.nix
View File

@ -3,13 +3,13 @@
buildPythonPackage rec {
pname = "aiounifi";
version = "23";
version = "25";
disabled = ! isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "0628058b644776132f2f893f1a2201a0142a38b6acf089c6b11a63ad5a752ba7";
sha256 = "1777effcc4ec8683e53603437887c43fa650f09ef4d148904ce06e2aa11044b7";
};
propagatedBuildInputs = [ aiohttp ];

4
pkgs/development/python-modules/arpeggio/default.nix
View File

@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "Arpeggio";
version = "1.9.2";
version = "1.10.1";
src = fetchPypi {
inherit pname version;
sha256 = "948ce06163a48a72c97f4fe79ad3d1c1330b6fec4f22ece182fb60ef60bd022b";
sha256 = "920d12cc762edb2eb56daae64a14c93e43dc181b481c88fc79314c0df6ee639e";
};
# Shall not be needed for next release

11
pkgs/development/python-modules/asciimatics/default.nix
View File

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "asciimatics";
version = "1.11.0";
version = "1.12.0";
src = fetchPypi {
inherit pname version;
sha256 = "132y3gc0dj9vmgajmzz2fyc3icrrgsvynwfl0g31bylm7h9p220x";
sha256 = "4120461a3fb345638dee4fe0f8a3d3f9b6d2d2e003f95c5f914523f94463158d";
};
nativeBuildInputs = [
@ -39,6 +39,13 @@ buildPythonPackage rec {
# which is too complicated to setup here
doCheck = false;
pythonImportsCheck = [
"asciimatics.effects"
"asciimatics.renderers"
"asciimatics.scene"
"asciimatics.screen"
];
meta = with lib; {
description = "Helps to create full-screen text UIs (from interactive forms to ASCII animations) on any platform";
homepage = "https://github.com/peterbrittain/asciimatics";

4
pkgs/development/python-modules/azure-mgmt-netapp/default.nix
View File

@ -5,13 +5,13 @@
}:
buildPythonPackage rec {
version = "0.13.0";
version = "0.14.0";
pname = "azure-mgmt-netapp";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "e86034d073144bd5dbafe17e20fef3f48b5bf98a31b27cc0de462dc8f98303bb";
sha256 = "6fd915e68d314bec8b56c6ece194005d2c4fc97478fc1f797639d4a6913c1539";
extension = "zip";
};

4
pkgs/development/python-modules/batchspawner/default.nix
View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "batchspawner";
version = "1.0.0";
version = "1.0.1";
disabled = isPy27;
src = fetchFromGitHub {
owner = "jupyterhub";
repo = "batchspawner";
rev = "v${version}";
sha256 = "0yn312sjfjpjjfciagbczfmqprk2fj4lbb3vsbzj17p948acq5w2";
sha256 = "0vqf3qc2yp52441s6xwgixgl37976qqgpd9sshbgh924j314v1yv";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/bitarray/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "bitarray";
version = "1.6.0";
version = "1.6.1";
src = fetchPypi {
inherit pname version;
sha256 = "ba157ddebddc723fe021fc80595b3c70924d69ee58286b62bfca21da48edfc9d";
sha256 = "ab85b38365dd9956264226b30dababa02161ed49bb36c7ee82cc6545e07b1599";
};
meta = with lib; {

4
pkgs/development/python-modules/bleak/default.nix
View File

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "bleak";
version = "0.7.1";
version = "0.9.1";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "25f630cf558efda5cbf620d921b85a80ae963c537feaa18cc934f7fa38dc482d";
sha256 = "f81b0069e5c1570883144c1910b884e5cefe16d3c2ed09e579b6d8f853f08588";
};
postPatch = ''

4
pkgs/development/python-modules/braintree/default.nix
View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "braintree";
version = "4.4.0";
version = "4.5.0";
src = fetchPypi {
inherit pname version;
sha256 = "79ddadaa9db60b81762a10af0c0d994fd60d21616c7d9229d6f7ce1930f8d343";
sha256 = "98b9775e3d5f793c0a47df6b3649cd175705ee2d9163f7853e8c73acec7b923f";
};
propagatedBuildInputs = [ requests ];

4
pkgs/development/python-modules/breathe/default.nix
View File

@ -1,13 +1,13 @@
{ lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }:
buildPythonPackage rec {
version = "4.23.0";
version = "4.24.0";
pname = "breathe";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "c28e251ad8a42e4d3dd6c0861a66128b400131614b36f19df505ea34c934f801";
sha256 = "cd959f259361473896857d5720386963800f8401d29b696705ebb01711d96e35";
};
propagatedBuildInputs = [ docutils six sphinx ];

4
pkgs/development/python-modules/dependency-injector/default.nix
View File

@ -9,11 +9,11 @@ in
buildPythonPackage rec {
pname = "dependency-injector";
version = "3.30.4";
version = "4.4.1";
src = fetchPypi {
inherit pname version;
sha256 = "717388a9346883eb5def3e96def7275763f2a607cac48c272f352e3834e0bd0d";
sha256 = "8c3d9ec6502e2d8051dcdf2603cccb4a87da292a1770e9854814fe928fa4a9b1";
};
propagatedBuildInputs = [ six ];

4
pkgs/development/python-modules/devpi-common/default.nix
View File

@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "devpi-common";
version = "3.5.0";
version = "3.6.0";
src = fetchPypi {
inherit pname version;
sha256 = "4f1eb1bf85a5dabd4f4ecc11ad99588e01cc204989a9f424c2dbe5809c6c3745";
sha256 = "fc14aa6b74d4d9e27dc2e9cbff000ed9be5cd723d3ac9672e66e4e8fce797227";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/docrep/default.nix
View File

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "docrep";
version = "0.2.7";
version = "0.3.1";
src = fetchPypi {
inherit pname version;
sha256 = "c48939ae14d79172839a5bbaf5a570add47f6cc44d2c18f6b1fac8f1c38dec4d";
sha256 = "ef6e7433716c0d2c59889aae8bff800b48e82d7e759dfd934b93100dc7bccaa1";
};
checkInputs = [ pytest ];

4
pkgs/development/python-modules/dogpile.cache/default.nix
View File

@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "dogpile.cache";
version = "1.0.2";
version = "1.1.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "64fda39d25b46486a4876417ca03a4af06f35bfadba9f59613f9b3d748aa21ef";
sha256 = "eba3eb532be75a930f7a70c40c9a66829a3f7281650ad3cd3a786b2e4ba68e83";
};
# Disable concurrency tests that often fail,

4
pkgs/development/python-modules/elasticsearch-dsl/default.nix
View File

@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "elasticsearch-dsl";
version = "7.2.1";
version = "7.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "1e345535164cb684de4b825e1d0daf81b75554b30d3905446584a9e4af0cc3e7";
sha256 = "0ed75f6ff037e36b2397a8e92cae0ddde79b83adc70a154b8946064cb62f7301";
};
propagatedBuildInputs = [ elasticsearch python-dateutil six ]

4
pkgs/development/python-modules/elasticsearch/default.nix
View File

@ -7,11 +7,11 @@
buildPythonPackage (rec {
pname = "elasticsearch";
version = "7.9.1";
version = "7.10.0";
src = fetchPypi {
inherit pname version;
sha256 = "5e08776fbb30c6e92408c7fa8c37d939210d291475ae2f364f0497975918b6fe";
sha256 = "9053ca99bc9db84f5d80e124a79a32dfa0f7079b2112b546a03241c0dbeda36d";
};
# Check is disabled because running them destroy the content of the local cluster!

4
pkgs/development/python-modules/eradicate/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "eradicate";
version = "1.0";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "06nhs8wml5f5k96gbq7jl417bmsqnxy8aykpzbzrvm3gmqmaizag";
sha256 = "27434596f2c5314cc9b31410c93d8f7e8885747399773cd088d3adea647a60c8";
};
meta = with lib; {

4
pkgs/development/python-modules/greenlet/default.nix
View File

@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "greenlet";
version = "0.4.17";
version = "0.4.16";
disabled = isPyPy; # builtin for pypy
src = fetchPypi {
inherit pname version;
sha256 = "41d8835c69a78de718e466dd0e6bfd4b46125f21a67c3ff6d76d8d8059868d6b";
sha256 = "6e06eac722676797e8fce4adb8ad3dc57a1bb3adfb0dd3fdf8306c055a38456c";
};
propagatedBuildInputs = [ six ];

6
pkgs/development/tools/buildpack/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pack";
version = "0.14.2";
version = "0.15.0";
src = fetchFromGitHub {
owner = "buildpacks";
repo = pname;
rev = "v${version}";
sha256 = "0m2hcd7fdvlqy8yp3pa2ccpk9wbnknjh2f8qic31v9yh3zm8aga7";
sha256 = "0i3lzfn5m38f8aiwqydffdq2j8gfcnkmcgasfjxbn6rrs0hw5g92";
};
vendorSha256 = "1c38g169kq9kv6x0x1rlg39ywbc1q66fndby0v85b3ri3xb52869";
vendorSha256 = "0i6nplh1papcmdzas9f8pkccsx5csbxxkvy5a6130jjbwdm14jw7";
nativeBuildInputs = [ installShellFiles ];

4
pkgs/development/tools/pipenv/default.nix
View File

@ -18,11 +18,11 @@ let
in buildPythonApplication rec {
pname = "pipenv";
version = "2020.11.4";
version = "2020.11.15";
src = fetchPypi {
inherit pname version;
sha256 = "d6ac39d1721517b23aca12cdb4c726dc318ec4d7bdede5c1220bbb81775005c3";
sha256 = "8253fe6f9cfb3791a54da8a0571f73c918cb3457dd908684c1800a13a06ec4c1";
};
LC_ALL = "en_US.UTF-8";

4
pkgs/development/web/nodejs/v12.nix
View File

@ -8,6 +8,6 @@ let
in
buildNodejs {
inherit enableNpm;
version = "12.19.0";
sha256 = "1qainpkakkl3xip9xz2wbs74g95gvc6125cc05z6vyckqi2iqrrv";
version = "12.19.1";
sha256 = "0zdis5wd84c57qjdiry8mmhpp009wqhb51f67iphl06vqc67w1vl";
}

4
pkgs/development/web/nodejs/v14.nix
View File

@ -8,6 +8,6 @@ let
in
buildNodejs {
inherit enableNpm;
version = "14.15.0";
sha256 = "0fzv05f8rnc0s1a11k0cqfpgv9yawfbdd8qcl8zr25kv5ridhdip";
version = "14.15.1";
sha256 = "1g61vqsgq3jsipw2fckj68i4a4pi1iz1kbw7mlw8jmzp8rl46q81";
}

4
pkgs/servers/sql/postgresql/ext/pgroonga.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pgroonga";
version = "2.2.6";
version = "2.2.7";
src = fetchurl {
url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz";
sha256 = "0anlxw4j6c3rd7q34j9mgph6i0zb1nff3warcxrkwvnnd1jbb6vr";
sha256 = "1rd3cxap9rqpg5y8y48r5bd7rki3lck6qsrb0bqdqm9xffnibw8j";
};
nativeBuildInputs = [ pkgconfig ];

24
pkgs/tools/misc/mmv-go/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "mmv-go";
version = "0.1.2";
src = fetchFromGitHub {
owner = "itchyny";
repo = "mmv";
rev = "v${version}";
sha256 = "0kpf6abzhsikm7vyk5735p8sfjhsh7klla9qnmc43mgh0560f020";
};
vendorSha256 = "1nnfi5zad7nlp44mj0fdg09q8pm093di7rr7pknl9whqghv36dfi";
buildFlagsArray = [ "-ldflags=-s -w -X main.revision=${src.rev}" ];
meta = with lib; {
homepage = "https://github.com/itchyny/mmv";
description = "Rename multiple files using your $EDITOR";
license = licenses.mit;
maintainers = with maintainers; [ zowoq ];
};
}

4
pkgs/tools/networking/lldpd/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "lldpd";
version = "1.0.6";
version = "1.0.7";
src = fetchurl {
url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz";
sha256 = "1v5fd8vwxracvzvgrsswvhppwyx5c4srj89g1cnvy73w831mpq95";
sha256 = "1qc7k83zpcq27hpjv1lmgrj4la2zy1gspwk5jas43j49siwr3xqx";
};
configureFlags = [

37
pkgs/tools/networking/v2ray/default.nix
View File

@ -3,33 +3,33 @@
}:
let
version = "4.31.0";
version = "4.32.1";
src = fetchFromGitHub {
owner = "v2ray";
owner = "v2fly";
repo = "v2ray-core";
rev = "v${version}";
sha256 = "0s0blc05nrqm78qslv5xb42pjlx5v8qqwg0pwbzhxn9s71x2669m";
sha256 = "1mlrl5fz1v3bcb83pczqp859d8w9mi7jj600a2yw7xm372w2irk8";
};
vendorSha256 = "0n2mf19fvgk5x0j2wwm4zk9xikzvl6cdvw26qar91wzcsraf5z2d";
vendorSha256 = "1mz1acdj8ailgyqrr1v47n36qc24ggzw5rmj4p2awfwz3gp2yz6z";
assets = {
# MIT licensed
"geoip.dat" = let
geoipRev = "202009300006";
geoipSha256 = "1ss2izqlmrp5b5kpw804jk6c1nyimwlccbkikix3bwfaz4vlv1nc";
geoipRev = "202011050012";
geoipSha256 = "1d2n3hskgdmcfk1nl7a8lxxz325p84i7gz44cs77z1m9r7c2vsjy";
in fetchurl {
url = "https://github.com/v2ray/geoip/releases/download/${geoipRev}/geoip.dat";
url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat";
sha256 = geoipSha256;
};
# MIT licensed
"geosite.dat" = let
geositeRev = "20201010021828";
geositeSha256 = "0gpfhcf4iyx7ip7rlkb0l1q64w84zvmcah52qyjwljs6l4p3hrj9";
geositeRev = "20201102141726";
geositeSha256 = "0sn2f5vd6w94ryh845mnbfyjzycg7cvb66rkzh37pg9l7fvgs4jh";
in fetchurl {
url = "https://github.com/v2ray/domain-list-community/releases/download/${geositeRev}/dlc.dat";
url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat";
sha256 = geositeSha256;
};
@ -59,20 +59,23 @@ let
installPhase = ''
install -Dm755 v2ray v2ctl -t $out/bin
'';
meta = {
homepage = "https://www.v2ray.com/en/index.html";
description = "A platform for building proxies to bypass network restrictions";
# The license of the dependency `https://github.com/XTLS/Go` doesn't allowed user to modify its source code,
# which made it unfree.
license = with lib.licenses; [ mit unfree ];
maintainers = with lib.maintainers; [ servalcatty ];
};
};
in runCommand "v2ray-${version}" {
inherit version;
inherit (core) meta;
nativeBuildInputs = [ makeWrapper ];
meta = {
homepage = "https://www.v2ray.com/en/index.html";
description = "A platform for building proxies to bypass network restrictions";
license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [ servalcatty ];
};
passthru = {
updateScript = ./update.sh;
tests = {

8
pkgs/tools/networking/v2ray/update.sh
View File

@ -14,7 +14,7 @@ echo "Current version:" >&2
echo "core: $old_core_rev, geoip: $old_geoip_rev, geosite: $old_geosite_rev" >&2
function fetch_latest_rev {
curl "https://api.github.com/repos/v2ray/$1/releases" |
curl "https://api.github.com/repos/v2fly/$1/releases" |
jq '.[0].tag_name' --raw-output
}
@ -28,7 +28,7 @@ echo "core: $core_rev, geoip: $geoip_rev, geosite: $geosite_rev" >&2
if [[ $core_rev != $old_core_rev ]]; then
echo "Prefetching core..." >&2
{ read hash; read store_path; } < <(
nix-prefetch-url --unpack --print-path "https://github.com/v2ray/v2ray-core/archive/v$core_rev.zip"
nix-prefetch-url --unpack --print-path "https://github.com/v2fly/v2ray-core/archive/v$core_rev.zip"
)
sed --in-place \
@ -40,7 +40,7 @@ fi
if [[ $geoip_rev != $old_geoip_rev ]]; then
echo "Prefetching geoip..." >&2
hash=$(nix-prefetch-url "https://github.com/v2ray/geoip/releases/download/$geoip_rev/geoip.dat")
hash=$(nix-prefetch-url "https://github.com/v2fly/geoip/releases/download/$geoip_rev/geoip.dat")
sed --in-place \
-e "s/\bgeoipRev = \".*\"/geoipRev = \"$geoip_rev\"/" \
-e "s/\bgeoipSha256 = \".*\"/geoipSha256 = \"$hash\"/" \
@ -49,7 +49,7 @@ fi
if [[ $geosite_rev != $old_geosite_rev ]]; then
echo "Prefetching geosite..." >&2
hash=$(nix-prefetch-url "https://github.com/v2ray/domain-list-community/releases/download/$geosite_rev/dlc.dat")
hash=$(nix-prefetch-url "https://github.com/v2fly/domain-list-community/releases/download/$geosite_rev/dlc.dat")
sed --in-place \
-e "s/\bgeositeRev = \".*\"/geositeRev = \"$geosite_rev\"/" \
-e "s/\bgeositeSha256 = \".*\"/geositeSha256 = \"$hash\"/" \

6
pkgs/tools/security/tor/default.nix
View File

@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "tor";
version = "0.4.4.5";
version = "0.4.4.6";
src = fetchurl {
url = "https://dist.torproject.org/${pname}-${version}.tar.gz";
sha256 = "09lr6l98qmc69pzsi8r02z86v969dbfwjrwphfm3npknzq5a0p54";
sha256 = "1p0zpqmbskygx0wmiijhprg8r45n2wqbbjl7kv4gbb83b0alq5az";
};
outputs = [ "out" "geoip" ];
@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
maintainers = with maintainers;
[ phreedom thoughtpolice joachifm ];
[ phreedom thoughtpolice joachifm prusnak ];
platforms = platforms.unix;
};
}

4
pkgs/tools/system/fio/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "fio";
version = "3.23";
version = "3.24";
src = fetchFromGitHub {
owner = "axboe";
repo = "fio";
rev = "fio-${version}";
sha256 = "0xr1d1jh7zhdhf0zfv8w6r99hk8h5d22v36h13hrd8mqyaz1g8m0";
sha256 = "0wkbs8gzfvclsn576fcx5sqzb5qs7annn7ra4kk2i578a32q4sxw";
};
buildInputs = [ python zlib ]

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

@ -5203,6 +5203,8 @@ in
mmv = callPackage ../tools/misc/mmv { };
mmv-go = callPackage ../tools/misc/mmv-go { };
most = callPackage ../tools/misc/most { };
motion = callPackage ../applications/video/motion { };