Merge master into staging-next

nixos/modules/services/misc/tautulli.nix

···
         description = lib.mdDoc "TCP port where Tautulli listens.";
       };
 
+      openFirewall = mkOption {
+        type = types.bool;
+        default = false;
+        description = lib.mdDoc "Open ports in the firewall for Tautulli.";
+      };
+
       user = mkOption {
         type = types.str;
         default = "plexpy";
···
         Restart = "on-failure";
       };
     };
+
+    networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];
 
     users.users = mkIf (cfg.user == "plexpy") {
       plexpy = { group = cfg.group; uid = config.ids.uids.plexpy; };

pkgs/applications/backup/pika-backup/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "pika-backup";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "pika-backup";
     rev = "v${version}";
-    hash = "sha256-D5QkNgscvNaPEykbcR451Wx8Mvn7HTuQE/22lp95Kbo=";
+    hash = "sha256-EiXu5xv42at4NBwpCbij0+YsxVlNvIYrnxmlB9ItqZc=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-c4nYlPyc7D1AMOfHjhoDJox+i83+H1YKfWzR3i6bmng=";
+    hash = "sha256-2IDkVkzH5qQM+XiyxuST5p0y4N/Sz+4+Sj3Smotaf8M=";
   };
 
   patches = [

pkgs/applications/networking/instant-messengers/discord/default.nix

···
     downloadPage = "https://discordapp.com/download";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
-    maintainers = with maintainers; [ ldesgoui MP2E devins2518 ];
+    maintainers = with maintainers; [ MP2E devins2518 ];
     platforms = [ "x86_64-linux" "x86_64-darwin" ]
       ++ lib.optionals (branch != "stable") [ "aarch64-darwin" ];
   };

pkgs/data/fonts/fixedsys-excelsior/default.nix

···
 { lib, fetchurl } :
 
 let
-  major = "3";
-  minor = "00";
-  version = "${major}.${minor}";
+  version = "3.00";
 in fetchurl rec {
   name = "fixedsys-excelsior-${version}";
 
-  urls = [
-    "http://www.fixedsysexcelsior.com/fonts/FSEX300.ttf"
-    "https://raw.githubusercontent.com/chrissimpkins/codeface/master/fonts/fixed-sys-excelsior/FSEX300.ttf"
-    "http://tarballs.nixos.org/sha256/6ee0f3573bc5e33e93b616ef6282f49bc0e227a31aa753ac76ed2e3f3d02056d"
-  ];
+  url = "https://raw.githubusercontent.com/chrissimpkins/codeface/master/fonts/fixed-sys-excelsior/FSEX300.ttf";
+
   downloadToTemp = true;
   recursiveHash = true;
   postFetch = ''
···
   sha256 = "32d6f07f1ff08c764357f8478892b2ba5ade23427af99759f34a0ba24bcd2e37";
 
   meta = {
-    description = "Pan-unicode version of Fixedsys, a classic DOS font";
     homepage = "http://www.fixedsysexcelsior.com/";
+    description = "Pan-unicode version of Fixedsys, a classic DOS font";
     platforms = lib.platforms.all;
     license = lib.licenses.publicDomain;
     maintainers = [ lib.maintainers.ninjatrappeur ];

pkgs/development/libraries/imlib/default.nix

···
-{ lib, stdenv, fetchurl, fetchpatch
-, libX11, libXext, xorgproto, libjpeg, giflib, libtiff, libpng
+{ lib
+, stdenv
+, fetchurl
+, fetchpatch
+, giflib
+, libX11
+, libXext
+, libjpeg
+, libpng
+, libtiff
+, xorgproto
 }:
 
 stdenv.mkDerivation rec {
   pname = "imlib";
   version = "1.9.15";
+
   src = fetchurl {
-    url = "https://tarballs.nixos.org/imlib-${version}.tar.gz";
-    sha256 = "0ggjxyvgp4pxc0b88v40xj9daz90518ydnycw7qax011gxpr12d3";
+    url = "https://ftp.acc.umu.se/pub/GNOME/sources/imlib/1.9/${pname}-${version}.tar.gz";
+    hash = "sha256-o4mQb38hgK7w4czb5lEoIH3VkuyAbIQWYP2S+7bv8j0=";
   };
 
   patches = [
···
     "--x-libraries=${libX11.out}/lib"
   ];
 
-  buildInputs = [ libjpeg libXext libX11 xorgproto libtiff giflib libpng ];
+  buildInputs = [
+    libjpeg
+    libXext
+    libX11
+    xorgproto
+    libtiff
+    giflib
+    libpng
+  ];
 
   meta = with lib; {
     description = "An image loading and rendering library for X11";

pkgs/development/libraries/libnfs/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "libnfs";
-  version = "5.0.1";
+  version = "5.0.2";
 
   src = fetchFromGitHub {
     owner = "sahlberg";
     repo = "libnfs";
     rev = "libnfs-${version}";
-    sha256 = "sha256-5jyY7hqEhBPiQ8pNd+mRTEc4brht4ID7PoV7O2RFNQA=";
+    sha256 = "sha256-rdxi5bPXHTICZQIj/CmHgZ/V70svnITJj/OSF4mmC3o=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

pkgs/development/php-packages/ast/default.nix

···
 buildPecl {
   pname = "ast";
 
-  version = "1.0.16";
-  sha256 = "sha256-Rb2jS3gMRmHOd89lzYpQT7VlJtS0Vu3Ml9eRyG84ec4=";
+  version = "1.1.0";
+  sha256 = "sha256-7j1PZ+JNguTTQIBqJAUgEuSVTSIxIpSTd2ZUJ0Q+bRM=";
 
   meta = with lib; {
     description = "Exposes the abstract syntax tree generated by PHP";

pkgs/development/python-modules/automat/default.nix

···
 { lib
 , buildPythonPackage
 , fetchPypi
+, fetchpatch
 , attrs
-, m2r
 , pytest-benchmark
 , pytestCheckHook
 , setuptools-scm
···
     sha256 = "7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33";
   };
 
+  patches = [
+    # don't depend on m2r
+    (fetchpatch {
+      name = "dont-depend-on-m2r.patch";
+      url = "https://github.com/glyph/automat/compare/v20.2.0..2562fa4ddeba5b5945d9482baa4c26a414f5e831.patch";
+      includes = [ "setup.py" ];
+      hash = "sha256-jlPLJMu1QbBpiVYHDiqPydrXjEoZgYZTVVGNxSA0NxY=";
+    })
+  ];
+
   nativeBuildInputs = [
-    m2r
     setuptools-scm
   ];
 

pkgs/development/python-modules/django-storages/default.nix

···
 
 buildPythonPackage rec {
   pname = "django-storages";
-  version = "1.13";
+  version = "1.13.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-1P7Zi7+1NHCW3frCpmZdUTPHiLnsMsFW7F9/sCrlczU=";
+    sha256 = "sha256-s9mOzAnxsWJ8Kyz0MJZDIs5OCGF9v5tCNsFqModaHgs=";
   };
 
   propagatedBuildInputs = [ django ];

pkgs/development/python-modules/findpython/default.nix

···
 
 let
   pname = "findpython";
-  version = "0.2.0";
+  version = "0.2.1";
 in
 buildPythonPackage {
   inherit pname version;
···
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-wgme4LcfwnFLZPaP0fQLwO5H9J3+lUf7ZNfLzAL+CHE=";
+    hash = "sha256-Q5Shy828+NEOo0OeLYCGsuwHRQcJe25tvuGAKMblKwg=";
   };
 
   nativeBuildInputs = [

pkgs/development/tools/continuous-integration/github-runner/default.nix

···
 in
 stdenv.mkDerivation rec {
   pname = "github-runner";
-  version = "2.294.0";
+  version = "2.295.0";
 
   src = fetchFromGitHub {
     owner = "actions";
     repo = "runner";
     rev = "v${version}";
-    hash = "sha256-2MOvqVlUZBmCt24EYSVjXWKR+fB2Mys70L/1/7jtwQQ=";
+    hash = "sha256-C5tINoFkd2PRbpnlSkPL/o59B7+J+so07oVvJu1m3dk=";
   };
 
   nativeBuildInputs = [

pkgs/development/tools/continuous-integration/github-runner/deps.nix

···
   (fetchNuGet { pname = "Moq"; version = "4.11.0"; sha256 = "08bnk80scjjqnkdbjam8grcqrw2rvj9z7556hiznac7in3fcp77w"; })
   (fetchNuGet { pname = "NETStandard.Library"; version = "1.5.0-rc2-24027"; sha256 = "1kazwidj63w53r1s6fd8sgykb70kdic27fg9qhg74qzwm354imwm"; })
   (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; })
-  (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; })
+  (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; })
   (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; })
   (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; })
   (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; })

pkgs/tools/filesystems/aefs/default.nix

···
-{ lib, stdenv, fetchurl, fetchpatch, fuse }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, fuse
+, git
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "aefs";
-  version = "0.4pre259-8843b7c";
+  version = "unstable-2015-05-06";
 
-  src = fetchurl {
-    url = "http://tarballs.nixos.org/aefs-${version}.tar.bz2";
-    sha256 = "167hp58hmgdavg2mqn5dx1xgq24v08n8d6psf33jhbdabzx6a6zq";
+  src = fetchFromGitHub {
+    owner = "edolstra";
+    repo = "aefs";
+    rev = "e7a9bf8cfa9166668fe1514cc1afd31fc4e10e9a";
+    hash = "sha256-a3YQWxJ7+bYhf1W1kdIykV8U1R4dcDZJ7K3NvNxbF0s=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/edolstra/aefs/commit/15d8df8b8d5dc1ee20d27a86c4d23163a67f3123.patch";
-      sha256 = "0k36hsyvf8a0ji2hpghgqff2fncj0pllxn8p0rs0aj4h7j2vp4iv";
-    })
-  ];
-
   # autoconf's AC_CHECK_HEADERS and AC_CHECK_LIBS fail to detect libfuse on
   # Darwin if FUSE_USE_VERSION isn't set at configure time.
   #
···
   #     $ grep -R FUSE_USE_VERSION
   configureFlags = lib.optional stdenv.isDarwin "CPPFLAGS=-DFUSE_USE_VERSION=26";
 
+  nativeBuildInputs = [ autoreconfHook git ];
+
   buildInputs = [ fuse ];
 
   meta = with lib; {
     homepage = "https://github.com/edolstra/aefs";
     description = "A cryptographic filesystem implemented in userspace using FUSE";
-    platforms = platforms.unix;
     maintainers = [ maintainers.eelco ];
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
+    platforms = platforms.unix;
+    broken = stdenv.isDarwin;
   };
 }

pkgs/tools/text/fastmod/default.nix

···
 
 rustPlatform.buildRustPackage rec {
   pname = "fastmod";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = "facebookincubator";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Lv8hARD/aVWiWpJQmPWPeACpX15+3NogoUl5yh63E7A=";
+    sha256 = "sha256-j5+6ijJ04/Non7AUSN35OhfZ04MiPUDU4V1HLwZaM9k=";
   };
 
-  cargoSha256 = "sha256-L1MKoVacVKcpEG2IfS+eENxFZNiSaTDTxfFbFlvzYl8=";
+  cargoSha256 = "sha256-RNTnP3RKRZXo3+L54y/8nBunGbsxVY72sbl+ZrqfeMI=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
 

pkgs/tools/virtualization/ec2-api-tools/default.nix

···
-{ lib, stdenv, fetchurl, unzip, makeWrapper, jre }:
+{ lib
+, stdenv
+, fetchurl
+, unzip
+, makeWrapper
+, jre
+}:
 
 stdenv.mkDerivation rec {
   pname = "ec2-api-tools";
   version = "1.7.5.1";
 
   src = fetchurl {
-    url = "http://tarballs.nixos.org/ec2-api-tools-${version}.zip";
-    sha256 = "0figmvcm82ghmpz3018ihysz8zpxpysgbpdx7rmciq9y80qbw6l5";
+    url = "http://s3.amazonaws.com/ec2-downloads/${pname}-${version}.zip";
+    sha256 = "sha256-hRq+MEA+4chqPr3d9bS//X70tYcRBTD+rfAJVNmuLzo=";
   };
 
   nativeBuildInputs = [ makeWrapper unzip ];
 
-  installPhase =
-    ''
-      d=$out/libexec/ec2-api-tools
-      mkdir -p $d
-      mv * $d
-      rm $d/bin/*.cmd # Windows stuff
-
-      for i in $d/bin/*; do
-          b=$(basename $i)
-          if [ $b = "ec2-cmd" ]; then continue; fi
-          makeWrapper $i $out/bin/$(basename $i) \
-            --set EC2_HOME $d \
-            --set JAVA_HOME ${jre}
-      done
-    ''; # */
+  installPhase = ''
+    d=$out/libexec/ec2-api-tools
+    mkdir -p $d
+    mv * $d
+    rm $d/bin/*.cmd # Windows stuff
+    for i in $d/bin/*; do
+      b=$(basename $i)
+      if [ $b = "ec2-cmd" ]; then continue; fi
+      makeWrapper $i $out/bin/$(basename $i) \
+        --set EC2_HOME $d \
+        --set JAVA_HOME ${jre}
+    done
+  '';
 
   meta = {
     homepage = "http://developer.amazonwebservices.com/connect/entry.jspa?externalID=351";