Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f6105d21e38a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 553b7a8bf08c
Choose a head ref
Loading
Showing with 165 additions and 110 deletions.
  1. +1 −1 nixos/release-combined.nix
  2. +4 −1 pkgs/applications/editors/emacs/generic.nix
  3. +2 −2 pkgs/applications/misc/xmrig/default.nix
  4. +2 −2 pkgs/applications/networking/msmtp/default.nix
  5. +2 −2 pkgs/applications/science/electronics/ngspice/default.nix
  6. +3 −0 pkgs/applications/science/math/mathematica/default.nix
  7. +3 −2 pkgs/applications/science/misc/snakemake/default.nix
  8. +3 −3 pkgs/applications/window-managers/leftwm/default.nix
  9. +2 −2 pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix
  10. +3 −3 pkgs/development/compilers/gleam/default.nix
  11. +2 −2 pkgs/development/libraries/enet/default.nix
  12. +2 −2 pkgs/development/libraries/libinsane/default.nix
  13. +2 −2 pkgs/development/libraries/matio/default.nix
  14. +17 −5 pkgs/development/ocaml-modules/httpaf/default.nix
  15. +2 −2 pkgs/development/php-packages/composer/2.0.nix
  16. +2 −2 pkgs/development/php-packages/mongodb/default.nix
  17. +2 −2 pkgs/development/php-packages/phpstan/default.nix
  18. +2 −2 pkgs/development/php-packages/protobuf/default.nix
  19. +2 −2 pkgs/development/python-modules/aiounifi/default.nix
  20. +2 −2 pkgs/development/python-modules/arpeggio/default.nix
  21. +9 −2 pkgs/development/python-modules/asciimatics/default.nix
  22. +2 −2 pkgs/development/python-modules/azure-mgmt-netapp/default.nix
  23. +2 −2 pkgs/development/python-modules/batchspawner/default.nix
  24. +2 −2 pkgs/development/python-modules/bitarray/default.nix
  25. +2 −2 pkgs/development/python-modules/bleak/default.nix
  26. +2 −2 pkgs/development/python-modules/braintree/default.nix
  27. +2 −2 pkgs/development/python-modules/breathe/default.nix
  28. +2 −2 pkgs/development/python-modules/dependency-injector/default.nix
  29. +2 −2 pkgs/development/python-modules/devpi-common/default.nix
  30. +2 −2 pkgs/development/python-modules/docrep/default.nix
  31. +2 −2 pkgs/development/python-modules/dogpile.cache/default.nix
  32. +2 −2 pkgs/development/python-modules/elasticsearch-dsl/default.nix
  33. +2 −2 pkgs/development/python-modules/elasticsearch/default.nix
  34. +2 −2 pkgs/development/python-modules/eradicate/default.nix
  35. +2 −2 pkgs/development/python-modules/greenlet/default.nix
  36. +3 −3 pkgs/development/tools/buildpack/default.nix
  37. +2 −2 pkgs/development/tools/pipenv/default.nix
  38. +2 −2 pkgs/development/web/nodejs/v12.nix
  39. +2 −2 pkgs/development/web/nodejs/v14.nix
  40. +2 −2 pkgs/servers/sql/postgresql/ext/pgroonga.nix
  41. +24 −0 pkgs/tools/misc/mmv-go/default.nix
  42. +2 −2 pkgs/tools/networking/lldpd/default.nix
  43. +20 −17 pkgs/tools/networking/v2ray/default.nix
  44. +4 −4 pkgs/tools/networking/v2ray/update.sh
  45. +3 −3 pkgs/tools/security/tor/default.nix
  46. +2 −2 pkgs/tools/system/fio/default.nix
  47. +2 −0 pkgs/top-level/all-packages.nix
2 changes: 1 addition & 1 deletion nixos/release-combined.nix
Original file line number Diff line number Diff line change
@@ -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 changes: 4 additions & 1 deletion pkgs/applications/editors/emacs/generic.nix
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 2 deletions pkgs/applications/misc/xmrig/default.nix
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 2 deletions pkgs/applications/networking/msmtp/default.nix
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 2 deletions pkgs/applications/science/electronics/ngspice/default.nix
Original file line number Diff line number Diff line change
@@ -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 changes: 3 additions & 0 deletions pkgs/applications/science/math/mathematica/default.nix
Original file line number Diff line number Diff line change
@@ -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 changes: 3 additions & 2 deletions pkgs/applications/science/misc/snakemake/default.nix
Original file line number Diff line number Diff line change
@@ -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 changes: 3 additions & 3 deletions pkgs/applications/window-managers/leftwm/default.nix
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix
Original file line number Diff line number Diff line change
@@ -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 changes: 3 additions & 3 deletions pkgs/development/compilers/gleam/default.nix
Original file line number Diff line number Diff line change
@@ -2,21 +2,21 @@

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 ];

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 changes: 2 additions & 2 deletions pkgs/development/libraries/enet/default.nix
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 2 deletions pkgs/development/libraries/libinsane/default.nix
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 2 deletions pkgs/development/libraries/matio/default.nix
Original file line number Diff line number Diff line change
@@ -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 changes: 17 additions & 5 deletions pkgs/development/ocaml-modules/httpaf/default.nix
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 2 deletions pkgs/development/php-packages/composer/2.0.nix
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 2 deletions pkgs/development/php-packages/mongodb/default.nix
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 2 deletions pkgs/development/php-packages/phpstan/default.nix
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 2 deletions pkgs/development/php-packages/protobuf/default.nix
Original file line number Diff line number Diff line change
@@ -3,8 +3,8 @@
buildPecl {
pname = "protobuf";

version = "3.13.0.1";
sha256 = "0vzxwisa8g3xgzcwa5b6cx6nyf41gkm71rxiisnnz1axz4q0hzqf";
version = "3.14.0";
sha256 = "1ldc4s28hq61cfg8l4c06pgicj0ng7k37f28a0dnnbs7xkr7cibd";

buildInputs = [ pcre' ];

4 changes: 2 additions & 2 deletions pkgs/development/python-modules/aiounifi/default.nix
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 2 deletions pkgs/development/python-modules/arpeggio/default.nix
Original file line number Diff line number Diff line change
@@ -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 changes: 9 additions & 2 deletions pkgs/development/python-modules/asciimatics/default.nix
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 2 deletions pkgs/development/python-modules/azure-mgmt-netapp/default.nix
Original file line number Diff line number Diff line change
@@ -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";
};

Loading