From 7b9129a98146cff91360419541955f55c5a09aec Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sat, 15 Feb 2020 01:41:39 +0100 Subject: [PATCH 001/590] dstat: fix pluginpath --- pkgs/os-specific/linux/dstat/default.nix | 2 ++ pkgs/os-specific/linux/dstat/fix_pluginpath.patch | 15 +++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/os-specific/linux/dstat/fix_pluginpath.patch diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix index 25d0eb1fd029..0e4725b6f19b 100644 --- a/pkgs/os-specific/linux/dstat/default.nix +++ b/pkgs/os-specific/linux/dstat/default.nix @@ -12,6 +12,8 @@ python2Packages.buildPythonApplication rec { propagatedBuildInputs = with python2Packages; [ python-wifi ]; + patches = [ ./fix_pluginpath.patch ]; + makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/dstat/fix_pluginpath.patch b/pkgs/os-specific/linux/dstat/fix_pluginpath.patch new file mode 100644 index 000000000000..06d7793da47e --- /dev/null +++ b/pkgs/os-specific/linux/dstat/fix_pluginpath.patch @@ -0,0 +1,15 @@ +diff --git a/dstat b/dstat +index 3ac7087..c5f089d 100755 +--- a/dstat ++++ b/dstat +@@ -66,9 +66,7 @@ if sys.version_info < (2, 3): + + pluginpath = [ + os.path.expanduser('~/.dstat/'), # home + /.dstat/ +- os.path.abspath(os.path.dirname(sys.argv[0])) + '/plugins/', # binary path + /plugins/ +- '/usr/share/dstat/', +- '/usr/local/share/dstat/', ++ os.path.abspath(os.path.dirname(sys.argv[0])) + '/../share/dstat/', # binary path + /../share/dstat/ + ] + + class Options: From 733acfa140d5b73bc69c53c4ebd90ccc5f281f0e Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 9 Feb 2020 19:40:52 -0500 Subject: [PATCH 002/590] nixos/syncoid: automatically setup privilege delegation --- nixos/modules/services/backup/syncoid.nix | 52 +++++++++++++++++++++-- nixos/tests/sanoid.nix | 9 ++-- 2 files changed, 53 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/backup/syncoid.nix b/nixos/modules/services/backup/syncoid.nix index 53787a0182af..41e7a9ef6fe9 100644 --- a/nixos/modules/services/backup/syncoid.nix +++ b/nixos/modules/services/backup/syncoid.nix @@ -4,6 +4,15 @@ with lib; let cfg = config.services.syncoid; + + # Extract pool names of local datasets (ones that don't contain "@") that + # have the specified type (either "source" or "target") + getPools = type: unique (map (d: head (builtins.match "([^/]+).*" d)) ( + # Filter local datasets + filter (d: !hasInfix "@" d) + # Get datasets of the specified type + (catAttrs type (attrValues cfg.commands)) + )); in { # Interface @@ -26,14 +35,25 @@ in { user = mkOption { type = types.str; - default = "root"; + default = "syncoid"; example = "backup"; description = '' - The user for the service. Sudo or ZFS privilege delegation must be - configured to use a user other than root. + The user for the service. ZFS privilege delegation will be + automatically configured for any local pools used by syncoid if this + option is set to a user other than root. The user will be given the + "hold" and "send" privileges on any pool that has datasets being sent + and the "create", "mount", "receive", and "rollback" privileges on + any pool that has datasets being received. ''; }; + group = mkOption { + type = types.str; + default = "syncoid"; + example = "backup"; + description = "The group for the service."; + }; + sshKey = mkOption { type = types.nullOr types.path; # Prevent key from being copied to store @@ -146,6 +166,18 @@ in { # Implementation config = mkIf cfg.enable { + users = { + users = mkIf (cfg.user == "syncoid") { + syncoid = { + group = cfg.group; + isSystemUser = true; + }; + }; + groups = mkIf (cfg.group == "syncoid") { + syncoid = {}; + }; + }; + systemd.services.syncoid = { description = "Syncoid ZFS synchronization service"; script = concatMapStringsSep "\n" (c: lib.escapeShellArgs @@ -156,10 +188,22 @@ in { ++ c.extraArgs ++ [ "--sendoptions" c.sendOptions "--recvoptions" c.recvOptions + "--no-privilege-elevation" c.source c.target ])) (attrValues cfg.commands); after = [ "zfs.target" ]; - serviceConfig.User = cfg.user; + serviceConfig = { + ExecStartPre = (map (pool: lib.escapeShellArgs [ + "+/run/booted-system/sw/bin/zfs" "allow" + cfg.user "hold,send" pool + ]) (getPools "source")) ++ + (map (pool: lib.escapeShellArgs [ + "+/run/booted-system/sw/bin/zfs" "allow" + cfg.user "create,mount,receive,rollback" pool + ]) (getPools "target")); + User = cfg.user; + Group = cfg.group; + }; startAt = cfg.interval; }; }; diff --git a/nixos/tests/sanoid.nix b/nixos/tests/sanoid.nix index 284b38932cce..66ddaad60ea2 100644 --- a/nixos/tests/sanoid.nix +++ b/nixos/tests/sanoid.nix @@ -38,7 +38,7 @@ in { services.syncoid = { enable = true; - sshKey = "/root/.ssh/id_ecdsa"; + sshKey = "/var/lib/syncoid/id_ecdsa"; commonArgs = [ "--no-sync-snap" ]; commands."pool/test".target = "root@target:pool/test"; }; @@ -69,11 +69,12 @@ in { "udevadm settle", ) - source.succeed("mkdir -m 700 /root/.ssh") source.succeed( - "cat '${snakeOilPrivateKey}' > /root/.ssh/id_ecdsa" + "mkdir -m 700 -p /var/lib/syncoid", + "cat '${snakeOilPrivateKey}' > /var/lib/syncoid/id_ecdsa", + "chmod 600 /var/lib/syncoid/id_ecdsa", + "chown -R syncoid:syncoid /var/lib/syncoid/", ) - source.succeed("chmod 600 /root/.ssh/id_ecdsa") source.succeed("touch /tmp/mnt/test.txt") source.systemctl("start --wait sanoid.service") From eee815842a4a27f60446bab6a73db13b7cc9832a Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Sat, 13 Jun 2020 19:52:52 -0700 Subject: [PATCH 003/590] pfstools: fix Qt environment --- pkgs/tools/graphics/pfstools/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index 1c437a3f05cd..f570251374cf 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, cmake, pkgconfig, darwin +{ stdenv, mkDerivation, fetchurl, cmake, pkgconfig, darwin , openexr, zlib, imagemagick, libGLU, libGL, freeglut, fftwFloat -, fftw, gsl, libexif, perl, opencv2, qt5, netpbm +, fftw, gsl, libexif, perl, opencv2, qtbase, netpbm }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "pfstools"; version = "2.1.0"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ openexr zlib imagemagick fftwFloat - fftw gsl libexif perl opencv2 qt5.qtbase netpbm + fftw gsl libexif perl opencv2 qtbase netpbm ] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ OpenGL GLUT ]) else [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 062e5bc97bc1..26234e1d5822 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5951,7 +5951,7 @@ in pfetch = callPackage ../tools/misc/pfetch { }; - pfstools = callPackage ../tools/graphics/pfstools { }; + pfstools = libsForQt5.callPackage ../tools/graphics/pfstools { }; philter = callPackage ../tools/networking/philter { }; From 5e20a0364669b39b86be1ab0453884f2344d5d7b Mon Sep 17 00:00:00 2001 From: Vonfry Date: Sun, 5 Jul 2020 09:43:10 +0800 Subject: [PATCH 004/590] vimPlugins.vim-airline-clock: init at 2018-05-08 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 5cb779d5e1f8..56876d594b4f 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -3877,6 +3877,18 @@ let meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; + vim-airline-clock = buildVimPluginFrom2Nix { + pname = "vim-airline-clock"; + version = "2018-05-08"; + src = fetchFromGitHub { + owner = "enricobacis"; + repo = "vim-airline-clock"; + rev = "a752ae89d833ce14f87e303f3f479c01065077ca"; + sha256 = "0wbaxm1k9j4cl5vw1wppsds0afc0h3n2ipp8xhgdh5jswjhr6wlc"; + }; + meta.homepage = "https://github.com/enricobacis/vim-airline-clock/"; + }; + vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; version = "2020-06-26"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 46d445e9c2ab..1dd4ce2ecfd1 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -96,6 +96,7 @@ elmcast/elm-vim elzr/vim-json embear/vim-localvimrc enomsg/vim-haskellConcealPlus +enricobacis/vim-airline-clock ensime/ensime-vim ervandew/supertab esneider/YUNOcommit.vim From eb4e67505fdf9c521106b3ba9c6f300c77adee6c Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 27 Jun 2020 13:55:54 +0200 Subject: [PATCH 005/590] undervolt: expose power limits as Nixopts We no longer escape the flags because the power limit flags want two arguments If we escaped them, we'd only get one argument with an escaped space in it. Undervolt's flags don't have anything in them that would need to be escaped, so that shouldn't break anything --- nixos/modules/services/hardware/undervolt.nix | 46 ++++++++++++++++++- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/hardware/undervolt.nix b/nixos/modules/services/hardware/undervolt.nix index 054ffa35050a..9c2f78a755dd 100644 --- a/nixos/modules/services/hardware/undervolt.nix +++ b/nixos/modules/services/hardware/undervolt.nix @@ -3,7 +3,12 @@ with lib; let cfg = config.services.undervolt; - cliArgs = lib.cli.toGNUCommandLineShell {} { + + mkPLimit = limit: window: + if (isNull limit && isNull window) then null + else assert asserts.assertMsg (!isNull limit && !isNull window) "Both power limit and window must be set"; + "${toString limit} ${toString window}"; + cliArgs = lib.cli.toGNUCommandLine {} { inherit (cfg) verbose temp @@ -21,6 +26,9 @@ let temp-bat = cfg.tempBat; temp-ac = cfg.tempAc; + + power-limit-long = mkPLimit cfg.p1.limit cfg.p1.window; + power-limit-short = mkPLimit cfg.p2.limit cfg.p2.window; }; in { @@ -104,6 +112,40 @@ in ''; }; + p1.limit = mkOption { + type = with types; nullOr int; + default = null; + description = '' + The P1 Power Limit in Watts. + Both limit and window must be set. + ''; + }; + p1.window = mkOption { + type = with types; nullOr (oneOf [ float int ]); + default = null; + description = '' + The P1 Time Window in seconds. + Both limit and window must be set. + ''; + }; + + p2.limit = mkOption { + type = with types; nullOr int; + default = null; + description = '' + The P2 Power Limit in Watts. + Both limit and window must be set. + ''; + }; + p2.window = mkOption { + type = with types; nullOr (oneOf [ float int ]); + default = null; + description = '' + The P2 Time Window in seconds. + Both limit and window must be set. + ''; + }; + useTimer = mkOption { type = types.bool; default = false; @@ -133,7 +175,7 @@ in serviceConfig = { Type = "oneshot"; Restart = "no"; - ExecStart = "${pkgs.undervolt}/bin/undervolt ${cliArgs}"; + ExecStart = "${pkgs.undervolt}/bin/undervolt ${toString cliArgs}"; }; }; From 54210573c1e2db45d5abbda4c3ce1afc25210889 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 25 Aug 2020 17:54:27 -0500 Subject: [PATCH 006/590] stdenv/native: provide patchelf on linux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This provides consistency with the pure stdenv, which provides patchelf this way. Native stdenv can always just manually install patchelf on their system, but like xz, it’s unlikely to be provided in /usr/bin/. In addition, it’s not even in the RHEL7 repos. --- pkgs/stdenv/native/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index f6e0df161ad0..b79b81253ad5 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -78,7 +78,7 @@ let # A function that builds a "native" stdenv (one that uses tools in # /usr etc.). makeStdenv = - { cc, fetchurl, extraPath ? [], overrides ? (self: super: { }) }: + { cc, fetchurl, extraPath ? [], overrides ? (self: super: { }), extraNativeBuildInputs ? [] }: import ../generic { buildPlatform = localSystem; @@ -94,10 +94,10 @@ let if system == "x86_64-cygwin" then prehookCygwin else prehookBase; - extraNativeBuildInputs = - if system == "i686-cygwin" then extraNativeBuildInputsCygwin else + extraNativeBuildInputs = extraNativeBuildInputs ++ + (if system == "i686-cygwin" then extraNativeBuildInputsCygwin else if system == "x86_64-cygwin" then extraNativeBuildInputsCygwin else - []; + []); initialPath = extraPath ++ path; @@ -163,6 +163,7 @@ in inherit (prevStage.stdenv) cc fetchurl; extraPath = [ prevStage.xz ]; overrides = self: super: { inherit (prevStage) xz; }; + extraNativeBuildInputs = if localSystem.isLinux then [ prevStage.patchelf ] else []; }; }) From 48309677368e3fac5489326e00f1d6b0513d2b8e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 21 Aug 2020 22:20:10 -0500 Subject: [PATCH 007/590] Fix cc-wrapper in native stdenv --- pkgs/build-support/cc-wrapper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 6ee287e287bc..ecde89ac9450 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -57,7 +57,7 @@ let suffixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config; expand-response-params = - if buildPackages.stdenv.hasCC && buildPackages.stdenv.cc != "/dev/null" + if (buildPackages.stdenv.hasCC or false) && buildPackages.stdenv.cc != "/dev/null" then import ../expand-response-params { inherit (buildPackages) stdenv; } else ""; From 5d0fc4a5a57682ad702b090dceecdcd6b7d43aad Mon Sep 17 00:00:00 2001 From: Fabian Geiselhart Date: Sat, 30 May 2020 19:45:59 +0200 Subject: [PATCH 008/590] rcon: init at 0.5 --- pkgs/tools/networking/rcon/default.nix | 30 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/networking/rcon/default.nix diff --git a/pkgs/tools/networking/rcon/default.nix b/pkgs/tools/networking/rcon/default.nix new file mode 100644 index 000000000000..f7cd08e197e8 --- /dev/null +++ b/pkgs/tools/networking/rcon/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake, pkg-config, glib, libbsd, check, pcre }: + +stdenv.mkDerivation rec { + pname = "rcon"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "n0la"; + repo = "rcon"; + rev = version; + sha256 = "1jsnmsm2qkiv8dan1yncx0qp6zfkcbyvf81c7xwpv6r499ijw1nb"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + glib + libbsd + check + pcre + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/n0la/rcon"; + description = "Source RCON client for command line"; + maintainers = with maintainers; [ f4814n ]; + platforms = with platforms; linux ++ darwin; + license = licenses.bsd2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa293f56ba94..af9f46e09081 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6571,6 +6571,8 @@ in rc = callPackage ../shells/rc { }; + rcon = callPackage ../tools/networking/rcon { }; + rdbtools = callPackage ../development/tools/rdbtools { python = python3; }; rdma-core = callPackage ../os-specific/linux/rdma-core { }; From 5642ee3d0e1d87271b933f0283d326971c04f4ce Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Wed, 30 Sep 2020 00:30:17 -0400 Subject: [PATCH 009/590] pythonPackages.protobuf: fix cross-compilation --- pkgs/development/python-modules/protobuf/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 7f66549893bd..ab95eeb51f91 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchpatch, python, buildPythonPackage, isPy37 +{ buildPackages, stdenv, fetchpatch, python, buildPythonPackage, isPy37 , protobuf, google_apputils, pyext, libcxx, isPy27 , disabled, doCheck ? true }: with stdenv.lib; buildPythonPackage { - inherit (protobuf) name src version; + inherit (protobuf) pname src version; inherit disabled; doCheck = doCheck && !isPy27; # setuptools>=41.4 no longer collects correctly on python2 @@ -15,8 +15,10 @@ buildPythonPackage { ++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98" ); + outputs = [ "out" "dev" ]; + propagatedBuildInputs = [ google_apputils ]; - propagatedNativeBuildInputs = [ protobuf ]; # For protoc. + propagatedNativeBuildInputs = [ buildPackages.protobuf ]; # For protoc. nativeBuildInputs = [ google_apputils pyext ]; buildInputs = [ protobuf ]; @@ -43,9 +45,9 @@ buildPythonPackage { preBuild = '' # Workaround for https://github.com/google/protobuf/issues/2895 - ${python.interpreter} setup.py build + ${python.pythonForBuild.interpreter} setup.py build '' + optionalString (versionAtLeast protobuf.version "2.6.0") '' - ${python.interpreter} setup.py build_ext --cpp_implementation + ${python.pythonForBuild.interpreter} setup.py build_ext --cpp_implementation ''; installFlags = optional (versionAtLeast protobuf.version "2.6.0") From 7fb2cc17251d9bc8c0879ba98dd2dd91f24c2b08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 30 Sep 2020 13:56:05 +0200 Subject: [PATCH 010/590] python3Packages.tensorflow_2: update CUDA capabilities Sync CUDA capabilities with upstream: https://github.com/tensorflow/tensorflow/blob/b0c3b5bdd768a1410a498642aec6de842692d857/.bazelrc#L584 --- pkgs/development/python-modules/tensorflow/2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tensorflow/2/default.nix b/pkgs/development/python-modules/tensorflow/2/default.nix index bd049a9a2ca6..7925cb15f03b 100644 --- a/pkgs/development/python-modules/tensorflow/2/default.nix +++ b/pkgs/development/python-modules/tensorflow/2/default.nix @@ -22,7 +22,7 @@ # XLA without CUDA is broken , xlaSupport ? cudaSupport # Default from ./configure script -, cudaCapabilities ? [ "3.5" "5.2" ] +, cudaCapabilities ? [ "sm_35" "sm_50" "sm_60" "sm_70" "sm_75" "compute_80" ] , sse42Support ? stdenv.hostPlatform.sse4_2Support , avx2Support ? stdenv.hostPlatform.avx2Support , fmaSupport ? stdenv.hostPlatform.fmaSupport From 3733a496bd6b6805c55198c60fb3ddbd8e59b2e4 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Wed, 30 Sep 2020 12:59:06 +0000 Subject: [PATCH 011/590] fatresize: 1.0.2 -> 1.1.0 --- pkgs/tools/filesystems/fatresize/default.nix | 32 +++----- .../fatresize/fatresize_parted_nix.patch | 74 ------------------- 2 files changed, 10 insertions(+), 96 deletions(-) delete mode 100644 pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix index c1d048889c70..79551df00ee9 100644 --- a/pkgs/tools/filesystems/fatresize/default.nix +++ b/pkgs/tools/filesystems/fatresize/default.nix @@ -1,38 +1,26 @@ -{ stdenv, fetchurl, parted, utillinux }: +{ stdenv, fetchFromGitHub, parted, utillinux, pkg-config }: stdenv.mkDerivation rec { - version = "1.0.2"; + version = "1.1.0"; pname = "fatresize"; - src = fetchurl { - url = "mirror://sourceforge/fatresize/fatresize-${version}.tar.bz2"; - sha256 = "04wp48jpdvq4nn0dgbw5za07g842rnxlh9mig4mslz70zqs0izjm"; + src = fetchFromGitHub { + owner = "ya-mouse"; + repo = "fatresize"; + rev = "v${version}"; + sha256 = "1vhz84kxfyl0q7mkqn68nvzzly0a4xgzv76m6db0bk7xyczv1qr2"; }; buildInputs = [ parted utillinux ]; - - # This patch helps this unmantained piece of software to be built against recent parted - # It basically modifies the detection scheme for parted version (the current one has no micro version defined) - # The second change is to include a header for a moved function since 1.6+ to current 3.1+ parted - # The third change is to modify the call to PED_ASSERT that is no longer defined with 2 params - patches = [ ./fatresize_parted_nix.patch ]; - - preConfigure = '' - echo "Replacing calls to ped_free with free ..." - substituteInPlace ./fatresize.c --replace ped_free free - ''; - - # Filesystem resize functions were reintroduced in parted 3.1 due to no other available free alternatives - # but in a sepparate library -> libparted-fs-resize --- that's why the added LDFLAG - makeFlags = [ "LDFLAGS=-lparted-fs-resize" ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ parted utillinux ]; meta = with stdenv.lib; { description = "The FAT16/FAT32 non-destructive resizer"; - homepage = "https://sourceforge.net/projects/fatresize"; + homepage = "https://github.com/ya-mouse/fatresize"; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl3; }; } diff --git a/pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch b/pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch deleted file mode 100644 index e9aa87a2d564..000000000000 --- a/pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/aclocal.m4 b/aclocal.m4 -index 18e8176..2e75592 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -88,8 +88,15 @@ int main () - if ( !(version = ped_get_version ()) ) - exit(1); - if (sscanf(version, "%d.%d.%d", &major, &minor, µ) != 3) { -- printf("%s, bad version string\n", version); -- exit(1); -+ if (sscanf(version, "%d.%d", &major, &minor) != 2) -+ { -+ printf("%s, bad version string\n", version); -+ exit(1); -+ } -+ else -+ { -+ micro = 0; -+ } - } - - if ((major > $parted_config_major_version) || -diff --git a/configure b/configure -index ed31457..e5f1705 100755 ---- a/configure -+++ b/configure -@@ -4793,8 +4793,15 @@ int main () - if ( !(version = ped_get_version ()) ) - exit(1); - if (sscanf(version, "%d.%d.%d", &major, &minor, µ) != 3) { -- printf("%s, bad version string\n", version); -- exit(1); -+ if (sscanf(version, "%d.%d", &major, &minor) != 2) -+ { -+ printf("%s, bad version string\n", version); -+ exit(1); -+ } -+ else -+ { -+ micro = 0; -+ } - } - - if ((major > $parted_config_major_version) || -diff --git a/fatresize.c b/fatresize.c -index 424d5d2..e439102 100644 ---- a/fatresize.c -+++ b/fatresize.c -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - - #include "config.h" -@@ -217,7 +218,7 @@ fatresize_handler(PedException *ex) - static int - snap(PedSector* sector, PedSector new_sector, PedGeometry* range) - { -- PED_ASSERT(ped_geometry_test_sector_inside (range, *sector), return 0); -+ PED_ASSERT(ped_geometry_test_sector_inside (range, *sector)); - if (!ped_geometry_test_sector_inside(range, new_sector)) - return 0; - -@@ -281,7 +282,7 @@ snap_to_boundaries (PedGeometry* new_geom, PedGeometry* old_geom, - end_part->geom.end, end_part->geom.start - 1, -1); - } - -- PED_ASSERT (start <= end, return); -+ PED_ASSERT (start <= end); - ped_geometry_set (new_geom, start, end - start + 1); - } - From 42a5ddbafe8b63491587668490c4a5bd83b6871c Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 3 Oct 2020 09:18:29 +0200 Subject: [PATCH 012/590] aldo: 0.7.7 -> 0.7.8 --- pkgs/applications/radio/aldo/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/radio/aldo/default.nix b/pkgs/applications/radio/aldo/default.nix index df52531a518d..83bb520272ea 100644 --- a/pkgs/applications/radio/aldo/default.nix +++ b/pkgs/applications/radio/aldo/default.nix @@ -1,14 +1,19 @@ -{ stdenv, fetchurl, libao }: +{ stdenv, fetchgit, libao, autoreconfHook }: -stdenv.mkDerivation rec { +let pname = "aldo"; - version = "0.7.7"; + version = "0.7.8"; +in stdenv.mkDerivation { + inherit pname version; - src = fetchurl { - url = "mirror://savannah/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "14lzgldqzbbzydsy1cai3wln3hpyj1yhj8ji3wygyzr616fq9f7i"; + src = fetchgit { + url = "git://git.savannah.gnu.org/${pname}.git"; + rev = "v${version}"; + sha256 = "0swvdq0pw1msy40qkpn1ar9kacqjyrw2azvf2fy38y0svyac8z2i"; }; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libao ]; meta = with stdenv.lib; { From 3ed0b84b883dfd68db33297c6dea3cb39afb2777 Mon Sep 17 00:00:00 2001 From: sohalt Date: Sat, 26 Sep 2020 12:33:56 +0200 Subject: [PATCH 013/590] tarssh: init at 0.4.0 --- pkgs/servers/tarssh/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/servers/tarssh/default.nix diff --git a/pkgs/servers/tarssh/default.nix b/pkgs/servers/tarssh/default.nix new file mode 100644 index 000000000000..72e636b303f1 --- /dev/null +++ b/pkgs/servers/tarssh/default.nix @@ -0,0 +1,25 @@ +{ fetchFromGitHub, rustPlatform, stdenv }: + +with rustPlatform; + +buildRustPackage rec { + pname = "tarssh"; + version = "0.4.0"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "Freaky"; + repo = pname; + sha256 = "0fm0rwknhm39nhd6g0pnxby34i5gpmi5ri795d9ylsw0pqwz6kd0"; + }; + + cargoSha256 = "108xdpgfgfd4z455snif0mzbla0rv8gjqxci5qgwjzfyshwkprgv"; + + meta = with stdenv.lib; { + description = "A simple SSH tarpit inspired by endlessh"; + homepage = "https://github.com/Freaky/tarssh"; + license = [ licenses.mit ]; + maintainers = with maintainers; [ sohalt ]; + platforms = platforms.unix ; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b1d6353b04f..feff7c5b8aa0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7323,6 +7323,8 @@ in tarsnapper = callPackage ../tools/backup/tarsnapper { }; + tarssh = callPackage ../servers/tarssh { }; + tartube = callPackage ../applications/video/tartube { }; tayga = callPackage ../tools/networking/tayga { }; From 69ef15309ddd50dee55e22a9e0a8bea68c273232 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 4 Oct 2020 01:03:01 +0200 Subject: [PATCH 014/590] python3Packages.irctokens: init at 2.0.0 --- .../python-modules/irctokens/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/irctokens/default.nix diff --git a/pkgs/development/python-modules/irctokens/default.nix b/pkgs/development/python-modules/irctokens/default.nix new file mode 100644 index 000000000000..037a5f0520fd --- /dev/null +++ b/pkgs/development/python-modules/irctokens/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pyyaml +, python +}: + +buildPythonPackage rec { + pname = "irctokens"; + version = "2.0.0"; + disabled = pythonOlder "3.6"; # f-strings + + src = fetchFromGitHub { + owner = "jesopo"; + repo = pname; + rev = "v${version}"; + sha256 = "0kpxn5paailm4xpdlnzxrhjrfgvvg5pp327wd8kl41a0wbqkj4zb"; + }; + + checkInputs = [ pyyaml ]; + checkPhase = '' + ${python.interpreter} -m unittest test + ''; + + pythonImportsCheck = [ "irctokens" ]; + + meta = with lib; { + description = "RFC1459 and IRCv3 protocol tokeniser library for python3"; + license = licenses.mit; + homepage = "https://github.com/jesopo/irctokens"; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4928fdd7c16e..8e7a9247edbd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2965,6 +2965,8 @@ in { irc = callPackage ../development/python-modules/irc { }; + irctokens = callPackage ../development/python-modules/irctokens { }; + isbnlib = callPackage ../development/python-modules/isbnlib { }; islpy = callPackage ../development/python-modules/islpy { }; From 11ce4d215d619d6b0fc7a9f716a106fff2e38731 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 4 Oct 2020 01:11:43 +0200 Subject: [PATCH 015/590] python3Packages.ircstates: init at 0.11.3 --- .../python-modules/ircstates/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/ircstates/default.nix diff --git a/pkgs/development/python-modules/ircstates/default.nix b/pkgs/development/python-modules/ircstates/default.nix new file mode 100644 index 000000000000..857b0358aff2 --- /dev/null +++ b/pkgs/development/python-modules/ircstates/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, pythonOlder +, irctokens +, pendulum +, python +}: + +buildPythonPackage rec { + pname = "ircstates"; + version = "0.11.3"; + disabled = pythonOlder "3.6"; # f-strings + + src = fetchFromGitHub { + owner = "jesopo"; + repo = pname; + rev = "v${version}"; + sha256 = "1v8r6ma8gzvn5ym3xx9qlb0rc4l67pxr3z8njzk1ffxn1x3mxd3i"; + }; + + patches = [ + (fetchpatch { + name = "relax-pendulum-version.patch"; + url = "https://github.com/jesopo/ircstates/commit/f51f1b689e592020d1c91ccab6c03927aadb9f94.patch"; + sha256 = "0qbp3b9hlqbbx7b474q1mcgnzzzwcm4g89x26iqgmlgxzmv3y5xp"; + }) + ]; + + propagatedBuildInputs = [ + irctokens + pendulum + ]; + + checkPhase = '' + ${python.interpreter} -m unittest test + ''; + + pythonImportsCheck = [ "ircstates" ]; + + meta = with lib; { + description = "sans-I/O IRC session state parsing library"; + license = licenses.mit; + homepage = "https://github.com/jesopo/ircstates"; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8e7a9247edbd..aeec113524bb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2965,6 +2965,8 @@ in { irc = callPackage ../development/python-modules/irc { }; + ircstates = callPackage ../development/python-modules/ircstates { }; + irctokens = callPackage ../development/python-modules/irctokens { }; isbnlib = callPackage ../development/python-modules/isbnlib { }; From 13d1db923c293ec76a1ad8c5251a4d4b9305f678 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 4 Oct 2020 01:34:35 +0200 Subject: [PATCH 016/590] python3Packages.anyio: init at 2.0.2 --- .../python-modules/anyio/default.nix | 58 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/anyio/default.nix diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix new file mode 100644 index 000000000000..516b8520f00e --- /dev/null +++ b/pkgs/development/python-modules/anyio/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, idna +, sniffio +, typing-extensions +, curio +, hypothesis +, pytestCheckHook +, trio +, trustme +, uvloop +}: + +buildPythonPackage rec { + pname = "anyio"; + version = "2.0.2"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "agronholm"; + repo = pname; + rev = version; + sha256 = "06nazfrm2sclp3lpgsn9wl8vmqxvx36s3gr2gnqz3zhjpf3glkxv"; + }; + + propagatedBuildInputs = [ + idna + sniffio + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; + + checkInputs = [ + curio + hypothesis + pytestCheckHook + trio + trustme + uvloop + ]; + + pytestFlagsArray = [ + # lots of DNS lookups + "--ignore=tests/test_sockets.py" + ]; + + pythonImportsCheck = [ "anyio" ]; + + meta = with lib; { + description = "High level compatibility layer for multiple asynchronous event loop implementations on Python"; + homepage = "https://github.com/agronholm/anyio"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aeec113524bb..3f7524840f86 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -320,6 +320,8 @@ in { antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { antlr4 = pkgs.antlr4; }; + anyio = callPackage ../development/python-modules/anyio { }; + anyjson = callPackage ../development/python-modules/anyjson { }; anytree = callPackage ../development/python-modules/anytree { inherit (pkgs) graphviz; }; From e364d10db536eeef51a0d63a7570e251dc9d757d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 4 Oct 2020 01:44:16 +0200 Subject: [PATCH 017/590] python3Packages.asyncio-throttle: init at 1.0.1 --- .../asyncio-throttle/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/asyncio-throttle/default.nix diff --git a/pkgs/development/python-modules/asyncio-throttle/default.nix b/pkgs/development/python-modules/asyncio-throttle/default.nix new file mode 100644 index 000000000000..bf08aec41a5b --- /dev/null +++ b/pkgs/development/python-modules/asyncio-throttle/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "asyncio-throttle"; + version = "1.0.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "hallazzang"; + repo = pname; + rev = "v${version}"; + sha256 = "0raqnrnp42cn1c7whbm7ajbgaczx33k6hbxsj30nh998pqxhh4sj"; + }; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "asyncio_throttle" ]; + + meta = with lib; { + description = "Simple, easy-to-use throttler for asyncio"; + homepage = "https://github.com/hallazzang/asyncio-throttle"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3f7524840f86..86da89347193 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -426,6 +426,8 @@ in { async_generator = callPackage ../development/python-modules/async_generator { }; + asyncio-throttle = callPackage ../development/python-modules/asyncio-throttle { }; + asyncpg = callPackage ../development/python-modules/asyncpg { }; asyncssh = callPackage ../development/python-modules/asyncssh { }; From c70681f33429c524210c6bfbd8d5337d679294f6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 4 Oct 2020 02:23:27 +0200 Subject: [PATCH 018/590] python3Packages.async_stagger: init at 0.3.0 --- .../python-modules/async_stagger/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/async_stagger/default.nix diff --git a/pkgs/development/python-modules/async_stagger/default.nix b/pkgs/development/python-modules/async_stagger/default.nix new file mode 100644 index 000000000000..034a8329b121 --- /dev/null +++ b/pkgs/development/python-modules/async_stagger/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, pythonOlder +, pytestCheckHook +, pytest-asyncio +, pytest-mock +}: + +buildPythonPackage rec { + pname = "async_stagger"; + version = "0.3.0"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "007l54fbk2dfzv3vmqz98m1i37mzxkkva5r4fiwq2pg8nb61fy0w"; + }; + + patches = [ + (fetchpatch { + # Fix test failures on Python 3.8 + # https://github.com/twisteroidambassador/async_stagger/issues/4 + url = "https://github.com/twisteroidambassador/async_stagger/commit/736ab20ff9c172628d911f1e6f72420399ec9631.patch"; + sha256 = "1ygqd9n56sj83lvgmv6nrx3m0sp3646s5k7z697qx43xslixj731"; + }) + ]; + + checkInputs = [ + pytestCheckHook + pytest-asyncio + pytest-mock + ]; + + pythonImportsCheck = [ "async_stagger" ]; + + meta = with lib; { + description = "Happy Eyeballs connection algorithm and underlying scheduling logic in asyncio"; + homepage = "https://github.com/twisteroidambassador/async_stagger"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 86da89347193..1c8fee71e3e5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -432,6 +432,8 @@ in { asyncssh = callPackage ../development/python-modules/asyncssh { }; + async_stagger = callPackage ../development/python-modules/async_stagger { }; + asynctest = callPackage ../development/python-modules/asynctest { }; async-timeout = callPackage ../development/python-modules/async_timeout { }; From f31f1020bc9b823dc54d8c5018c4e0454f5fe0c3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 4 Oct 2020 02:39:44 +0200 Subject: [PATCH 019/590] python3Packages.ircrobots: init at 0.3.3 --- .../python-modules/ircrobots/default.nix | 52 +++++++++++++++++++ .../ircrobots/relax-dependencies.patch | 14 +++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 68 insertions(+) create mode 100644 pkgs/development/python-modules/ircrobots/default.nix create mode 100644 pkgs/development/python-modules/ircrobots/relax-dependencies.patch diff --git a/pkgs/development/python-modules/ircrobots/default.nix b/pkgs/development/python-modules/ircrobots/default.nix new file mode 100644 index 000000000000..359cf3e6934f --- /dev/null +++ b/pkgs/development/python-modules/ircrobots/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, anyio +, asyncio-throttle +, dataclasses +, ircstates +, async_stagger +, async-timeout +, python +}: + +buildPythonPackage rec { + pname = "ircrobots"; + version = "0.3.3"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "jesopo"; + repo = pname; + rev = "v${version}"; + sha256 = "0ykn6ch7aazv2cx13q2gr94arh6f96d8hwjwnrcjai3i3x4q2pkq"; + }; + + patches = [ + ./relax-dependencies.patch + ]; + + propagatedBuildInputs = [ + anyio + asyncio-throttle + ircstates + async_stagger + async-timeout + ] ++ lib.optionals (pythonOlder "3.7") [ + dataclasses + ]; + + checkPhase = '' + ${python.interpreter} -m unittest test + ''; + + pythonImportsCheck = [ "ircrobots" ]; + + meta = with lib; { + description = "Asynchronous bare-bones IRC bot framework for python3"; + license = licenses.mit; + homepage = "https://github.com/jesopo/ircrobots"; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/ircrobots/relax-dependencies.patch b/pkgs/development/python-modules/ircrobots/relax-dependencies.patch new file mode 100644 index 000000000000..9aed3577f63d --- /dev/null +++ b/pkgs/development/python-modules/ircrobots/relax-dependencies.patch @@ -0,0 +1,14 @@ +diff --git a/requirements.txt b/requirements.txt +index 87a2d31..4e0efb1 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,6 +1,6 @@ +-anyio ==1.3.0 ++anyio + asyncio-throttle ==1.0.1 +-dataclasses ==0.6 +-ircstates ==0.11.2 ++dataclasses; python_version < "3.7" ++ircstates >=0.11.2 + async_stagger ==0.3.0 + async_timeout ==3.0.1 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1c8fee71e3e5..e7ee2c82dda8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2971,6 +2971,8 @@ in { irc = callPackage ../development/python-modules/irc { }; + ircrobots = callPackage ../development/python-modules/ircrobots { }; + ircstates = callPackage ../development/python-modules/ircstates { }; irctokens = callPackage ../development/python-modules/irctokens { }; From a62081663f1530f1c12740b87368b8059f6872fd Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 7 Oct 2020 04:20:00 +0000 Subject: [PATCH 020/590] micro: 2.0.7 -> 2.0.8 --- pkgs/applications/editors/micro/default.nix | 25 +- pkgs/applications/editors/micro/deps.nix | 345 -------------------- 2 files changed, 9 insertions(+), 361 deletions(-) delete mode 100644 pkgs/applications/editors/micro/deps.nix diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix index ffef5d5fdde2..f3506b0cb985 100644 --- a/pkgs/applications/editors/micro/default.nix +++ b/pkgs/applications/editors/micro/default.nix @@ -1,40 +1,33 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: -buildGoPackage rec { +buildGoModule rec { pname = "micro"; - version = "2.0.7"; - - goPackagePath = "github.com/zyedidia/micro"; + version = "2.0.8"; src = fetchFromGitHub { owner = "zyedidia"; repo = pname; rev = "v${version}"; - sha256 = "07ck1a9arklic3p0z50wcg608cvpba1kljvlfb4fljr6jhv5cmkb"; - fetchSubmodules = true; + sha256 = "1b51fvc9hrjfl8acr3yybp66xfll7d43412qwi76wxwarn06gkci"; }; nativeBuildInputs = [ installShellFiles ]; subPackages = [ "cmd/micro" ]; - buildFlagsArray = let t = "${goPackagePath}/internal/util"; in '' - -ldflags= - -X ${t}.Version=${version} - -X ${t}.CommitHash=${src.rev} - ''; + vendorSha256 = "19iqvl63g9y6gkzfmv87rrgj4c4y6ngh467ss94rzrhaybj2b2d8"; - goDeps = ./deps.nix; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/zyedidia/micro/v2/internal/util.Version=${version} -X github.com/zyedidia/micro/v2/internal/util.CommitHash=${src.rev}" ]; postInstall = '' - installManPage $src/assets/packaging/micro.1 + installManPage assets/packaging/micro.1 + install -Dt $out/share/applications assets/packaging/micro.desktop ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://micro-editor.github.io"; description = "Modern and intuitive terminal-based text editor"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; }; } - diff --git a/pkgs/applications/editors/micro/deps.nix b/pkgs/applications/editors/micro/deps.nix deleted file mode 100644 index d1cb91c29590..000000000000 --- a/pkgs/applications/editors/micro/deps.nix +++ /dev/null @@ -1,345 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/blang/semver"; - fetch = { - type = "git"; - url = "https://github.com/blang/semver"; - rev = "v3.5.1"; - sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy"; - }; - } - { - goPackagePath = "github.com/chzyer/logex"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/logex"; - rev = "v1.1.10"; - sha256 = "08pbjj3wx9acavlwyr055isa8a5hnmllgdv5k6ra60l5y1brmlq4"; - }; - } - { - goPackagePath = "github.com/chzyer/readline"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/readline"; - rev = "2972be24d48e"; - sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r"; - }; - } - { - goPackagePath = "github.com/chzyer/test"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/test"; - rev = "a1ea475d72b1"; - sha256 = "0rns2aqk22i9xsgyap0pq8wi4cfaxsri4d9q6xxhhyma8jjsnj2k"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "v1.0.0"; - sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; - }; - } - { - goPackagePath = "github.com/gdamore/encoding"; - fetch = { - type = "git"; - url = "https://github.com/gdamore/encoding"; - rev = "v1.0.0"; - sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9"; - }; - } - { - goPackagePath = "github.com/go-errors/errors"; - fetch = { - type = "git"; - url = "https://github.com/go-errors/errors"; - rev = "v1.0.1"; - sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp"; - }; - } - { - goPackagePath = "github.com/kballard/go-shellquote"; - fetch = { - type = "git"; - url = "https://github.com/kballard/go-shellquote"; - rev = "95032a82bc51"; - sha256 = "1rspvmnsikdq95jmx3dykxd4k1rmgl98ryjrysvl0cf18hl1vq80"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/lucasb-eyer/go-colorful"; - fetch = { - type = "git"; - url = "https://github.com/lucasb-eyer/go-colorful"; - rev = "v1.0.3"; - sha256 = "12bgz6dxbb2ki1g3x7fg9ipsjgfkd58fp7cdpv63h4kvlj2n7j69"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.11"; - sha256 = "0h671sv7hfprja495kavazkalkx7xzaqksjh13brcnwq67ijrali"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.7"; - sha256 = "1snr8mk63vz2h44knq26dm81p83887v7kb09iywqmx0nqzngih66"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.1.0"; - sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/robertkrimen/otto"; - fetch = { - type = "git"; - url = "https://github.com/robertkrimen/otto"; - rev = "c382bd3c16ff"; - sha256 = "043y6l647snsz71mdy84s2d3kn22aj6rbqd6c1vd8absvamqhlxa"; - }; - } - { - goPackagePath = "github.com/sergi/go-diff"; - fetch = { - type = "git"; - url = "https://github.com/sergi/go-diff"; - rev = "v1.1.0"; - sha256 = "0ir8ali2vx0j7pipmlfd6k8c973akyy2nmbjrf008fm800zcp7z2"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.0"; - sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.4.0"; - sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; - }; - } - { - goPackagePath = "github.com/xo/terminfo"; - fetch = { - type = "git"; - url = "https://github.com/xo/terminfo"; - rev = "454e5b68f9e8"; - sha256 = "0xvjb09nwbanp7ja4560pwb6b2xr9h0axyr7f5clgncca2k4f1pd"; - }; - } - { - goPackagePath = "github.com/yuin/gopher-lua"; - fetch = { - type = "git"; - url = "https://github.com/yuin/gopher-lua"; - rev = "ab39c6098bdb"; - sha256 = "13b0rrpv3988qw8rq6z7npajn1my059ybhafi5mxff9jw09k9sja"; - }; - } - { - goPackagePath = "github.com/zyedidia/clipboard"; - fetch = { - type = "git"; - url = "https://github.com/zyedidia/clipboard"; - rev = "v1.0.3"; - sha256 = "134vnx0r51f08b37yaymlxlfl14qv6r8yzgqz7dxxn1zw9197b3q"; - }; - } - { - goPackagePath = "github.com/zyedidia/glob"; - fetch = { - type = "git"; - url = "https://github.com/zyedidia/glob"; - rev = "dd4023a66dc3"; - sha256 = "1vqw4xbqq6j8p5m7mwxvb448w69vjvgzx0ndsfzdh2cxfirwp3y7"; - }; - } - { - goPackagePath = "github.com/zyedidia/highlight"; - fetch = { - type = "git"; - url = "https://github.com/zyedidia/highlight"; - rev = "201131ce5cf5"; - sha256 = "0blaynf32swmqddx2hcrifrfssj9c04kwnbdy42h3kzxihrwz4ps"; - }; - } - { - goPackagePath = "github.com/zyedidia/json5"; - fetch = { - type = "git"; - url = "https://github.com/zyedidia/json5"; - rev = "2da050b1a98d"; - sha256 = "1sgydazf3npr788b4w17ydmlh3fd1zmpriv9b69967ww90ckh2kz"; - }; - } - { - goPackagePath = "github.com/zyedidia/poller"; - fetch = { - type = "git"; - url = "https://github.com/zyedidia/poller"; - rev = "v1.0.1"; - sha256 = "10cjrqfk1j0l55bdbpm7kv4mqc665pngc8avai0p9chq03y2654g"; - }; - } - { - goPackagePath = "github.com/zyedidia/pty"; - fetch = { - type = "git"; - url = "https://github.com/zyedidia/pty"; - rev = "v2.0.0"; - sha256 = "1n946ld8y2v2wfbwsxv8rfaicxbw3w8pk11ryc8iybmw7hkmmf79"; - }; - } - { - goPackagePath = "github.com/zyedidia/tcell"; - fetch = { - type = "git"; - url = "https://github.com/zyedidia/tcell"; - rev = "v2.0.2"; - sha256 = "0fr7zm6zcir2bjll5ycdxy9m98gjr3ins7mzmqpd46b3njzbl75z"; - }; - } - { - goPackagePath = "github.com/zyedidia/terminal"; - fetch = { - type = "git"; - url = "https://github.com/zyedidia/terminal"; - rev = "533c623e2415"; - sha256 = "16l628f3zgl5yp9z5zkfy2hyl2sckw4d6mg3iqv2jjvh4i8yhrsm"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "33540a1f6037"; - sha256 = "0fjcv0vzvi6za0b4xmnk3932pr9f9gczzf03y0kgq3ry9rqg169y"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "90fa682c2a6e"; - sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "41f04d3bba15"; - sha256 = "0vfk9czmlxmp6wndq8k17rhnjxal764mxfhrccza7nwlia760pjy"; - }; - } - { - goPackagePath = "gopkg.in/sourcemap.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/sourcemap.v1"; - rev = "v1.0.5"; - sha256 = "08rf2dl13hbnm3fq2cm0nnsspy9fhf922ln23cz5463cv7h62as4"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.7"; - sha256 = "0k5xcwkd3wmcx54isk7ck9cwp8fapfhyqdz3f13kxp77cxqizazj"; - }; - } - { - goPackagePath = "layeh.com/gopher-luar"; - fetch = { - type = "git"; - url = "https://github.com/layeh/gopher-luar"; - rev = "v1.0.7"; - sha256 = "1rdbni3q7zajmiy62ccvbfgqjzppk5212wpwks2ba726hvyf85mj"; - }; - } -] From 8eced948be92bcc2b68279f3639dbef42209daf1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 4 Oct 2020 03:20:11 +0200 Subject: [PATCH 021/590] ircdog: init at 0.2.1 --- .../networking/irc/ircdog/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/networking/irc/ircdog/default.nix diff --git a/pkgs/applications/networking/irc/ircdog/default.nix b/pkgs/applications/networking/irc/ircdog/default.nix new file mode 100644 index 000000000000..5badc69a3a27 --- /dev/null +++ b/pkgs/applications/networking/irc/ircdog/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoPackage +, fetchFromGitHub +}: + +buildGoPackage rec { + pname = "ircdog"; + version = "0.2.1"; + + goPackagePath = "github.com/goshuirc/ircdog"; + + src = fetchFromGitHub { + owner = "goshuirc"; + repo = pname; + rev = "v${version}"; + sha256 = "1ppbznlkv7vajfbimxbyiq5y6pkfhm6ylhl408rwq1bawl28hpkl"; + fetchSubmodules = true; + }; + + meta = with lib; { + description = "ircdog is a simple wrapper over the raw IRC protocol that can respond to pings, and interprets formatting codes"; + homepage = "https://github.com/goshuirc/ircdog"; + license = licenses.isc; + maintainers = with maintainers; [ hexa ]; + }; +} + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2bb1badd8f6..caea93ce22db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16536,6 +16536,8 @@ in imgproxy = callPackage ../servers/imgproxy { }; + ircdog = callPackage ../applications/networking/irc/ircdog { }; + ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; jboss = callPackage ../servers/http/jboss { }; From 0367125b170df2a2999537ffbb083583617ad8e4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 8 Oct 2020 12:05:00 -0500 Subject: [PATCH 022/590] starship: 0.45.2 -> 0.46.2 https://github.com/starship/starship/releases/tag/v0.46.0 https://github.com/starship/starship/releases/tag/v0.46.2 --- pkgs/tools/misc/starship/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 3cc56d87c62c..d9eaa3f32726 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.45.2"; + version = "0.46.2"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "0kxmgx4pnayp3jf6cgmka05x3aymxr79rim5nff6k3cg5zaqrz59"; + sha256 = "092nqxl3vdk8k589bv3g05c598k77f4wsxcgymfb1h1fc0lfzqs4"; }; nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; @@ -31,14 +31,17 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "0x9a322anwrgpxfqrvqb1ikavp8qffa93wdvj5kln1d2rgmxr2sy"; + cargoSha256 = "1smz7084ppz79p8migpy0cqp6azf7sixv9ga65l2f3zfna7kbk78"; checkFlags = [ "--skip=directory_in_home" - "--skip=fish_directory_in_home" "--skip=home_directory" - "--skip=truncated_directory_in_home" "--skip=directory_in_root" + "--skip=truncation_symbol_not_truncated_home" + "--skip=truncation_symbol_truncated_home" + "--skip=folder_with_glide_yaml" + "--skip=shows_multiple_tfms" + "--skip=shows_pinned_in_project_below_root_with_global_json" ]; meta = with stdenv.lib; { From bb61cce82abc6f692548d6831960e455766c898c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Sat, 10 Oct 2020 10:05:15 +0200 Subject: [PATCH 023/590] nixos-install: pass through impure flag --- nixos/doc/manual/man-nixos-install.xml | 6 ++++++ nixos/modules/installer/tools/nixos-install.sh | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml index b205e2309687..12d015971999 100644 --- a/nixos/doc/manual/man-nixos-install.xml +++ b/nixos/doc/manual/man-nixos-install.xml @@ -49,6 +49,12 @@ flake-uri + + + + + + diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 90555f145803..9279f11b4f32 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -64,7 +64,7 @@ while [ "$#" -gt 0 ]; do --no-bootloader) noBootLoader=1 ;; - --show-trace) + --show-trace|--impure) extraBuildFlags+=("$i") ;; --help) From 698836ecb7dad3efe8c8b69faafedeee8c8a0cfd Mon Sep 17 00:00:00 2001 From: "J. Neto" Date: Sun, 11 Oct 2020 15:30:19 -0300 Subject: [PATCH 024/590] textadept: 10.2 -> 10.8 --- .../editors/textadept/default.nix | 16 +++++++------ pkgs/applications/editors/textadept/deps.nix | 24 +++++++++---------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix index bb771c89010b..0456d013bbbe 100644 --- a/pkgs/applications/editors/textadept/default.nix +++ b/pkgs/applications/editors/textadept/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchhg, fetchurl, gtk2, glib, pkgconfig, unzip, ncurses, zip }: + stdenv.mkDerivation rec { - version = "10.2"; + version = "10.8"; pname = "textadept"; nativeBuildInputs = [ pkgconfig ]; @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchhg { url = "http://foicica.com/hg/textadept"; rev = "textadept_${version}"; - sha256 = "0fai8xqddkkprmbf0cf8wwgv7ccfdb1iyim30nppm2m16whkc8fl"; + sha256 = "sha256-dEZSx2tuHTWYhk9q5iGlrWTAvDvKaM8HaHwXcFcv33s="; }; preConfigure = @@ -19,10 +20,6 @@ stdenv.mkDerivation rec { "ln -s ${fetchurl params} $PWD/src/${name}" ) (import ./deps.nix)) + '' - # work around trying to download stuff in `make deps` - function wget() { true; } - export -f wget - cd src make deps ''; @@ -31,12 +28,17 @@ stdenv.mkDerivation rec { make curses ''; + preInstall = '' + mkdir -p $out/share/applications + mkdir -p $out/share/pixmaps + ''; + postInstall = '' make curses install PREFIX=$out MAKECMDGOALS=curses ''; makeFlags = [ - "PREFIX=$(out)" + "PREFIX=$(out) WGET=true PIXMAPS_DIR=$(out)/share/pixmaps" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/textadept/deps.nix b/pkgs/applications/editors/textadept/deps.nix index 80306191ff12..3ab778dddb2a 100644 --- a/pkgs/applications/editors/textadept/deps.nix +++ b/pkgs/applications/editors/textadept/deps.nix @@ -1,23 +1,23 @@ { - "542782a4df7d.zip" = { - url = "http://foicica.com/hg/scintilla/archive/542782a4df7d.zip"; - sha256 = "1qwxxcj86z9y7ij05j60lcp1awy2c9ck0vnn9z6c732sqjza0zx5"; + "99fa62b828ee.zip" = { + url = "http://foicica.com/hg/scintilla/archive/99fa62b828ee.zip"; + sha256 = "sha256-QO4iGhx72CfB1/0Pp/Qab92qm98VZn/EkrHZGndoHVc="; }; "lua-5.3.5.tar.gz" = { url = "http://www.lua.org/ftp/lua-5.3.5.tar.gz"; sha256 = "1b2qn2rv96nmbm6zab4l877bd4zq7wpwm8drwjiy2ih4jqzysbhc"; }; - "lpeg-1.0.0.tar.gz" = { - url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.0.tar.gz"; - sha256 = "13mz18s359wlkwm9d9iqlyyrrwjc6iqfpa99ai0icam2b3khl68h"; + "lpeg-1.0.2.tar.gz" = { + url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz"; + sha256 = "sha256-SNZldgUbbHg4j6rQm3BJMJMmRYj80PJY3aqxzdShX/4="; }; - "v_1_6_3.zip" = { - url = "https://github.com/keplerproject/luafilesystem/archive/v_1_6_3.zip"; - sha256 = "044s125im2irb4i42nnc5shvjj25fp4vsdbzd6b0va5igj0f6h4y"; + "v1_7_0_2.zip" = { + url = "https://github.com/keplerproject/luafilesystem/archive/v1_7_0_2.zip"; + sha256 = "sha256-kXSriR8dOStCpYeyr7c3+VZez4qGDS5aK/9FeFj1hHg="; }; - "6435a42450c7.zip" = { - url = "http://foicica.com/hg/gtdialog/archive/6435a42450c7.zip"; - sha256 = "1vxn89sif3qccksb6x5iprysqhjg69g7nyxlgrg31q397dmsg1ym"; + "db67f8a489e8.zip" = { + url = "http://foicica.com/hg/gtdialog/archive/db67f8a489e8.zip"; + sha256 = "sha256-UIvjbDrg3jyz7t2tm4y1zzH/TG6Kqaz3LE5y2U6OHuM="; }; "cdk-5.0-20150928.tgz" = { url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20150928.tgz"; From 948e05bb281cf3ec3b75944f9afd3162187f1d4e Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Fri, 11 Sep 2020 01:13:53 +0100 Subject: [PATCH 025/590] pam: add support for pam_gnupg --- nixos/modules/security/pam.nix | 45 ++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index a20d0a243a8e..a517f9e51ce1 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -318,6 +318,42 @@ let ''; }; + gnupg = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + If enabled, pam_gnupg will attempt to automatically unlock the + user's GPG keys with the login password via + gpg-agent. The keygrips of all keys to be + unlocked should be written to ~/.pam-gnupg, + and can be queried with gpg -K --with-keygrip. + Presetting passphrases must be enabled by adding + allow-preset-passphrase in + ~/.gnupg/gpg-agent.conf. + ''; + }; + + noAutostart = mkOption { + type = types.bool; + default = false; + description = '' + Don't start gpg-agent if it is not running. + Useful in conjunction with starting gpg-agent as + a systemd user service. + ''; + }; + + storeOnly = mkOption { + type = types.bool; + default = false; + description = '' + Don't send the password immediately after login, but store for PAM + session. + ''; + }; + }; + text = mkOption { type = types.nullOr types.lines; description = "Contents of the PAM service file."; @@ -386,6 +422,7 @@ let || cfg.enableKwallet || cfg.enableGnomeKeyring || cfg.googleAuthenticator.enable + || cfg.gnupg.enable || cfg.duoSecurity.enable)) '' auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} ${optionalString cfg.nodelay "nodelay"} likeauth ${optionalString config.security.pam.enableEcryptfs @@ -397,6 +434,10 @@ let " kwalletd=${pkgs.kdeFrameworks.kwallet.bin}/bin/kwalletd5")} ${optionalString cfg.enableGnomeKeyring "auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so"} + ${optionalString cfg.gnupg.enable + "auth optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so" + + optionalString cfg.gnupg.storeOnly " store-only" + } ${optionalString cfg.googleAuthenticator.enable "auth required ${pkgs.googleAuthenticator}/lib/security/pam_google_authenticator.so no_increment_hotp"} ${optionalString cfg.duoSecurity.enable @@ -472,6 +513,10 @@ let " kwalletd=${pkgs.kdeFrameworks.kwallet.bin}/bin/kwalletd5")} ${optionalString (cfg.enableGnomeKeyring) "session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"} + ${optionalString cfg.gnupg.enable + "session optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so" + + optionalString cfg.gnupg.noAutostart " no-autostart" + } ${optionalString (config.virtualisation.lxc.lxcfs.enable) "session optional ${pkgs.lxc}/lib/security/pam_cgfs.so -c all"} ''); From ea4a13e5737f440401123ea351e713b32c4a0876 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 13 Oct 2020 10:05:15 +0200 Subject: [PATCH 026/590] R: 4.0.2 -> 4.0.3 Signed-off-by: Matthias Beyer --- pkgs/applications/science/math/R/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 717b240c1cce..25ee66e8f75a 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -12,11 +12,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { - name = "R-4.0.2"; + name = "R-4.0.3"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-4/${name}.tar.gz"; - sha256 = "0xdy3dy2bzdiba8z94hjykyra8si8a5q15s0bri7c26scjrymg6k"; + sha256 = "03cypg2qf7v9mq9mr9alz9w5y9m5kdgwbc97bp26pyymg253m609"; }; dontUseImakeConfigure = true; From ba003ec930fd27d72bad0c125f186cf5563e0a79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Tue, 13 Oct 2020 15:18:31 +0200 Subject: [PATCH 027/590] pkgs/mariadb: Fix when running without aliases DataDumper is an alias to `null` in top-level/perl-packages.nix since it's included as part of perl. --- pkgs/servers/sql/mariadb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 3ba4e367312c..80f19719100a 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -15,7 +15,7 @@ let # in mariadb # spans the whole file libExt = stdenv.hostPlatform.extensions.sharedLibrary; -mytopEnv = perl.withPackages (p: with p; [ DataDumper DBDmysql DBI TermReadKey ]); +mytopEnv = perl.withPackages (p: with p; [ DBDmysql DBI TermReadKey ]); mariadb = server // { inherit client; # MariaDB Client From 2ef3661fdf5c365b79480f3bdc2bceb0c63e39f3 Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Wed, 14 Oct 2020 12:34:31 -0400 Subject: [PATCH 028/590] noaa-apt: make platforms.all explicit --- pkgs/applications/radio/noaa-apt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/radio/noaa-apt/default.nix b/pkgs/applications/radio/noaa-apt/default.nix index 55703ea44d6d..c99d4af12d6c 100644 --- a/pkgs/applications/radio/noaa-apt/default.nix +++ b/pkgs/applications/radio/noaa-apt/default.nix @@ -59,6 +59,7 @@ rustPlatform.buildRustPackage rec { homepage = "http://noaa-apt.mbernardi.com.ar/"; license = licenses.gpl3Only; maintainers = with maintainers; [ trepetti ]; + platforms = platforms.all; changelog = "https://github.com/martinber/noaa-apt/releases/tag/v${version}"; }; } From d2529bf58c4014484d0862e2f67530db30118314 Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Wed, 14 Oct 2020 12:56:15 -0400 Subject: [PATCH 029/590] noaa-apt: 1.2.0 -> 1.3.0 --- pkgs/applications/radio/noaa-apt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/radio/noaa-apt/default.nix b/pkgs/applications/radio/noaa-apt/default.nix index c99d4af12d6c..b2afd2cffe20 100644 --- a/pkgs/applications/radio/noaa-apt/default.nix +++ b/pkgs/applications/radio/noaa-apt/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "noaa-apt"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "martinber"; repo = "noaa-apt"; rev = "v${version}"; - sha256 = "0fqki4a9c54rixdz5bpswvn433f9saw6yazgw4av3xdd7g2fdvvj"; + sha256 = "0fmbg6lw7lmm402hzddpzgi7y9mc6kic14x8rif7fampk20mv3ms"; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { pango ]; - cargoSha256 = "1pzcq31inazmc9cz31fspzqkp0lpkjid8ai3g17sin1pfzby5jlh"; + cargoSha256 = "0w4rbbz8lsh31xkgibzndiic47690nfcjrn1411dskf7ali6djy8"; preBuild = '' # Used by macro pointing to resource location at compile time. From 659ed4317ff80ded7be39c9b941bd1cb2792ac72 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 14 Oct 2020 20:59:19 +0200 Subject: [PATCH 030/590] flameshot: 0.6.0 -> 0.8.4 --- pkgs/tools/misc/flameshot/default.nix | 32 ++++++--------------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index afca2e3007ed..de7d56e5584a 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -1,44 +1,26 @@ -{ mkDerivation, lib, fetchFromGitHub, qtbase, qmake, qttools, qtsvg }: +{ mkDerivation, lib, fetchFromGitHub, qtbase, cmake, qttools, qtsvg }: -# To use `flameshot gui`, you will also need to put flameshot in `services.dbus.packages` -# in configuration.nix so that the daemon gets launched properly: -# -# services.dbus.packages = [ pkgs.flameshot ]; -# environment.systemPackages = [ pkgs.flameshot ]; mkDerivation rec { pname = "flameshot"; - version = "0.6.0"; + version = "0.8.4"; src = fetchFromGitHub { - owner = "lupoDharkael"; + owner = "flameshot-org"; repo = "flameshot"; rev = "v${version}"; - sha256 = "193szslh55v44jzxzx5g9kxhl8p8di7vbcnxlid4acfidhnvgazm"; + sha256 = "0nr50ma8l612drl2br084kb3xac7jqkqr41b26d4p9y7ylwk05yq"; }; - nativeBuildInputs = [ qmake qttools qtsvg ]; + nativeBuildInputs = [ cmake qttools qtsvg ]; buildInputs = [ qtbase ]; - qmakeFlags = [ "PREFIX=${placeholder "out"}" ]; - - preConfigure = '' - # flameshot.pro assumes qmake is being run in a git checkout. - git() { echo ${version}; } - export -f git - ''; - - postFixup = '' - substituteInPlace $out/share/dbus-1/services/org.dharkael.Flameshot.service \ - --replace "/usr/local" "$out" - ''; - enableParallelBuilding = true; meta = with lib; { description = "Powerful yet simple to use screenshot software"; - homepage = "https://github.com/lupoDharkael/flameshot"; + homepage = "https://flameshot.js.org"; maintainers = [ maintainers.scode ]; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; }; } From 7ee6eb7e1d81951d8fa8fda23a7d3e097b845de1 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Fri, 16 Oct 2020 03:49:26 +0800 Subject: [PATCH 031/590] clipcat: init at 0.4.19 --- pkgs/applications/misc/clipcat/default.nix | 64 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/applications/misc/clipcat/default.nix diff --git a/pkgs/applications/misc/clipcat/default.nix b/pkgs/applications/misc/clipcat/default.nix new file mode 100644 index 000000000000..244770e138f9 --- /dev/null +++ b/pkgs/applications/misc/clipcat/default.nix @@ -0,0 +1,64 @@ +{ lib, fetchFromGitHub, installShellFiles, rustPlatform, rustfmt, xorg +, pkgconfig, llvmPackages, clang, protobuf, python3 }: + +rustPlatform.buildRustPackage rec { + pname = "clipcat"; + version = "0.4.19"; + + src = fetchFromGitHub { + owner = "xrelkd"; + repo = pname; + rev = "v${version}"; + sha256 = "1lhnm521qqy3aw2iyk1dv4yc5ms0c5x5iipx96bz6v6y0cnmf4kw"; + }; + + cargoSha256 = "04iflyvz8g53z658rkxafiyi2m9kzxwl3p1xgkjq7vacmz5jk15c"; + + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + + # needed for internal protobuf c wrapper library + PROTOC = "${protobuf}/bin/protoc"; + PROTOC_INCLUDE = "${protobuf}/include"; + + nativeBuildInputs = [ + pkgconfig + + clang + llvmPackages.libclang + + rustfmt + protobuf + + python3 + + installShellFiles + ]; + buildInputs = [ xorg.libxcb ]; + + cargoBuildFlags = [ "--features=all" ]; + + postInstall = '' + installShellCompletion --bash --name clipcatd completions/bash-completion/completions/clipcatd + installShellCompletion --fish --name clipcatd.fish completions/fish/completions/clipcatd.fish + installShellCompletion --zsh --name _clipcatd completions/zsh/site-functions/_clipcatd + + installShellCompletion --bash --name clipcatctl completions/bash-completion/completions/clipcatctl + installShellCompletion --fish --name clipcatctl.fish completions/fish/completions/clipcatctl.fish + installShellCompletion --zsh --name _clipcatctl completions/zsh/site-functions/_clipcatctl + + installShellCompletion --bash --name clipcat-menu completions/bash-completion/completions/clipcat-menu + installShellCompletion --fish --name clipcat-menu.fish completions/fish/completions/clipcat-menu.fish + installShellCompletion --zsh --name _clipcat-menu completions/zsh/site-functions/_clipcat-menu + + installShellCompletion --bash --name clipcat-notify completions/bash-completion/completions/clipcat-notify + installShellCompletion --fish --name clipcat-notify.fish completions/fish/completions/clipcat-notify.fish + installShellCompletion --zsh --name _clipcat-notify completions/zsh/site-functions/_clipcat-notify + ''; + + meta = with lib; { + description = "Clipboard Manager written in Rust Programming Language"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ xrelkd ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db255b00c622..09c413672c68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20067,6 +20067,8 @@ in clipgrab = libsForQt514.callPackage ../applications/video/clipgrab { }; + clipcat = callPackage ../applications/misc/clipcat { }; + clipmenu = callPackage ../applications/misc/clipmenu { }; clipit = callPackage ../applications/misc/clipit { }; From a25c9b6b430343e98a6f862a4d4581ea33a6c4e8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 12:00:42 +0000 Subject: [PATCH 032/590] helmsman: 3.4.4 -> 3.4.6 --- pkgs/applications/networking/cluster/helmsman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index 19c7234e11b4..d4f1e82d5116 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helmsman"; - version = "3.4.4"; + version = "3.4.6"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "01vjghak2szif0p82kall5jw7mbfh4fg7fcjkblmic7l0vlqhfac"; + sha256 = "018bkl6q6q8njv9qy87affs0g6c716vmhcqv2czv8qz454hn7i5h"; }; vendorSha256 = "05vnysr5r3hbayss1pyifgp989kjw81h95iack8ady62k6ys5njl"; From 7c676c64297b805148d9a88bb4e7cf265bc506a0 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 23 Mar 2020 15:17:37 +0100 Subject: [PATCH 033/590] wshowkeys: init at 2019-09-26 --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/wshowkeys.nix | 22 +++++++++++++++ pkgs/tools/wayland/wshowkeys/default.nix | 35 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 60 insertions(+) create mode 100644 nixos/modules/programs/wshowkeys.nix create mode 100644 pkgs/tools/wayland/wshowkeys/default.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index ed6201237b3d..41e0188cb71b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -172,6 +172,7 @@ ./programs/wavemon.nix ./programs/waybar.nix ./programs/wireshark.nix + ./programs/wshowkeys.nix ./programs/x2goserver.nix ./programs/xfs_quota.nix ./programs/xonsh.nix diff --git a/nixos/modules/programs/wshowkeys.nix b/nixos/modules/programs/wshowkeys.nix new file mode 100644 index 000000000000..09b008af1d5d --- /dev/null +++ b/nixos/modules/programs/wshowkeys.nix @@ -0,0 +1,22 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.wshowkeys; +in { + meta.maintainers = with maintainers; [ primeos ]; + + options = { + programs.wshowkeys = { + enable = mkEnableOption '' + wshowkeys (displays keypresses on screen on supported Wayland + compositors). It requires root permissions to read input events, but + these permissions are dropped after startup''; + }; + }; + + config = mkIf cfg.enable { + security.wrappers.wshowkeys.source = "${pkgs.wshowkeys}/bin/wshowkeys"; + }; +} diff --git a/pkgs/tools/wayland/wshowkeys/default.nix b/pkgs/tools/wayland/wshowkeys/default.nix new file mode 100644 index 000000000000..0058d34edb69 --- /dev/null +++ b/pkgs/tools/wayland/wshowkeys/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl +, meson, pkg-config, wayland, ninja +, cairo, libinput, pango, wayland-protocols, libxkbcommon +}: + +let + version = "2019-09-26"; + commit = "a9bf6bca0361b57c67e4627bf53363a7048457fd"; +in stdenv.mkDerivation rec { + pname = "wshowkeys-unstable"; + inherit version; + + src = fetchurl { + url = "https://git.sr.ht/~sircmpwn/wshowkeys/archive/${commit}.tar.gz"; + sha256 = "0b21z3csd3v4lw5b8a6lpx5gfsdk0gjmm8906sa72hyfd1p39b7g"; + }; + + nativeBuildInputs = [ meson pkg-config wayland ninja ]; + buildInputs = [ cairo libinput pango wayland-protocols libxkbcommon ]; + + meta = with stdenv.lib; { + description = "Displays keys being pressed on a Wayland session"; + longDescription = '' + Displays keypresses on screen on supported Wayland compositors (requires + wlr_layer_shell_v1 support). + Note: This tool requires root permissions to read input events, but these + permissions are dropped after startup. The NixOS module provides such a + setuid binary (use "programs.wshowkeys.enable = true;"). + ''; + homepage = "https://git.sr.ht/~sircmpwn/wshowkeys"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a15e49b650b..56dca3703954 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3431,6 +3431,8 @@ in wrangler = callPackage ../development/tools/wrangler { }; + wshowkeys = callPackage ../tools/wayland/wshowkeys { }; + xkcdpass = with pythonPackages; toPythonApplication xkcdpass; xob = callPackage ../tools/X11/xob { }; From b4bca7b85c162aec8cb5bf0399897adaae0bc41a Mon Sep 17 00:00:00 2001 From: Nicolas Berbiche Date: Thu, 8 Oct 2020 20:41:22 -0400 Subject: [PATCH 034/590] wshowkeys: 2019-09-26 -> 2020-03-29 --- pkgs/tools/wayland/wshowkeys/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/wayland/wshowkeys/default.nix b/pkgs/tools/wayland/wshowkeys/default.nix index 0058d34edb69..f2519725594c 100644 --- a/pkgs/tools/wayland/wshowkeys/default.nix +++ b/pkgs/tools/wayland/wshowkeys/default.nix @@ -4,15 +4,15 @@ }: let - version = "2019-09-26"; - commit = "a9bf6bca0361b57c67e4627bf53363a7048457fd"; + version = "2020-03-29"; + commit = "6388a49e0f431d6d5fcbd152b8ae4fa8e87884ee"; in stdenv.mkDerivation rec { pname = "wshowkeys-unstable"; inherit version; src = fetchurl { url = "https://git.sr.ht/~sircmpwn/wshowkeys/archive/${commit}.tar.gz"; - sha256 = "0b21z3csd3v4lw5b8a6lpx5gfsdk0gjmm8906sa72hyfd1p39b7g"; + sha256 = "0iplmw13jmc8d3m307kc047zq8yqwm42kw9fpm270562i3p0qk4d"; }; nativeBuildInputs = [ meson pkg-config wayland ninja ]; @@ -30,6 +30,6 @@ in stdenv.mkDerivation rec { homepage = "https://git.sr.ht/~sircmpwn/wshowkeys"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ primeos berbiche ]; }; } From e725ae870469f6548b30c726cad98c2108e7c3ac Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 19 Oct 2020 04:20:00 +0000 Subject: [PATCH 035/590] gitAndTools.git-absorb: 0.6.4 -> 0.6.5 --- .../version-management/git-and-tools/git-absorb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix index 187034031383..46a6f817417f 100644 --- a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "git-absorb"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "tummychow"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "01hf9hbrigqn4qcz6jmprp7by9nh55k1r2d11g7sil5fpw6m2j9k"; + sha256 = "12ih0gm07ddi86jy612f029nzav345v57pjajyy9lw017g6n6mjb"; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; - cargoSha256 = "04dkfjb6pxqaalw2y6yli9q58g8x8ppfmibivpvqifk8r8dhkdqp"; + cargoSha256 = "0x2zcw0bpwqimvbb5xj8xawvl4jcvk5lj0y2mm5ncbdapzyqdsb2"; postInstall = '' installManPage Documentation/git-absorb.1 From 580f0faa7512f09a7a6fd63282603111a0d48723 Mon Sep 17 00:00:00 2001 From: V Date: Mon, 19 Oct 2020 14:25:36 +0200 Subject: [PATCH 036/590] nixos/caddy: remove services.caddy.agree This option is no longer referenced anywhere as of #99371. --- nixos/modules/services/web-servers/caddy.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index 72bf9a9a1f44..63ba75e660cb 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -24,6 +24,10 @@ let ${pkgs.jq}/bin/jq -s '.[0] * .[1]' ${adaptedConfig} ${tlsJSON} > $out ''; in { + imports = [ + (mkRemovedOptionModule [ "services" "caddy" "agree" ] "this option is no longer necessary for Caddy 2") + ]; + options.services.caddy = { enable = mkEnableOption "Caddy web server"; @@ -66,12 +70,6 @@ in { description = "Email address (for Let's Encrypt certificate)"; }; - agree = mkOption { - default = false; - type = types.bool; - description = "Agree to Let's Encrypt Subscriber Agreement"; - }; - dataDir = mkOption { default = "/var/lib/caddy"; type = types.path; From 3835f35f2b965b78204344ab50dbba23fb9e48ff Mon Sep 17 00:00:00 2001 From: V Date: Tue, 20 Oct 2020 03:27:03 +0200 Subject: [PATCH 037/590] uemacs: remove This crashes with a buffer overflow upon running it. It has likely been broken for some time. It has no maintainers. It is also unfree. --- pkgs/applications/editors/uemacs/default.nix | 38 -------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 40 deletions(-) delete mode 100644 pkgs/applications/editors/uemacs/default.nix diff --git a/pkgs/applications/editors/uemacs/default.nix b/pkgs/applications/editors/uemacs/default.nix deleted file mode 100644 index e14a07eb6835..000000000000 --- a/pkgs/applications/editors/uemacs/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchgit, ncurses }: - -stdenv.mkDerivation { - pname = "uemacs"; - version = "2014-12-08"; - - src = fetchgit { - url = "git://git.kernel.org/pub/scm/editors/uemacs/uemacs.git"; - rev = "8841922689769960fa074fbb053cb8507f2f3ed9"; - sha256 = "14yq7kpkax111cg6k7i3mnqk7sq7a65krq6qizzj7vvnm7bsj3sd"; - }; - - postPatch = '' - substituteInPlace Makefile \ - --replace "-lcurses" "-lncurses" \ - --replace "CFLAGS=-O2" "CFLAGS+=" \ - --replace "BINDIR=/usr/bin" "BINDIR=$out/bin" \ - --replace "LIBDIR=/usr/lib" "LIBDIR=$out/share/uemacs" - substituteInPlace epath.h \ - --replace "/usr/global/lib/" "$out/share/uemacs/" \ - --replace "/usr/local/bin/" "$out/bin/" \ - --replace "/usr/local/lib/" "$out/share/uemacs/" \ - --replace "/usr/local/" "$out/bin/" \ - --replace "/usr/lib/" "$out/share/uemacs/" - mkdir -p $out/bin $out/share/uemacs - ''; - - buildInputs = [ ncurses ]; - - meta = with stdenv.lib; { - homepage = "https://git.kernel.org/cgit/editors/uemacs/uemacs.git"; - description = "Torvalds Micro-emacs fork"; - longDescription = '' - uEmacs/PK 4.0 is a full screen editor based on MicroEMACS 3.9e - ''; - license = licenses.unfree; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c74f2249fc89..870a7fe39d14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7939,8 +7939,6 @@ in udunits = callPackage ../development/libraries/udunits { }; - uemacs = callPackage ../applications/editors/uemacs { }; - uftp = callPackage ../servers/uftp {}; uhttpmock = callPackage ../development/libraries/uhttpmock { }; From fdc5b324d66a276ea5615e05afbc2b3854a6b573 Mon Sep 17 00:00:00 2001 From: JesusMtnez Date: Wed, 7 Oct 2020 10:01:53 +0200 Subject: [PATCH 038/590] slack: 4.9.0 -> 4.10.3 --- .../networking/instant-messengers/slack/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 2edccd8c019e..bd41fc562bfc 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -40,8 +40,8 @@ let pname = "slack"; version = { - x86_64-darwin = "4.9.0"; - x86_64-linux = "4.9.1"; + x86_64-darwin = "4.10.3"; + x86_64-linux = "4.10.3"; }.${system} or throwSystem; src = let @@ -49,11 +49,11 @@ let in { x86_64-darwin = fetchurl { url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg"; - sha256 = "007fflncvvclj4agb6g5hc5k9j5hhz1rpvlcfd8w31rn1vad4abk"; + sha256 = "0r77l57vr603xamich4h4gbdd5vdcj0sjs6yjpymfx9s0f98v8bb"; }; x86_64-linux = fetchurl { url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "1n8br5vlcnf13b8m6727hy4bkmd6wayss96ck4ba9zsjiyj7v74i"; + sha256 = "1gnjj2iyk8cwjajg8h9qpmzx10j4qjxjzciq8csg45qfzwkr3drf"; }; }.${system} or throwSystem; From 49edde0905978bf3420498663c05ab4571da90a7 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Tue, 20 Oct 2020 14:27:09 -0400 Subject: [PATCH 039/590] rsync: Work around upstream cross-compilation issue It should be fixed by the next release: * https://github.com/WayneD/rsync/commit/b7fab6f285ff0ff3816b109a8c3131b6ded0b484 Already a part of the updates for 3.2.4 * https://download.samba.org/pub/rsync/NEWS#3.2.4 --- pkgs/applications/networking/sync/rsync/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 2728d8484ef1..7f384846c960 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -35,7 +35,15 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enableXXHash xxHash; nativeBuildInputs = [perl]; - configureFlags = ["--with-nobody-group=nogroup"]; + configureFlags = ["--with-nobody-group=nogroup"] + # Work around issue with cross-compilation: + # configure.sh: error: cannot run test program while cross compiling + # Remove once 3.2.4 or more recent is released. + # The following PR should fix the cross-compilation issue. + # Test using `nix-build -A pkgsCross.aarch64-multiplatform.rsync`. + # https://github.com/WayneD/rsync/commit/b7fab6f285ff0ff3816b109a8c3131b6ded0b484 + ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-simd=no" + ; passthru.tests = { inherit (nixosTests) rsyncd; }; From 2c6de0b9abdbec2d50f0d2f4328943632d4828e6 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Wed, 21 Oct 2020 10:40:51 +0300 Subject: [PATCH 040/590] openxray: fix build w/glibc-2.32 --- pkgs/games/openxray/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix index fe2e978c4cc4..394edcf1953a 100644 --- a/pkgs/games/openxray/default.nix +++ b/pkgs/games/openxray/default.nix @@ -50,6 +50,10 @@ in stdenv.mkDerivation rec { preConfigure = '' substituteInPlace src/xrCore/xrCore.cpp \ --replace /usr/share $out/share + + # https://github.com/OpenXRay/xray-16/issues/667 + echo "inline const char* xr_sys_errlist[100] = {};" >> src/Common/PlatformLinux.inl + echo "#define _sys_errlist xr_sys_errlist" >> src/Common/PlatformLinux.inl ''; postInstall = '' From c821e0d4be2b4ebc8e1eebca6eb11211a371a43e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 18 Sep 2020 01:53:52 +0200 Subject: [PATCH 041/590] nixos/babeld: lock down service MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit → Overall exposure level for babeld.service: 2.2 OK 🙂 --- nixos/modules/services/networking/babeld.nix | 34 ++++++++++++++++++-- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/babeld.nix b/nixos/modules/services/networking/babeld.nix index e62c74d0069d..90395dbd3c54 100644 --- a/nixos/modules/services/networking/babeld.nix +++ b/nixos/modules/services/networking/babeld.nix @@ -87,9 +87,37 @@ in description = "Babel routing daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${pkgs.babeld}/bin/babeld -c ${configFile}"; + serviceConfig = { + ExecStart = "${pkgs.babeld}/bin/babeld -c ${configFile} -I /run/babeld/babeld.pid -S /var/lib/babeld/state"; + CapabilityBoundingSet = [ "CAP_NET_ADMIN" ]; + IPAddressAllow = [ "fe80::/64" "ff00::/8" "::1/128" "127.0.0.0/8" ]; + IPAddressDeny = "any"; + LockPersonality = true; + NoNewPrivileges = true; + MemoryDenyWriteExecute = true; + ProtectSystem = "strict"; + ProtectClock = true; + ProtectKernelTunables = false; # Couldn't write sysctl: Read-only file system + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + RestrictAddressFamilies = [ "AF_NETLINK" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + RemoveIPC = true; + ProtectHome = true; + ProtectHostname = true; + PrivateMounts = true; + PrivateTmp = true; + PrivateDevices = true; + PrivateUsers = false; # kernel_route(ADD): Operation not permitted + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" ]; + UMask = "0177"; + RuntimeDirectory = "babeld"; + StateDirectory = "babeld"; + }; }; - }; - } From 55871dc165f37a00d7ba53288d9c363fcd77664b Mon Sep 17 00:00:00 2001 From: midchildan Date: Tue, 18 Aug 2020 23:43:25 +0900 Subject: [PATCH 042/590] javaPackages: add upgraded packages These are packages required to build Sourcetrail Java support - maven-compiler-plugin 3.2 - plexus-compiler-api 2.4 - plexus-compiler-javac 2.4 - plexus-compiler-manager 2.4 --- .../java-modules/maven-minimal.nix | 5 +++ .../java-modules/maven/compiler-plugin.nix | 14 +++++++ .../java-modules/plexus/compiler-api.nix | 11 +++++ .../java-modules/plexus/compiler-javac.nix | 11 +++++ .../java-modules/plexus/compiler-manager.nix | 11 +++++ pkgs/development/java-modules/poms.nix | 40 +++++++++++++++++++ pkgs/top-level/java-packages.nix | 12 ++++-- 7 files changed, 101 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/java-modules/maven/compiler-plugin.nix diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix index c1fab1e9bc97..52edcd2104fd 100644 --- a/pkgs/development/java-modules/maven-minimal.nix +++ b/pkgs/development/java-modules/maven-minimal.nix @@ -83,6 +83,7 @@ in { apache_10 apache_11 apache_13 + apache_14 backportUtilConcurrent_3_1 commonsParent_22 doxia_1_0_alpha7 @@ -98,9 +99,11 @@ in { mavenParent_21 mavenParent_22 mavenParent_23 + mavenParent_24 mavenPlugins_22 mavenPlugins_23 mavenPlugins_24 + mavenPlugins_25 mavenPluginTools_3_1 mavenReporting_2_0_6 mavenReporting_2_0_9 @@ -121,7 +124,9 @@ in { plexus_3_3_1 plexusCipher_1_4 plexusCompiler_2_2 + plexusCompiler_2_4 plexusCompilers_2_2 + plexusCompilers_2_4 plexusComponents_1_1_7 plexusComponents_1_1_14 plexusComponents_1_1_15 diff --git a/pkgs/development/java-modules/maven/compiler-plugin.nix b/pkgs/development/java-modules/maven/compiler-plugin.nix new file mode 100644 index 000000000000..b35b5660e801 --- /dev/null +++ b/pkgs/development/java-modules/maven/compiler-plugin.nix @@ -0,0 +1,14 @@ +{ fetchMaven }: + +{ + mavenCompiler_3_2 = map (obj: fetchMaven { + version = "3.2"; + artifactId = "maven-compiler-plugin"; + groupId = "org.apache.maven.plugins"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "15lncacbgsbkp6m4fb1hv41nxn0w8lxgpjcpghw3znbh909d2y5h70q2nw3fyhd7kqsjwpvwpilkgyd5b35vi1smj5hhapmakqjk28r"; } + { type = "pom"; sha512 = "0a9pnb9rscsc32gpjr257k1pnydpskcs4jx8bs88vikxbdgc5sppllmqhi7k00i19azy2vjj59b3m9dcklcspmy9caxv2l7vjyr2lm0"; } + ]; +} diff --git a/pkgs/development/java-modules/plexus/compiler-api.nix b/pkgs/development/java-modules/plexus/compiler-api.nix index a1c6556a7699..f778e7cf29a8 100644 --- a/pkgs/development/java-modules/plexus/compiler-api.nix +++ b/pkgs/development/java-modules/plexus/compiler-api.nix @@ -11,4 +11,15 @@ { type = "jar"; sha512 = "3by7icjfiymp7g2v1ci5dqwml6ibzh2njyg2w43kvaz3ydcxkzmfg5s97wsdqjsii7vdgqyhr16ydsn6mr90wbjvsi6wasaq1rqa812"; } { type = "pom"; sha512 = "0pdl78hp921lgkfya54wl8hxgm1c5474j1p921q5ix1knx1rlr4klpjwx212wy2m7b6bxq0bkf8n66mqjr72rh2rh308qij00ymrga8"; } ]; + + plexusCompilerApi_2_4 = map (obj: fetchMaven { + version = "2.4"; + artifactId = "plexus-compiler-api"; + groupId = "org.codehaus.plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "1xm0lv43dbg33prr0vc7g3vv0r07qc7kxjjbpqkxyh60vryd9q2wj3r656z4x8fwwqjrpr9xb4lmn4nm0c1cn85xzhfpxiq13rnl8cr"; } + { type = "pom"; sha512 = "0mqghnfagrmws585bvdwbpf1c719jvbmhwb318vw661cjfzj1b55nvjxza49bx5y38kwnwk0cqk9f26pv323ng09iifyjxgzafqq479"; } + ]; } diff --git a/pkgs/development/java-modules/plexus/compiler-javac.nix b/pkgs/development/java-modules/plexus/compiler-javac.nix index d86240b6d45b..0e73caf58727 100644 --- a/pkgs/development/java-modules/plexus/compiler-javac.nix +++ b/pkgs/development/java-modules/plexus/compiler-javac.nix @@ -11,4 +11,15 @@ { type = "jar"; sha512 = "12xsiaqd1q6mmmkcsxf4nr4wdjl8fa1nwz32yqwrrbj9cgakph0368cnk1apjzngsmnl6bws87nlxcz64sg0rb7i2vdzggplj0a41br"; } { type = "pom"; sha512 = "1fv2ij4h9xmzv3f5mvs0ilhkw7khkw5v8n1d97a2canfn254fipz7pd9nkmkqzjvy3cqwiczyh2nzibvcii624p8ggwl4s3yjw92jx4"; } ]; + + plexusCompilerJavac_2_4 = map (obj: fetchMaven { + version = "2.4"; + artifactId = "plexus-compiler-javac"; + groupId = "org.codehaus.plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "272iaf7mgmhjssj0k4a9r8rzb3c8pskb4aqypcdvj217l8hbih6rsqhh9nd2xmwrwa1ifvc336b8ihz6f419lj74gp4p1za6mp0nps3"; } + { type = "pom"; sha512 = "1g16i5w610nsh9h0yyhw25fpr2lx562c4v8y17lw53imi4rhm0m709ysrbrh71rhv6f8g4i5d6wgps77jmdb5kn2h5k1n4n644wrd12"; } + ]; } diff --git a/pkgs/development/java-modules/plexus/compiler-manager.nix b/pkgs/development/java-modules/plexus/compiler-manager.nix index 3f27981b1540..c639780ca0ba 100644 --- a/pkgs/development/java-modules/plexus/compiler-manager.nix +++ b/pkgs/development/java-modules/plexus/compiler-manager.nix @@ -11,4 +11,15 @@ { type = "jar"; sha512 = "1r1sdj784x4zcnkaz840vsz36jn1p2j98c21nia56kcdl1njydjn714bsmdy816l6sdinkz4s196mm3hshmxhq8mkmf16wgxx8jnq94"; } { type = "pom"; sha512 = "3cpfnbgil6g0bgq0cjbq2ysfjdpl05fh72d9l9cnwbilcsaxcmzn1hgmmkvam2ih222nl82dy7n5020is3y05kiv0i4n4lcs5m0ia48"; } ]; + + plexusCompilerManager_2_4 = map (obj: fetchMaven { + version = "2.4"; + artifactId = "plexus-compiler-manager"; + groupId = "org.codehaus.plexus"; + sha512 = obj.sha512; + type = obj.type; + }) [ + { type = "jar"; sha512 = "2al10188nwrdmi9zk3bid4ijjfsa8ymh6m9hin5jsja7hx7anbvs3i2y7kall56h4qn7j1rj73f8499x3i2k6x53kszmksvd2a1pkd4"; } + { type = "pom"; sha512 = "2bb2yrvjxci7wx7ira5cnnzdmlzdx4fk59fddpnmvdgh06dmg7fbnjlyx73pn6b13ajjrjl7rgj26mqs2hid3c0p3ni6x1qsg9w3ip0"; } + ]; } diff --git a/pkgs/development/java-modules/poms.nix b/pkgs/development/java-modules/poms.nix index d93edb7aa4fd..4e314605b797 100644 --- a/pkgs/development/java-modules/poms.nix +++ b/pkgs/development/java-modules/poms.nix @@ -105,6 +105,14 @@ type = "pom"; }; + apache_14 = fetchMaven { + version = "14"; + artifactId = "apache"; + groupId = "org.apache"; + sha512 = "08y5k9lny2z171c78l4j70miylj2xy8w48amqwcghy3p9pc1p19qx6146s4mxc2z4wx4z9gpi9agham46m5hqa6k6v2s16v80phi7xi"; + type = "pom"; + }; + asmParent_4_0 = fetchMaven { version = "4.0"; artifactId = "asm-parent"; @@ -345,6 +353,14 @@ type = "pom"; }; + mavenParent_24 = fetchMaven { + version = "24"; + artifactId = "maven-parent"; + groupId = "org.apache.maven"; + sha512 = "0w1v36qx53xv5m8kag6wakzy7rjrp4gzfp7zfmrp5kw13ik6k42fnfkknslqc2g2c5dyxra2vpbvz1z9bcqslyaljd4r1rj3qbh5vl7"; + type = "pom"; + }; + mavenPlugins_22 = fetchMaven { version = "22"; artifactId = "maven-plugins"; @@ -369,6 +385,14 @@ type = "pom"; }; + mavenPlugins_25 = fetchMaven { + version = "25"; + artifactId = "maven-plugins"; + groupId = "org.apache.maven.plugins"; + sha512 = "38zx1im9qnblr5p9r4ln91d2280x48n9a11j4476skrgh97l3iqxs5ggqc22wis7r53g4j8ya4dvzqhxx6gymfbz3cn6a6hcmdqbng5"; + type = "pom"; + }; + mavenPluginTools_3_1 = fetchMaven { version = "3.1"; artifactId = "maven-plugin-tools"; @@ -593,6 +617,14 @@ type = "pom"; }; + plexusCompiler_2_4 = fetchMaven { + version = "2.4"; + artifactId = "plexus-compiler"; + groupId = "org.codehaus.plexus"; + sha512 = "0v89a5kbgyphmvgmdf6kb7zi4fvq16l435cxsp7grc5jy4ir9d0dv5g7xwhsk9ajp1lcy9kp4l4bk2h93g4kvj3bhk548wv284y36bf"; + type = "pom"; + }; + plexusCompilers_2_2 = fetchMaven { version = "2.2"; artifactId = "plexus-compilers"; @@ -601,6 +633,14 @@ type = "pom"; }; + plexusCompilers_2_4 = fetchMaven { + version = "2.4"; + artifactId = "plexus-compilers"; + groupId = "org.codehaus.plexus"; + sha512 = "1zalxaqycaykdn6q6pnxki6yvlpaf5qap1903hcylhbi1gcwmpqys39xg4pah9giy9iis350w2dmsab2prib9lihz4s9z6s6adqcss2"; + type = "pom"; + }; + plexusComponents_1_1_4 = fetchMaven { version = "1.1.4"; artifactId = "plexus-components"; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 73ed6bf9162c..7f1bb6e89a7c 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -89,6 +89,9 @@ in { mavenCommonArtifactFilters_1_3 mavenCommonArtifactFilters_1_4; + inherit (callPackage ../development/java-modules/maven/compiler-plugin.nix { inherit fetchMaven; }) + mavenCompiler_3_2; + inherit (callPackage ../development/java-modules/maven/core.nix { inherit fetchMaven; }) mavenCore_2_0_1 mavenCore_2_0_6 @@ -243,13 +246,16 @@ in { plexusClassworlds_2_4; inherit (callPackage ../development/java-modules/plexus/compiler-api.nix { inherit fetchMaven; }) - plexusCompilerApi_2_2; + plexusCompilerApi_2_2 + plexusCompilerApi_2_4; inherit (callPackage ../development/java-modules/plexus/compiler-javac.nix { inherit fetchMaven; }) - plexusCompilerJavac_2_2; + plexusCompilerJavac_2_2 + plexusCompilerJavac_2_4; inherit (callPackage ../development/java-modules/plexus/compiler-manager.nix { inherit fetchMaven; }) - plexusCompilerManager_2_2; + plexusCompilerManager_2_2 + plexusCompilerManager_2_4; inherit (callPackage ../development/java-modules/plexus/component-annotations.nix { inherit fetchMaven; }) plexusComponentAnnotations_1_5_5; From 1c90c5bcc4ab0076ba057954b7935a433ff3ec78 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Thu, 22 Oct 2020 11:30:24 +0200 Subject: [PATCH 043/590] prometheus-snmp-exporter: 0.18.0 -> 0.19.0 https://github.com/prometheus/snmp_exporter/releases/tag/v0.19.0 --- pkgs/servers/monitoring/prometheus/snmp-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index d3b35a8a8f1a..b6fafe5eaa43 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "snmp_exporter"; - version = "0.18.0"; + version = "0.19.0"; goPackagePath = "github.com/prometheus/snmp_exporter"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "prometheus"; repo = "snmp_exporter"; rev = "v${version}"; - sha256 = "1zdkb036zy2sw1drlp2m2z1yb7857d2y3yn2y3l0a1kkd4zcqkk4"; + sha256 = "1ppi5lmc2lryawpw1b3kpg3qxr7v62zbiwg2v1d8sq1y5b2xdza6"; }; buildInputs = [ net-snmp ]; From 2ee31417c9a51637a9cc7422d1380cb40e531901 Mon Sep 17 00:00:00 2001 From: Vladimir Serov Date: Thu, 22 Oct 2020 13:26:11 +0300 Subject: [PATCH 044/590] super-slicer: 2.2.54.0 -> 2.2.54.1 --- pkgs/applications/misc/prusa-slicer/super-slicer.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index da8cea8ab020..1e8f9fc99528 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -3,7 +3,7 @@ }: let appname = "SuperSlicer"; - version = "2.2.54.0"; + version = "2.2.54.1"; pname = "super-slicer"; description = "PrusaSlicer fork with more features and faster development cycle"; override = super: { @@ -12,7 +12,7 @@ let src = fetchFromGitHub { owner = "supermerill"; repo = "SuperSlicer"; - sha256 = "sha256-vvuUecysSdBvGBKOariQnsGJ9/Qccwp/lSq8WCED+Uk="; + sha256 = "sha256-0NWrck9nqAlc8xX3nTrRlnzjso4MRRjJSW7bUvCX6Y4="; rev = version; }; From e7234a508f17989feb2c8caf34d5b23f76240c05 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Oct 2020 10:59:34 +0000 Subject: [PATCH 045/590] bluez-alsa: 2.1.0 -> 3.0.0 --- pkgs/tools/bluetooth/bluez-alsa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/bluetooth/bluez-alsa/default.nix b/pkgs/tools/bluetooth/bluez-alsa/default.nix index 09f5471de483..588049cb976b 100644 --- a/pkgs/tools/bluetooth/bluez-alsa/default.nix +++ b/pkgs/tools/bluetooth/bluez-alsa/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "bluez-alsa"; - version = "2.1.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "Arkq"; repo = "bluez-alsa"; rev = "v${version}"; - sha256 = "112dfqxc144a61jqil2s3181gngfw5vz7yy10ml4f5a1nd90qnci"; + sha256 = "1jlsgxyqfhncfhx1sy3ry0dp6p95kd4agh7g2b7g51h0c4cv74h8"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; From db7a7f3282e05b2a2a4512ff9a3dbd9319e24354 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Thu, 22 Oct 2020 13:04:47 +0200 Subject: [PATCH 046/590] atlassian-confluence: 7.8.0 -> 7.8.1 https://confluence.atlassian.com/doc/issues-resolved-in-7-8-1-1027114676.html --- pkgs/servers/atlassian/confluence.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index e6b0754639c5..88b0c8435860 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null); stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; - version = "7.8.0"; + version = "7.8.1"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "0ivsbhb81v803dsx3c7vj4zbnhx8mr38nn9c45dfdp4lm6shsjq0"; + sha256 = "0jgwd8vb58yzwvnns0kyb0vzgrdvjwzvpk4x8228hrisjxahsm45"; }; buildPhase = '' From ce982c26be1df960e9b1312b3a2549ed61db49ff Mon Sep 17 00:00:00 2001 From: WilliButz Date: Thu, 22 Oct 2020 13:08:03 +0200 Subject: [PATCH 047/590] atlassian-crowd: 4.0.2 -> 4.2.0 https://confluence.atlassian.com/crowd/crowd-4-1-release-notes-1004960631.html https://confluence.atlassian.com/crowd/crowd-4-2-release-notes-1019381976.html --- pkgs/servers/atlassian/crowd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix index 893f20cf59a3..44d9aba582ef 100644 --- a/pkgs/servers/atlassian/crowd.nix +++ b/pkgs/servers/atlassian/crowd.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "atlassian-crowd"; - version = "4.0.2"; + version = "4.2.0"; src = fetchurl { url = "https://www.atlassian.com/software/crowd/downloads/binary/${pname}-${version}.tar.gz"; - sha256 = "1ndg9qb406rd239q7xycc2vdh2jd4fh9wryx1fm9493rxlncx28b"; + sha256 = "1gg4jcwvk4za6j4260dx1vz2dprrnqv8paqf6z86s7ka3y1nx1aj"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; From 4d4682c2b6b1697236662495166b457abfb523cf Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 22 Oct 2020 13:41:28 +0200 Subject: [PATCH 048/590] lib/options.nix: Use head instead of elemAt _ 0 --- lib/options.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/options.nix b/lib/options.nix index 5b7482c80937..9e0ea010bda7 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -110,7 +110,7 @@ rec { # Return early if we only have one element # This also makes it work for functions, because the foldl' below would try # to compare the first element with itself, which is false for functions - else if length defs == 1 then (elemAt defs 0).value + else if length defs == 1 then (head defs).value else (foldl' (first: def: if def.value != first.value then throw "The option `${showOption loc}' has conflicting definition values:${showDefs [ first def ]}" From 5aa2a98dfa0b54fef1b5cc7059ac8c4b1248a739 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 22 Oct 2020 13:38:46 +0200 Subject: [PATCH 049/590] lib/types.nix: Use // instead of mergeAttrs --- lib/types.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/types.nix b/lib/types.nix index e9e45dc25c72..dd287734388a 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -270,7 +270,7 @@ rec { name = "attrs"; description = "attribute set"; check = isAttrs; - merge = loc: foldl' (res: def: mergeAttrs res def.value) {}; + merge = loc: foldl' (res: def: res // def.value) {}; emptyValue = { value = {}; }; }; From afa6c51f27fb86fda71f91a51b093a5fc3de797d Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 20 Oct 2020 13:47:24 +0200 Subject: [PATCH 050/590] lib: Use Nix's static scope checking, fix error message, optimize Nix can perform static scope checking, but whenever code is inside a `with` expression, the analysis breaks down, because it can't know statically what's in the attribute set whose attributes were brought into scope. In those cases, Nix has to assume that everything works out. Except it doesnt. Removing `with` from lib/ revealed an undefined variable in an error message. If that doesn't convince you that we're better off without `with`, I can tell you that this PR results in a 3% evaluation performance improvement because Nix can look up local variables by index. This adds up with applications like the module system. Furthermore, removing `with` makes the binding site of each variable obvious, which helps with comprehension. --- lib/debug.nix | 32 +++++++++++++++----- lib/default.nix | 36 +++++++++++----------- lib/lists.nix | 2 +- lib/modules.nix | 59 +++++++++++++++++++++++++++++++----- lib/options.nix | 14 ++++++--- lib/sources.nix | 40 ++++++++++++++++-------- lib/strings-with-deps.nix | 13 +++++--- lib/strings.nix | 64 ++++++++++++++++++++++++++------------- lib/types.nix | 60 +++++++++++++++++++++++++++++++++--- 9 files changed, 238 insertions(+), 82 deletions(-) diff --git a/lib/debug.nix b/lib/debug.nix index 2879f72ed2ba..ea6aed60ab43 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -14,9 +14,25 @@ */ { lib }: let - inherit (builtins) trace isAttrs isList isInt - head substring attrNames; - inherit (lib) id elem isFunction; + inherit (lib) + isInt + attrNames + isList + isAttrs + substring + addErrorContext + attrValues + concatLists + concatStringsSep + const + elem + generators + head + id + isDerivation + isFunction + mapAttrs + trace; in rec { @@ -94,7 +110,7 @@ rec { trace: { a = { b = {…}; }; } => null */ - traceSeqN = depth: x: y: with lib; + traceSeqN = depth: x: y: let snip = v: if isList v then noQuotes "[…]" v else if isAttrs v then noQuotes "{…}" v else v; @@ -149,7 +165,7 @@ rec { */ runTests = # Tests to run - tests: lib.concatLists (lib.attrValues (lib.mapAttrs (name: test: + tests: concatLists (attrValues (mapAttrs (name: test: let testsToRun = if tests ? tests then tests.tests else []; in if (substring 0 4 name == "test" || elem name testsToRun) && ((testsToRun == []) || elem name tests.tests) @@ -176,9 +192,9 @@ rec { + "and will be removed in the next release. " + "Please use more specific concatenation " + "for your uses (`lib.concat(Map)StringsSep`)." ) - (lib.concatStringsSep "; " (map (x: "${x}=") (attrNames a))); + (concatStringsSep "; " (map (x: "${x}=") (attrNames a))); - showVal = with lib; + showVal = trace ( "Warning: `showVal` is deprecated " + "and will be removed in the next release, " + "please use `traceSeqN`" ) @@ -226,7 +242,7 @@ rec { trace ( "Warning: `addErrorContextToAttrs` is deprecated " + "and will be removed in the next release. " + "Please use `builtins.addErrorContext` directly." ) - (lib.mapAttrs (a: v: lib.addErrorContext "while evaluating ${a}" v) attrs); + (mapAttrs (a: v: addErrorContext "while evaluating ${a}" v) attrs); # example: (traceCallXml "myfun" id 3) will output something like # calling myfun arg 1: 3 result: 3 diff --git a/lib/default.nix b/lib/default.nix index 44076d295176..78566cceae83 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -9,7 +9,7 @@ let lib = makeExtensible (self: let callLibs = file: import file { lib = self; }; - in with self; { + in { # often used, or depending on very little trivial = callLibs ./trivial.nix; @@ -54,7 +54,7 @@ let filesystem = callLibs ./filesystem.nix; # back-compat aliases - platforms = systems.doubles; + platforms = self.systems.doubles; # linux kernel configuration kernel = callLibs ./kernel.nix; @@ -64,13 +64,13 @@ let hasAttr head isAttrs isBool isInt isList isString length lessThan listToAttrs pathExists readFile replaceStrings seq stringLength sub substring tail; - inherit (trivial) id const pipe concat or and bitAnd bitOr bitXor + inherit (self.trivial) id const pipe concat or and bitAnd bitOr bitXor bitNot boolToString mergeAttrs flip mapNullable inNixShell min max importJSON importTOML warn info showWarnings nixpkgsVersion version mod compare splitByAndCompare functionArgs setFunctionArgs isFunction toHexString toBaseDigits; - inherit (fixedPoints) fix fix' converge extends composeExtensions + inherit (self.fixedPoints) fix fix' converge extends composeExtensions makeExtensible makeExtensibleWithCustomName; - inherit (attrsets) attrByPath hasAttrByPath setAttrByPath + inherit (self.attrsets) attrByPath hasAttrByPath setAttrByPath getAttrFromPath attrVals attrValues getAttrs catAttrs filterAttrs filterAttrsRecursive foldAttrs collect nameValuePair mapAttrs mapAttrs' mapAttrsToList mapAttrsRecursive mapAttrsRecursiveCond @@ -79,13 +79,13 @@ let recursiveUpdate matchAttrs overrideExisting getOutput getBin getLib getDev getMan chooseDevOutputs zipWithNames zip recurseIntoAttrs dontRecurseIntoAttrs; - inherit (lists) singleton forEach foldr fold foldl foldl' imap0 imap1 + inherit (self.lists) singleton forEach foldr fold foldl foldl' imap0 imap1 concatMap flatten remove findSingle findFirst any all count optional optionals toList range partition zipListsWith zipLists reverseList listDfs toposort sort naturalSort compareLists take drop sublist last init crossLists unique intersectLists subtractLists mutuallyExclusive groupBy groupBy'; - inherit (strings) concatStrings concatMapStrings concatImapStrings + inherit (self.strings) concatStrings concatMapStrings concatImapStrings intersperse concatStringsSep concatMapStringsSep concatImapStringsSep makeSearchPath makeSearchPathOutput makeLibraryPath makeBinPath optionalString @@ -97,19 +97,19 @@ let nameFromURL enableFeature enableFeatureAs withFeature withFeatureAs fixedWidthString fixedWidthNumber isStorePath toInt readPathsFromFile fileContents; - inherit (stringsWithDeps) textClosureList textClosureMap + inherit (self.stringsWithDeps) textClosureList textClosureMap noDepEntry fullDepEntry packEntry stringAfter; - inherit (customisation) overrideDerivation makeOverridable + inherit (self.customisation) overrideDerivation makeOverridable callPackageWith callPackagesWith extendDerivation hydraJob makeScope; - inherit (meta) addMetaAttrs dontDistribute setName updateName + inherit (self.meta) addMetaAttrs dontDistribute setName updateName appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio hiPrioSet; - inherit (sources) pathType pathIsDirectory cleanSourceFilter + inherit (self.sources) pathType pathIsDirectory cleanSourceFilter cleanSource sourceByRegex sourceFilesBySuffices commitIdFromGitRepo cleanSourceWith pathHasContext canCleanSource pathIsRegularFile pathIsGitRepo; - inherit (modules) evalModules unifyModuleSyntax + inherit (self.modules) evalModules unifyModuleSyntax applyIfFunction mergeModules mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions pushDownProperties dischargeProperties filterOverrides @@ -119,21 +119,21 @@ let mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule mkRenamedOptionModule mkMergedOptionModule mkChangedOptionModule mkAliasOptionModule doRename; - inherit (options) isOption mkEnableOption mkSinkUndeclaredOptions + inherit (self.options) isOption mkEnableOption mkSinkUndeclaredOptions mergeDefaultOption mergeOneOption mergeEqualOption getValues getFiles optionAttrSetToDocList optionAttrSetToDocList' scrubOptionValue literalExample showOption showFiles unknownModule mkOption; - inherit (types) isType setType defaultTypeMerge defaultFunctor + inherit (self.types) isType setType defaultTypeMerge defaultFunctor isOptionType mkOptionType; - inherit (asserts) + inherit (self.asserts) assertMsg assertOneOf; - inherit (debug) addErrorContextToAttrs traceIf traceVal traceValFn + inherit (self.debug) addErrorContextToAttrs traceIf traceVal traceValFn traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq traceValSeqFn traceValSeqN traceValSeqNFn traceShowVal traceShowValMarked showVal traceCall traceCall2 traceCall3 traceValIfNot runTests testAllTrue traceCallXml attrNamesToStr; - inherit (misc) maybeEnv defaultMergeArg defaultMerge foldArgs + inherit (self.misc) maybeEnv defaultMergeArg defaultMerge foldArgs maybeAttrNullable maybeAttr ifEnable checkFlag getValue checkReqs uniqList uniqListExt condConcat lazyGenericClosure innerModifySumArgs modifySumArgs innerClosePropagation @@ -143,7 +143,7 @@ let mergeAttrsByFuncDefaultsClean mergeAttrBy fakeHash fakeSha256 fakeSha512 nixType imap; - inherit (versions) + inherit (self.versions) splitVersion; }); in lib diff --git a/lib/lists.nix b/lib/lists.nix index f424946c72cd..6c97e0686aa8 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -1,9 +1,9 @@ # General list operations. { lib }: -with lib.trivial; let inherit (lib.strings) toInt; + inherit (lib.trivial) compare min; in rec { diff --git a/lib/modules.nix b/lib/modules.nix index df3a2ad17e5f..37e2e23ec12d 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -1,12 +1,55 @@ { lib }: -with lib.lists; -with lib.strings; -with lib.trivial; -with lib.attrsets; -with lib.options; -with lib.debug; -with lib.types; +let + inherit (lib.attrsets) + mapAttrsRecursiveCond + ; + inherit (lib.lists) + any all concatLists concatMap + count filter findFirst foldl foldl' + head imap1 length optional + reverseList sort + ; + inherit (lib.options) + isOption + mkOption + showDefs + showFiles + showOption + unknownModule + ; + inherit (lib.attrsets) + attrByPath + attrNames + catAttrs + getAttrFromPath + mapAttrs + mapAttrsToList + optionalAttrs + recursiveUpdate + setAttrByPath + toList + ; + inherit (lib.types) + types + ; + inherit (lib.trivial) + flip + id + isBool + isFunction + isString + min + warn + ; + inherit (lib.strings) + optionalString + ; + inherit (lib) + elem + isAttrs + ; +in rec { @@ -616,7 +659,7 @@ rec { fixupOptionType = loc: opt: let options = opt.options or - (throw "Option `${showOption loc'}' has type optionSet but has no option attribute, in ${showFiles opt.declarations}."); + (throw "Option `${showOption loc}' has type optionSet but has no option attribute, in ${showFiles opt.declarations}."); f = tp: let optionSetIn = type: (tp.name == type) && (tp.functor.wrapped.name == "optionSet"); in diff --git a/lib/options.nix b/lib/options.nix index 9e0ea010bda7..97bb2e77176c 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -1,11 +1,15 @@ # Nixpkgs/NixOS option handling. { lib }: -with lib.trivial; -with lib.lists; -with lib.attrsets; -with lib.strings; - +let + inherit (lib) + isAttrs isBool isDerivation isFunction isInt isList isString + all collect concatMap concatLists elemAt filter foldl' head length mapAttrs optionals optional take + ; + inherit (lib.attrsets) optionalAttrs; + inherit (lib.strings) concatMapStrings concatStringsSep; + inherit (lib.types) mkOptionType; +in rec { /* Returns true when the given argument is an option diff --git a/lib/sources.nix b/lib/sources.nix index 776fcc32052b..c7a3a9591528 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -1,16 +1,33 @@ # Functions for copying sources to the Nix store. { lib }: +let + inherit (builtins) + hasContext + match + readDir + readFile + storeDir + tryEval + ; + inherit (lib) + filter + getAttr + isString + pathExists + split + ; +in rec { # Returns the type of a path: regular (for file), symlink, or directory - pathType = p: with builtins; getAttr (baseNameOf p) (readDir (dirOf p)); + pathType = p: getAttr (baseNameOf p) (readDir (dirOf p)); # Returns true if the path exists and is a directory, false otherwise - pathIsDirectory = p: if builtins.pathExists p then (pathType p) == "directory" else false; + pathIsDirectory = p: if pathExists p then (pathType p) == "directory" else false; # Returns true if the path exists and is a regular file, false otherwise - pathIsRegularFile = p: if builtins.pathExists p then (pathType p) == "regular" else false; + pathIsRegularFile = p: if pathExists p then (pathType p) == "regular" else false; # Bring in a path as a source, filtering out all Subversion and CVS # directories, as well as backup files (*~). @@ -19,8 +36,8 @@ rec { (baseName == ".git" || type == "directory" && (baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) || # Filter out editor backup / swap files. lib.hasSuffix "~" baseName || - builtins.match "^\\.sw[a-z]$" baseName != null || - builtins.match "^\\..*\\.sw[a-z]$" baseName != null || + match "^\\.sw[a-z]$" baseName != null || + match "^\\..*\\.sw[a-z]$" baseName != null || # Filter out generates files. lib.hasSuffix ".o" baseName || @@ -89,7 +106,7 @@ rec { in lib.cleanSourceWith { filter = (path: type: let relPath = lib.removePrefix (toString origSrc + "/") (toString path); - in lib.any (re: builtins.match re relPath != null) regexes); + in lib.any (re: match re relPath != null) regexes); inherit src; }; @@ -102,13 +119,12 @@ rec { in type == "directory" || lib.any (ext: lib.hasSuffix ext base) exts; in cleanSourceWith { inherit filter; src = path; }; - pathIsGitRepo = path: (builtins.tryEval (commitIdFromGitRepo path)).success; + pathIsGitRepo = path: (tryEval (commitIdFromGitRepo path)).success; # Get the commit id of a git repo # Example: commitIdFromGitRepo commitIdFromGitRepo = let readCommitFromFile = file: path: - with builtins; let fileName = toString path + "/" + file; packedRefsName = toString path + "/packed-refs"; absolutePath = base: path: @@ -145,11 +161,11 @@ rec { # packed-refs file, so we have to grep through it: then let fileContent = readFile packedRefsName; - matchRef = builtins.match "([a-z0-9]+) ${file}"; - isRef = s: builtins.isString s && (matchRef s) != null; + matchRef = match "([a-z0-9]+) ${file}"; + isRef = s: isString s && (matchRef s) != null; # there is a bug in libstdc++ leading to stackoverflow for long strings: # https://github.com/NixOS/nix/issues/2147#issuecomment-659868795 - refs = builtins.filter isRef (builtins.split "\n" fileContent); + refs = filter isRef (split "\n" fileContent); in if refs == [] then throw ("Could not find " + file + " in " + packedRefsName) else lib.head (matchRef (lib.head refs)) @@ -157,7 +173,7 @@ rec { else throw ("Not a .git directory: " + path); in readCommitFromFile "HEAD"; - pathHasContext = builtins.hasContext or (lib.hasPrefix builtins.storeDir); + pathHasContext = builtins.hasContext or (lib.hasPrefix storeDir); canCleanSource = src: src ? _isLibCleanSourceWith || !(pathHasContext (toString src)); } diff --git a/lib/strings-with-deps.nix b/lib/strings-with-deps.nix index e3336983428f..7b88b018da57 100644 --- a/lib/strings-with-deps.nix +++ b/lib/strings-with-deps.nix @@ -41,10 +41,15 @@ Usage: [1] maybe this behaviour should be removed to keep things simple (?) */ -with lib.lists; -with lib.attrsets; -with lib.strings; - +let + inherit (lib) + concatStringsSep + head + isAttrs + listToAttrs + tail + ; +in rec { /* !!! The interface of this function is kind of messed up, since diff --git a/lib/strings.nix b/lib/strings.nix index d81e46a17631..f62ff6679ef5 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -8,7 +8,29 @@ in rec { - inherit (builtins) stringLength substring head tail isString replaceStrings; + inherit (builtins) + compareVersions + elem + elemAt + filter + fromJSON + head + isInt + isList + isString + match + parseDrvName + readFile + replaceStrings + split + storeDir + stringLength + substring + tail + toJSON + typeOf + unsafeDiscardStringContext + ; /* Concatenate a list of strings. @@ -120,7 +142,7 @@ rec { subDir: # List of base paths paths: - concatStringsSep ":" (map (path: path + "/" + subDir) (builtins.filter (x: x != null) paths)); + concatStringsSep ":" (map (path: path + "/" + subDir) (filter (x: x != null) paths)); /* Construct a Unix-style search path by appending the given `subDir` to the specified `output` of each of the packages. If no @@ -313,7 +335,7 @@ rec { escapeNixString "hello\${}\n" => "\"hello\\\${}\\n\"" */ - escapeNixString = s: escape ["$"] (builtins.toJSON s); + escapeNixString = s: escape ["$"] (toJSON s); /* Turn a string into an exact regular expression @@ -337,7 +359,7 @@ rec { */ escapeNixIdentifier = s: # Regex from https://github.com/NixOS/nix/blob/d048577909e383439c2549e849c5c2f2016c997e/src/libexpr/lexer.l#L91 - if builtins.match "[a-zA-Z_][a-zA-Z0-9_'-]*" s != null + if match "[a-zA-Z_][a-zA-Z0-9_'-]*" s != null then s else escapeNixString s; # Obsolete - use replaceStrings instead. @@ -466,7 +488,7 @@ rec { versionOlder "1.1" "1.1" => false */ - versionOlder = v1: v2: builtins.compareVersions v2 v1 == 1; + versionOlder = v1: v2: compareVersions v2 v1 == 1; /* Return true if string v1 denotes a version equal to or newer than v2. @@ -492,7 +514,7 @@ rec { */ getName = x: let - parse = drv: (builtins.parseDrvName drv).name; + parse = drv: (parseDrvName drv).name; in if isString x then parse x else x.pname or (parse x.name); @@ -509,7 +531,7 @@ rec { */ getVersion = x: let - parse = drv: (builtins.parseDrvName drv).version; + parse = drv: (parseDrvName drv).version; in if isString x then parse x else x.version or (parse x.name); @@ -527,7 +549,7 @@ rec { let components = splitString "/" url; filename = lib.last components; - name = builtins.head (splitString sep filename); + name = head (splitString sep filename); in assert name != filename; name; /* Create an --{enable,disable}- string that can be passed to @@ -617,14 +639,14 @@ rec { */ floatToString = float: let result = toString float; - precise = float == builtins.fromJSON result; + precise = float == fromJSON result; in if precise then result else lib.warn "Imprecise conversion from float to string ${result}" result; /* Check whether a value can be coerced to a string */ isCoercibleToString = x: - builtins.elem (builtins.typeOf x) [ "path" "string" "null" "int" "float" "bool" ] || - (builtins.isList x && lib.all isCoercibleToString x) || + elem (typeOf x) [ "path" "string" "null" "int" "float" "bool" ] || + (isList x && lib.all isCoercibleToString x) || x ? outPath || x ? __toString; @@ -643,8 +665,8 @@ rec { isStorePath = x: if isCoercibleToString x then let str = toString x; in - builtins.substring 0 1 str == "/" - && dirOf str == builtins.storeDir + substring 0 1 str == "/" + && dirOf str == storeDir else false; @@ -662,8 +684,8 @@ rec { */ # Obviously, it is a bit hacky to use fromJSON this way. toInt = str: - let may_be_int = builtins.fromJSON str; in - if builtins.isInt may_be_int + let may_be_int = fromJSON str; in + if isInt may_be_int then may_be_int else throw "Could not convert ${str} to int."; @@ -685,10 +707,10 @@ rec { readPathsFromFile = lib.warn "lib.readPathsFromFile is deprecated, use a list instead" (rootPath: file: let - lines = lib.splitString "\n" (builtins.readFile file); + lines = lib.splitString "\n" (readFile file); removeComments = lib.filter (line: line != "" && !(lib.hasPrefix "#" line)); relativePaths = removeComments lines; - absolutePaths = builtins.map (path: rootPath + "/${path}") relativePaths; + absolutePaths = map (path: rootPath + "/${path}") relativePaths; in absolutePaths); @@ -702,7 +724,7 @@ rec { fileContents ./version => "1.0" */ - fileContents = file: removeSuffix "\n" (builtins.readFile file); + fileContents = file: removeSuffix "\n" (readFile file); /* Creates a valid derivation name from a potentially invalid one. @@ -720,13 +742,13 @@ rec { sanitizeDerivationName = string: lib.pipe string [ # Get rid of string context. This is safe under the assumption that the # resulting string is only used as a derivation name - builtins.unsafeDiscardStringContext + unsafeDiscardStringContext # Strip all leading "." - (x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) + (x: elemAt (match "\\.*(.*)" x) 0) # Split out all invalid characters # https://github.com/NixOS/nix/blob/2.3.2/src/libstore/store-api.cc#L85-L112 # https://github.com/NixOS/nix/blob/2242be83c61788b9c0736a92bb0b5c7bbfc40803/nix-rust/src/store/path.rs#L100-L125 - (builtins.split "[^[:alnum:]+._?=-]+") + (split "[^[:alnum:]+._?=-]+") # Replace invalid character ranges with a "-" (concatMapStrings (s: if lib.isList s then "-" else s)) # Limit to 211 characters (minus 4 chars for ".drv") diff --git a/lib/types.nix b/lib/types.nix index dd287734388a..1144c018b265 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -1,12 +1,62 @@ # Definitions related to run-time type checking. Used in particular # to type-check NixOS configurations. { lib }: -with lib.lists; -with lib.attrsets; -with lib.options; -with lib.trivial; -with lib.strings; + let + inherit (lib) + elem + flip + functionArgs + isAttrs + isBool + isDerivation + isFloat + isFunction + isInt + isList + isString + isStorePath + setFunctionArgs + toDerivation + toList + ; + inherit (lib.lists) + all + concatLists + count + elemAt + filter + foldl' + head + imap1 + last + length + tail + unique + ; + inherit (lib.attrsets) + attrNames + filterAttrs + hasAttr + mapAttrs + optionalAttrs + zipAttrsWith + ; + inherit (lib.options) + getFiles + getValues + mergeDefaultOption + mergeEqualOption + mergeOneOption + showFiles + showOption + ; + inherit (lib.strings) + concatMapStringsSep + concatStringsSep + escapeNixString + isCoercibleToString + ; inherit (lib.modules) mergeDefinitions; outer_types = From c9f8f66248dde642e7a0eea52fe4c32ddb464796 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 22 Oct 2020 13:45:25 +0200 Subject: [PATCH 051/590] lib/options.nix: Use merge-friendly inherit syntax --- lib/options.nix | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/lib/options.nix b/lib/options.nix index 97bb2e77176c..87cd8b797969 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -3,12 +3,37 @@ let inherit (lib) - isAttrs isBool isDerivation isFunction isInt isList isString - all collect concatMap concatLists elemAt filter foldl' head length mapAttrs optionals optional take + all + collect + concatLists + concatMap + elemAt + filter + foldl' + head + isAttrs + isBool + isDerivation + isFunction + isInt + isList + isString + length + mapAttrs + optional + optionals + take + ; + inherit (lib.attrsets) + optionalAttrs + ; + inherit (lib.strings) + concatMapStrings + concatStringsSep + ; + inherit (lib.types) + mkOptionType ; - inherit (lib.attrsets) optionalAttrs; - inherit (lib.strings) concatMapStrings concatStringsSep; - inherit (lib.types) mkOptionType; in rec { From 9a4bed1a809b52626b3fa97095e4d96c67ab429e Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 20 Oct 2020 15:24:59 +0200 Subject: [PATCH 052/590] lib: Add lib.isFloat for consistency Unlike the other three is* functions in lib.trivial, it was only available as lib.trivial.isFloat --- lib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/default.nix b/lib/default.nix index 78566cceae83..956055b70a8f 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -65,7 +65,7 @@ let lessThan listToAttrs pathExists readFile replaceStrings seq stringLength sub substring tail; inherit (self.trivial) id const pipe concat or and bitAnd bitOr bitXor - bitNot boolToString mergeAttrs flip mapNullable inNixShell min max + bitNot boolToString mergeAttrs flip mapNullable inNixShell isFloat min max importJSON importTOML warn info showWarnings nixpkgsVersion version mod compare splitByAndCompare functionArgs setFunctionArgs isFunction toHexString toBaseDigits; inherit (self.fixedPoints) fix fix' converge extends composeExtensions From f8ab5fcd8d15dd551dfc5c6e34f27a1e92d7b1f6 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 20 Oct 2020 16:10:21 +0200 Subject: [PATCH 053/590] lib/modules: Simplify inherits --- lib/modules.nix | 72 ++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 37e2e23ec12d..6c4a8f7b3247 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -1,14 +1,43 @@ { lib }: let - inherit (lib.attrsets) + inherit (lib) + all + any + attrByPath + attrNames + catAttrs + concatLists + concatMap + count + elem + filter + findFirst + flip + foldl + foldl' + getAttrFromPath + head + id + imap1 + isAttrs + isBool + isFunction + isString + length + mapAttrs + mapAttrsToList mapAttrsRecursiveCond - ; - inherit (lib.lists) - any all concatLists concatMap - count filter findFirst foldl foldl' - head imap1 length optional + min + optional + optionalAttrs + optionalString + recursiveUpdate reverseList sort + setAttrByPath + toList + types + warn ; inherit (lib.options) isOption @@ -18,37 +47,6 @@ let showOption unknownModule ; - inherit (lib.attrsets) - attrByPath - attrNames - catAttrs - getAttrFromPath - mapAttrs - mapAttrsToList - optionalAttrs - recursiveUpdate - setAttrByPath - toList - ; - inherit (lib.types) - types - ; - inherit (lib.trivial) - flip - id - isBool - isFunction - isString - min - warn - ; - inherit (lib.strings) - optionalString - ; - inherit (lib) - elem - isAttrs - ; in rec { From fe4a58eec078489878a3b64aceeaed5118f18f39 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 20 Oct 2020 16:34:15 +0200 Subject: [PATCH 054/590] lib: Add lib.trace for consistency This puts it among the trace* family of functions derived from it. --- lib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/default.nix b/lib/default.nix index 956055b70a8f..d2239d26eadf 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -63,7 +63,7 @@ let deepSeq elem elemAt filter genericClosure genList getAttr hasAttr head isAttrs isBool isInt isList isString length lessThan listToAttrs pathExists readFile replaceStrings seq - stringLength sub substring tail; + stringLength sub substring tail trace; inherit (self.trivial) id const pipe concat or and bitAnd bitOr bitXor bitNot boolToString mergeAttrs flip mapNullable inNixShell isFloat min max importJSON importTOML warn info showWarnings nixpkgsVersion version mod compare From a4019a40b310912a5ba91c15cf5aa4a6a4a9376f Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 22 Oct 2020 13:57:23 +0200 Subject: [PATCH 055/590] lib/sources.nix: Prefer lib for readFile inherit --- lib/sources.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/sources.nix b/lib/sources.nix index c7a3a9591528..702a0ef88921 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -6,7 +6,6 @@ let hasContext match readDir - readFile storeDir tryEval ; @@ -15,6 +14,7 @@ let getAttr isString pathExists + readFile split ; in From 89d134b3fdcbc4412f5d7cc4e391747b3f578b32 Mon Sep 17 00:00:00 2001 From: Lucas Savva Date: Thu, 22 Oct 2020 14:04:31 +0100 Subject: [PATCH 056/590] nixos/acme: Use more secure chmods Previous settings would make files executable in the certs directories. --- nixos/modules/security/acme.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 5732620f2908..47f6bead7c3e 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -63,7 +63,7 @@ let script = with builtins; concatStringsSep "\n" (mapAttrsToList (cert: data: '' for fixpath in /var/lib/acme/${escapeShellArg cert} /var/lib/acme/.lego/${escapeShellArg cert}; do if [ -d "$fixpath" ]; then - chmod -R 750 "$fixpath" + chmod -R u=rwX,g=rX,o= "$fixpath" chown -R acme:${data.group} "$fixpath" fi done @@ -271,7 +271,7 @@ let mv domainhash.txt certificates/ chmod 640 certificates/* - chmod -R 700 accounts/* + chmod -R u=rwX,g=,o= accounts/* # Group might change between runs, re-apply it chown 'acme:${data.group}' certificates/* From dad06fb922cbfcd00bae255d3fec9d70138e419b Mon Sep 17 00:00:00 2001 From: Lucas Savva Date: Thu, 22 Oct 2020 14:06:19 +0100 Subject: [PATCH 057/590] nixos/tests/acme: Hard code test certificates The added README.md explains why this has been done. --- nixos/tests/common/acme/server/README.md | 21 ++++++++++++ .../common/acme/server/acme.test.cert.pem | 19 +++++++++++ .../common/acme/server/acme.test.key.pem | 27 ++++++++++++++++ nixos/tests/common/acme/server/ca.cert.pem | 20 ++++++++++++ nixos/tests/common/acme/server/ca.key.pem | 27 ++++++++++++++++ nixos/tests/common/acme/server/default.nix | 5 +-- .../common/acme/server/generate-certs.nix | 29 +++++++++++++++++ .../common/acme/server/snakeoil-certs.nix | 32 +++---------------- 8 files changed, 148 insertions(+), 32 deletions(-) create mode 100644 nixos/tests/common/acme/server/README.md create mode 100644 nixos/tests/common/acme/server/acme.test.cert.pem create mode 100644 nixos/tests/common/acme/server/acme.test.key.pem create mode 100644 nixos/tests/common/acme/server/ca.cert.pem create mode 100644 nixos/tests/common/acme/server/ca.key.pem create mode 100644 nixos/tests/common/acme/server/generate-certs.nix diff --git a/nixos/tests/common/acme/server/README.md b/nixos/tests/common/acme/server/README.md new file mode 100644 index 000000000000..9de2b2c71029 --- /dev/null +++ b/nixos/tests/common/acme/server/README.md @@ -0,0 +1,21 @@ +# Fake Certificate Authority for ACME testing + +This will set up a test node running [pebble](https://github.com/letsencrypt/pebble) +to serve ACME certificate requests. + +## "Snake oil" certs + +The snake oil certs are hard coded into the repo for reasons explained [here](https://github.com/NixOS/nixpkgs/pull/91121#discussion_r505410235). +The root of the issue is that Nix will hash the derivation based on the arguments +to mkDerivation, not the output. [Minica](https://github.com/jsha/minica) will +always generate a random certificate even if the arguments are unchanged. As a +result, it's possible to end up in a situation where the cached and local +generated certs mismatch and cause issues with testing. + +To generate new certificates, run the following commands: + +```bash +nix-build generate-certs.nix +cp result/* . +rm result +``` diff --git a/nixos/tests/common/acme/server/acme.test.cert.pem b/nixos/tests/common/acme/server/acme.test.cert.pem new file mode 100644 index 000000000000..76b0d916a817 --- /dev/null +++ b/nixos/tests/common/acme/server/acme.test.cert.pem @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDLDCCAhSgAwIBAgIIRDAN3FHH//IwDQYJKoZIhvcNAQELBQAwIDEeMBwGA1UE +AxMVbWluaWNhIHJvb3QgY2EgNzg3NDZmMB4XDTIwMTAyMTEzMjgzNloXDTIyMTEy +MDEzMjgzNlowFDESMBAGA1UEAxMJYWNtZS50ZXN0MIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEAo8XjMVUaljcaqQ5MFhfPuQgSwdyXEUbpSHz+5yPkE0h9 +Z4Xu5BJF1Oq7h5ggCtadVsIspiY6Jm6aWDOjlh4myzW5UNBNUG3OPEk50vmmHFeH +pImHO/d8yb33QoF9VRcTZs4tuJYg7l9bSs4jNG72vYvv2YiGAcmjJcsmAZIfniCN +Xf/LjIm+Cxykn+Vo3UuzO1w5/iuofdgWO/aZxMezmXUivlL3ih4cNzCJei8WlB/l +EnHrkcy3ogRmmynP5zcz7vmGIJX2ji6dhCa4Got5B7eZK76o2QglhQXqPatG0AOY +H+RfQfzKemqPG5om9MgJtwFtTOU1LoaiBw//jXKESQIDAQABo3YwdDAOBgNVHQ8B +Af8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB +/wQCMAAwHwYDVR0jBBgwFoAU+8IZlLV/Qp5CXqpXMLvtxWlxcJwwFAYDVR0RBA0w +C4IJYWNtZS50ZXN0MA0GCSqGSIb3DQEBCwUAA4IBAQB0pe8I5/VDkB5VMgQB2GJV +GKzyigfWbVez9uLmqMj9PPP/zzYKSYeq+91aMuOZrnH7NqBxSTwanULkmqAmhbJJ +YkXw+FlFekf9FyxcuArzwzzNZDSGcjcdXpN8S2K1qkBd00iSJF9kU7pdZYCIKR20 +QirdBrELEfsJ3GU62a6N3a2YsrisZUvq5TbjGJDcytAtt+WG3gmV7RInLdFfPwbw +bEHPCnx0uiV0nxLjd/aVT+RceVrFQVt4hR99jLoMlBitSKluZ1ljsrpIyroBhQT0 +pp/pVi6HJdijG0fsPrC325NEGAwcpotLUhczoeM/rffKJd54wLhDkfYxOyRZXivs +-----END CERTIFICATE----- diff --git a/nixos/tests/common/acme/server/acme.test.key.pem b/nixos/tests/common/acme/server/acme.test.key.pem new file mode 100644 index 000000000000..741df99a372e --- /dev/null +++ b/nixos/tests/common/acme/server/acme.test.key.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEowIBAAKCAQEAo8XjMVUaljcaqQ5MFhfPuQgSwdyXEUbpSHz+5yPkE0h9Z4Xu +5BJF1Oq7h5ggCtadVsIspiY6Jm6aWDOjlh4myzW5UNBNUG3OPEk50vmmHFeHpImH +O/d8yb33QoF9VRcTZs4tuJYg7l9bSs4jNG72vYvv2YiGAcmjJcsmAZIfniCNXf/L +jIm+Cxykn+Vo3UuzO1w5/iuofdgWO/aZxMezmXUivlL3ih4cNzCJei8WlB/lEnHr +kcy3ogRmmynP5zcz7vmGIJX2ji6dhCa4Got5B7eZK76o2QglhQXqPatG0AOYH+Rf +QfzKemqPG5om9MgJtwFtTOU1LoaiBw//jXKESQIDAQABAoIBADox/2FwVFo8ioS4 +R+Ex5OZjMAcjU6sX/516jTmlT05q2+UFerYgqB/YqXqtW/V9/brulN8VhmRRuRbO +grq9TBu5o3hMDK0f18EkZB/MBnLbx594H033y6gEkPBZAyhRYtuNOEH3VwxdZhtW +1Lu1EoiYSUqLcNMBy6+KWJ8GRaXyacMYBlj2lMHmyzkA/t1+2mwTGC3lT6zN0F5Y +E5umXOxsn6Tb6q3KM9O5IvtmMMKpgj4HIHZLZ6j40nNgHwGRaAv4Sha/vx0DeBw3 +6VlNiTTPdShEkhESlM5/ocqTfI92VHJpM5gkqTYOWBi2aKIPfAopXoqoJdWl4pQ/ +NCFIu2ECgYEAzntNKIcQtf0ewe0/POo07SIFirvz6jVtYNMTzeQfL6CoEjYArJeu +Vzc4wEQfA4ZFVerBb1/O6M449gI3zex1PH4AX0h8q8DSjrppK1Jt2TnpVh97k7Gg +Tnat/M/yW3lWYkcMVJJ3AYurXLFTT1dYP0HvBwZN04yInrEcPNXKfmcCgYEAywyJ +51d4AE94PrANathKqSI/gk8sP+L1gzylZCcUEAiGk/1r45iYB4HN2gvWbS+CvSdp +F7ShlDWrTaNh2Bm1dgTjc4pWb4J+CPy/KN2sgLwIuM4+ZWIZmEDcio6khrM/gNqK +aR7xUsvWsqU26O84woY/xR8IHjSNF7cFWE1H2c8CgYEAt6SSi2kVQ8dMg84uYE8t +o3qO00U3OycpkOQqyQQLeKC62veMwfRl6swCfX4Y11mkcTXJtPTRYd2Ia8StPUkB +PDwUuKoPt/JXUvoYb59wc7M+BIsbrdBdc2u6cw+/zfutCNuH6/AYSBeg4WAVaIuW +wSwzG1xP+8cR+5IqOzEqWCECgYATweeVTCyQEyuHJghYMi2poXx+iIesu7/aAkex +pB/Oo5W8xrb90XZRnK7UHbzCqRHWqAQQ23Gxgztk9ZXqui2vCzC6qGZauV7cLwPG +zTMg36sVmHP314DYEM+k59ZYiQ6P0jQPoIQo407D2VGrfsOOIhQIcUmP7tsfyJ5L +hlGMfwKBgGq4VNnnuX8I5kl03NpaKfG+M8jEHmVwtI9RkPTCCX9bMjeG0cDxqPTF +TRkf3r8UWQTZ5QfAfAXYAOlZvmGhHjSembRbXMrMdi3rGsYRSrQL6n5NHnORUaMy +FCWo4gyAnniry7tx9dVNgmHmbjEHuQnf8AC1r3dibRCjvJWUiQ8H +-----END RSA PRIVATE KEY----- diff --git a/nixos/tests/common/acme/server/ca.cert.pem b/nixos/tests/common/acme/server/ca.cert.pem new file mode 100644 index 000000000000..5c33e879b675 --- /dev/null +++ b/nixos/tests/common/acme/server/ca.cert.pem @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIDSzCCAjOgAwIBAgIIeHRvRrNvbGQwDQYJKoZIhvcNAQELBQAwIDEeMBwGA1UE +AxMVbWluaWNhIHJvb3QgY2EgNzg3NDZmMCAXDTIwMTAyMTEzMjgzNloYDzIxMjAx +MDIxMTMyODM2WjAgMR4wHAYDVQQDExVtaW5pY2Egcm9vdCBjYSA3ODc0NmYwggEi +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrNTzVLDJOKtGYGLU98EEcLKps +tXHCLC6G54LKbEcU80fn+ArX8qsPSHyhdXQkcYjq6Vh/EDJ1TctyRSnvAjwyG4Aa +1Zy1QFc/JnjMjvzimCkUc9lQ+wkLwHSM/KGwR1cGjmtQ/EMClZTA0NwulJsXMKVz +bd5asXbq/yJTQ5Ww25HtdNjwRQXTvB7r3IKcY+DsED9CvFvC9oG/ZhtZqZuyyRdC +kFUrrv8WNUDkWSN+lMR6xMx8v0583IN6f11IhX0b+svK98G81B2eswBdkzvVyv9M +unZBO0JuJG8sdM502KhWLmzBC1ZbvgUBF9BumDRpMFH4DCj7+qQ2taWeGyc7AgMB +AAGjgYYwgYMwDgYDVR0PAQH/BAQDAgKEMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr +BgEFBQcDAjASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBT7whmUtX9CnkJe +qlcwu+3FaXFwnDAfBgNVHSMEGDAWgBT7whmUtX9CnkJeqlcwu+3FaXFwnDANBgkq +hkiG9w0BAQsFAAOCAQEARMe1wKmF33GjEoLLw0oDDS4EdAv26BzCwtrlljsEtwQN +95oSzUNd6o4Js7WCG2o543OX6cxzM+yju8TES3+vJKDgsbNMU0bWCv//tdrb0/G8 +OkU3Kfi5q4fOauZ1pqGv/pXdfYhZ5ieB/zwis3ykANe5JfB0XqwCb1Vd0C3UCIS2 +NPKngRwNSzphIsbzfvxGDkdM1enuGl5CVyDhrwTMqGaJGDSOv6U5jKFxKRvigqTN +Ls9lPmT5NXYETduWLBR3yUIdH6kZXrcozZ02B9vjOB2Cv4RMDc+9eM30CLIWpf1I +097e7JkhzxFhfC/bMMt3P1FeQc+fwH91wdBmNi7tQw== +-----END CERTIFICATE----- diff --git a/nixos/tests/common/acme/server/ca.key.pem b/nixos/tests/common/acme/server/ca.key.pem new file mode 100644 index 000000000000..ed46f5dccf46 --- /dev/null +++ b/nixos/tests/common/acme/server/ca.key.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEowIBAAKCAQEAqzU81SwyTirRmBi1PfBBHCyqbLVxwiwuhueCymxHFPNH5/gK +1/KrD0h8oXV0JHGI6ulYfxAydU3LckUp7wI8MhuAGtWctUBXPyZ4zI784pgpFHPZ +UPsJC8B0jPyhsEdXBo5rUPxDApWUwNDcLpSbFzClc23eWrF26v8iU0OVsNuR7XTY +8EUF07we69yCnGPg7BA/QrxbwvaBv2YbWambsskXQpBVK67/FjVA5FkjfpTEesTM +fL9OfNyDen9dSIV9G/rLyvfBvNQdnrMAXZM71cr/TLp2QTtCbiRvLHTOdNioVi5s +wQtWW74FARfQbpg0aTBR+Awo+/qkNrWlnhsnOwIDAQABAoIBAA3ykVkgd5ysmlSU +trcsCnHcJaojgff6l3PACoSpG4VWaGY6a8+54julgRm6MtMBONFCX0ZCsImj484U +Wl0xRmwil2YYPuL5MeJgJPktMObY1IfpBCw3tz3w2M3fiuCMf0d2dMGtO1xLiUnH ++hgFXTkfamsj6ThkOrbcQBSebeRxbKM5hqyCaQoieV+0IJnyxUVq/apib8N50VsH +SHd4oqLUuEZgg6N70+l5DpzedJUb4nrwS/KhUHUBgnoPItYBCiGPmrwLk7fUhPs6 +kTDqJDtc/xW/JbjmzhWEpVvtumcC/OEKULss7HLdeQqwVBrRQkznb0M9AnSra3d0 +X11/Y4ECgYEA3FC8SquLPFb2lHK4+YbJ4Ac6QVWeYFEHiZ0Rj+CmONmjcAvOGLPE +SblRLm3Nbrkxbm8FF6/AfXa/rviAKEVPs5xqGfSDw/3n1uInPcmShiBCLwM/jHH5 +NeVG+R5mTg5zyQ/pQMLWRcs+Ail+ZAnZuoGpW3Cdc8OtCUYFQ7XB6nsCgYEAxvBJ +zFxcTtsDzWbMWXejugQiUqJcEbKWwEfkRbf3J2rAVO2+EFr7LxdRfN2VwPiTQcWc +LnN2QN+ouOjqBMTh3qm5oQY+TLLHy86k9g1k0gXWkMRQgP2ZdfWH1HyrwjLUgLe1 +VezFN7N1azgy6xFkInAAvuA4loxElZNvkGBgekECgYA/Xw26ILvNIGqO6qzgQXAh ++5I7JsiGheg4IjDiBMlrQtbrLMoceuD0H9UFGNplhel9DXwWgxxIOncKejpK2x0A +2fX+/0FDh+4+9hA5ipiV8gN3iGSoHkSDxy5yC9d7jlapt+TtFt4Rd1OfxZWwatDw +/8jaH3t6yAcmyrhK8KYVrwKBgAE5KwsBqmOlvyE9N5Z5QN189wUREIXfVkP6bTHs +jq2EX4hmKdwJ4y+H8i1VY31bSfSGlY5HkXuWpH/2lrHO0CDBZG3UDwADvWzIaYVF +0c/kz0v2mRQh+xaZmus4lQnNrDbaalgL666LAPbW0qFVaws3KxoBYPe0BxvwWyhF +H3LBAoGBAKRRNsq2pWQ8Gqxc0rVoH0FlexU9U2ci3lsLmgEB0A/o/kQkSyAxaRM+ +VdKp3sWfO8o8lX5CVQslCNBSjDTNcat3Co4NEBLg6Xv1yKN/WN1GhusnchP9szsP +oU47gC89QhUyWSd6vvr2z2NG9C3cACxe4dhDSHQcE4nHSldzCKv2 +-----END RSA PRIVATE KEY----- diff --git a/nixos/tests/common/acme/server/default.nix b/nixos/tests/common/acme/server/default.nix index cea10c16900d..1c3bfdf76b7e 100644 --- a/nixos/tests/common/acme/server/default.nix +++ b/nixos/tests/common/acme/server/default.nix @@ -51,10 +51,7 @@ # that it has to be started _before_ the ACME service. { config, pkgs, lib, ... }: let - testCerts = import ./snakeoil-certs.nix { - minica = pkgs.minica; - mkDerivation = pkgs.stdenv.mkDerivation; - }; + testCerts = import ./snakeoil-certs.nix; domain = testCerts.domain; resolver = let diff --git a/nixos/tests/common/acme/server/generate-certs.nix b/nixos/tests/common/acme/server/generate-certs.nix new file mode 100644 index 000000000000..cd8fe0dffca1 --- /dev/null +++ b/nixos/tests/common/acme/server/generate-certs.nix @@ -0,0 +1,29 @@ +# Minica can provide a CA key and cert, plus a key +# and cert for our fake CA server's Web Front End (WFE). +{ + pkgs ? import {}, + minica ? pkgs.minica, + mkDerivation ? pkgs.stdenv.mkDerivation +}: +let + conf = import ./snakeoil-certs.nix; + domain = conf.domain; +in mkDerivation { + name = "test-certs"; + buildInputs = [ minica ]; + phases = [ "buildPhase" "installPhase" ]; + + buildPhase = '' + minica \ + --ca-key ca.key.pem \ + --ca-cert ca.cert.pem \ + --domains ${domain} + ''; + + installPhase = '' + mkdir -p $out + mv ca.*.pem $out/ + mv ${domain}/key.pem $out/${domain}.key.pem + mv ${domain}/cert.pem $out/${domain}.cert.pem + ''; +} diff --git a/nixos/tests/common/acme/server/snakeoil-certs.nix b/nixos/tests/common/acme/server/snakeoil-certs.nix index 4b6a38b8fa30..11c3f7fc9290 100644 --- a/nixos/tests/common/acme/server/snakeoil-certs.nix +++ b/nixos/tests/common/acme/server/snakeoil-certs.nix @@ -1,37 +1,13 @@ -# Minica can provide a CA key and cert, plus a key -# and cert for our fake CA server's Web Front End (WFE). -{ minica, mkDerivation }: let domain = "acme.test"; - - selfSignedCertData = mkDerivation { - name = "test-certs"; - buildInputs = [ minica ]; - phases = [ "buildPhase" "installPhase" ]; - - buildPhase = '' - mkdir ca - minica \ - --ca-key ca/key.pem \ - --ca-cert ca/cert.pem \ - --domains ${domain} - chmod 600 ca/* - chmod 640 ${domain}/*.pem - ''; - - installPhase = '' - mkdir -p $out - mv ${domain} ca $out/ - ''; - }; in { inherit domain; ca = { - cert = "${selfSignedCertData}/ca/cert.pem"; - key = "${selfSignedCertData}/ca/key.pem"; + cert = ./ca.cert.pem; + key = ./ca.key.pem; }; "${domain}" = { - cert = "${selfSignedCertData}/${domain}/cert.pem"; - key = "${selfSignedCertData}/${domain}/key.pem"; + cert = ./. + "/${domain}.cert.pem"; + key = ./. + "/${domain}.key.pem"; }; } From 6e0f7d5bcf54e0bd63533a60df11236c836c30f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Thu, 22 Oct 2020 17:58:21 +0200 Subject: [PATCH 058/590] cinnamon.cinnamon-settings-daemon: fix csd-backlight-helper build, fixes #101128 --- pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix index 418107673a35..4788af897312 100644 --- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix @@ -28,6 +28,7 @@ , fontconfig , tzdata , nss +, libgudev }: stdenv.mkDerivation rec { @@ -83,6 +84,7 @@ stdenv.mkDerivation rec { xorg.libXfixes fontconfig nss + libgudev ]; nativeBuildInputs = [ From f7cf7ed51dc7d9c72ed50c416a3b2945e37fb543 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Thu, 22 Oct 2020 10:59:46 -0700 Subject: [PATCH 059/590] terraform-providers.time: init at 0.6.0 --- .../networking/cluster/terraform-providers/providers.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c49f4cd2b1ba..ecbf0b5ea223 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -934,6 +934,14 @@ "sha256": "1cl83afm00fflsd3skynjvncid3r74fkxfznrs1v8qypcg1j79g1", "version": "0.18.0" }, + "time": { + "owner": "hashicorp", + "provider-source-address": "registry.terraform.io/hashicorp/time", + "repo": "terraform-provider-time", + "rev": "v0.6.0", + "sha256": "0fb81hisjicib9rzbn51jqfrchyjd3hzq98adnf22cbra8wlnxlm", + "version": "0.6.0" + }, "tls": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/tls", From c57affcc3ff20e48297b3a6779cdbadabcb488d7 Mon Sep 17 00:00:00 2001 From: Nora Puchreiner <71534864+nora-puchreiner@users.noreply.github.com> Date: Fri, 23 Oct 2020 02:13:07 +0000 Subject: [PATCH 060/590] graalvm8-ee, graalvm11-ee: 20.0.0 -> 20.2.1 --- .../compilers/graalvm/enterprise-edition.nix | 36 +++++++++++-------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/pkgs/development/compilers/graalvm/enterprise-edition.nix b/pkgs/development/compilers/graalvm/enterprise-edition.nix index 89896c556efa..690bfdb425cf 100644 --- a/pkgs/development/compilers/graalvm/enterprise-edition.nix +++ b/pkgs/development/compilers/graalvm/enterprise-edition.nix @@ -1,44 +1,51 @@ -{ stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg_3, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }: +{ stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }: let common = javaVersion: let graalvmXXX-ee = stdenv.mkDerivation rec { pname = "graalvm${javaVersion}-ee"; - version = "20.0.0"; + version = "20.2.1"; srcs = [ (requireFile { name = "graalvm-ee-java${javaVersion}-linux-amd64-${version}.tar.gz"; - sha256 = { "8" = "2df9b31b96f7a24b6a2fe3ecea0b5e819d5d058fde6320016dba1787ce59e99e"; - "11" = "b704fd27b5993584a1ad659b41f42ff0ae8893c066b64a6f6a1719fbee382536"; + sha256 = { "8" = "e0bb182146283a43824dd2c2ceeb89b6ff7a93f9a85da889f8663ce1c2bd3002"; + "11" = "e5d92d361e7859fe5f88c92d7bb466e285e07f1e4e2d9944948f85fa0e3aee2b"; }.${javaVersion}; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; }) (requireFile { name = "native-image-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; - sha256 = { "8" = "a9f3f86d880d133bd24ad3b1d95129a96e80ea1d8fbc865d09e9410b921e6897"; - "11" = "57086123a95f1e9d4e67b92f830bad9325431908c69a40ef10f28ed586d8bd35"; + sha256 = { "8" = "37ac6a62f68adad513057a60513ba75749adf98cc73999b3918afe159900428d"; + "11" = "f62df715ad529f8b84854644ac99e0a9a349232c7f03985d20a2a8be20edaa44"; + }.${javaVersion}; + url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; + }) + (requireFile { + name = "llvm-toolchain-installable-java${javaVersion}-linux-amd64-${version}.jar"; + sha256 = { "8" = "da98a8c17b0c724b41d1596b57e282a1ecfcbf9140404dfb04b0d4d9fb159d8a"; + "11" = "fc442c396e92f59d034a69175104cb3565c3d128426bd939cc94c6ceccbb720f"; }.${javaVersion}; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; }) (requireFile { name = "ruby-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; - sha256 = { "8" = "28b2910736f41070c84b97f1b1a3c5fa43ebdcd926ec92c8f145550b5b975b3c"; - "11" = "27ff1befa67fe5cc9eb0216b6b1105876f44d13eff6137f36f29f13377ea687b"; + sha256 = { "8" = "44f6887249f2eb54cba98dd4d9de019da5463d92982e03bf655fffe4bb520daf"; + "11" = "941f3752ccb097958f49250586f04c305092ded3ea4c1b7d9a0f7632e47fa335"; }.${javaVersion}; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; }) (requireFile { name = "python-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; - sha256 = { "8" = "9c83bcd71e316805c2914c9002ce348ae44829606adc2375d9188b1eaaaf82f9"; - "11" = "5ca51478bcb5ea5bd9be35856dd7fb2ef03b888cd1b7284a8c15531979025fb4"; + sha256 = { "8" = "5c3993c701bd09c6064dcf4a6d9c7489620d0654b03c74682398c788c0211c09"; + "11" = "de3ebf35ce47dc399d7976cbd09fde0e85f2c10f85bc3fe8f32bb9e2b500ab70"; }.${javaVersion}; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; }) (requireFile { name = "wasm-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; - sha256 = { "8" = "e8bd14d3f9bf652104e4346e0899a0351afaecae030a9c0ce0f91b1f93d9e660"; - "11" = "d24eeb84625bb7a5e330b897fd6dde7fc579a687997b64625199c33fa83c40b4"; + sha256 = { "8" = "c0a334b271fd32c098bb3c42eada7eafb9f536becaa756097eebe4682915b067"; + "11" = "9e801071992a0ff976bc40b640a8b9368fd8ea890ba986543658fcbaa3a7fd68"; }.${javaVersion}; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; }) @@ -47,7 +54,7 @@ let unpackPhase = '' unpack_jar() { jar=$1 - unzip $jar -d $out + unzip -o $jar -d $out perl -ne 'use File::Path qw(make_path); use File::Basename qw(dirname); if (/^(.+) = (.+)$/) { @@ -70,6 +77,7 @@ let unpack_jar ''${arr[2]} unpack_jar ''${arr[3]} unpack_jar ''${arr[4]} + unpack_jar ''${arr[5]} ''; installPhase = { @@ -117,7 +125,7 @@ let }.${javaVersion} }:${ stdenv.lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender - glib zlib bzip2 alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg_3 libGL ]}" + glib zlib bzip2 alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg libGL ]}" for f in $(find $out -type f -perm -0100); do patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true From a2472ebfb18d5857c07bb92dfb1c44f03fc4b44e Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 22 Oct 2020 23:07:10 +0300 Subject: [PATCH 061/590] geogebra: 5-0-593-0 -> 5-0-609-0, geogebra6: 6-0-600-0 -> 6-0-609-0 --- .../science/math/geogebra/default.nix | 92 ++++++++++------ .../science/math/geogebra/geogebra6.nix | 100 +++++++++++------- 2 files changed, 121 insertions(+), 71 deletions(-) diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index 5cebef83a4a9..a6950ad3451c 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -1,18 +1,7 @@ -{ stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, language ? "en_US" }: - -stdenv.mkDerivation rec { +{ stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }: +let pname = "geogebra"; - version = "5-0-593-0"; - - preferLocalBuild = true; - - src = fetchurl { - urls = [ - "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" - "http://web.archive.org/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" - ]; - sha256 = "d84c27a3299e6df08881733d22215a18decedcba4c2d97a9e5424c39cd57db35"; - }; + version = "5-0-609-0"; srcIcon = fetchurl { url = "http://static.geogebra.org/images/geogebra-logo.svg"; @@ -30,23 +19,6 @@ stdenv.mkDerivation rec { mimeType = "application/vnd.geogebra.file;application/vnd.geogebra.tool;"; }; - buildInputs = [ makeWrapper ]; - - installPhase = '' - install -D geogebra/* -t "$out/libexec/geogebra/" - - makeWrapper "$out/libexec/geogebra/geogebra" "$out/bin/geogebra" \ - --set JAVACMD "${jre}/bin/java" \ - --set GG_PATH "$out/libexec/geogebra" \ - --add-flags "--language=${language}" - - install -Dm644 "${desktopItem}/share/applications/"* \ - -t $out/share/applications/ - - install -Dm644 "${srcIcon}" \ - "$out/share/icons/hicolor/scalable/apps/geogebra.svg" - ''; - meta = with stdenv.lib; { description = "Dynamic mathematics software with graphics, algebra and spreadsheets"; longDescription = '' @@ -57,7 +29,61 @@ stdenv.mkDerivation rec { homepage = "https://www.geogebra.org/"; maintainers = with maintainers; [ ma27 ]; license = with licenses; [ gpl3 cc-by-nc-sa-30 geogebra ]; - platforms = platforms.all; + platforms = with platforms; linux ++ darwin; hydraPlatforms = []; }; -} + + linuxPkg = stdenv.mkDerivation { + inherit pname version meta srcIcon desktopItem; + + preferLocalBuild = true; + + src = fetchurl { + urls = [ + "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" + "http://web.archive.org/web/20201022200454/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" + ]; + sha256 = "0xbhg8hm3dqm3qkraj48pqwslrnjyxpq9mcgylr2m8i1gmqw7xwf"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + install -D geogebra/* -t "$out/libexec/geogebra/" + + makeWrapper "$out/libexec/geogebra/geogebra" "$out/bin/geogebra" \ + --set JAVACMD "${jre}/bin/java" \ + --set GG_PATH "$out/libexec/geogebra" \ + --add-flags "--language=${language}" + + install -Dm644 "${desktopItem}/share/applications/"* \ + -t $out/share/applications/ + + install -Dm644 "${srcIcon}" \ + "$out/share/icons/hicolor/scalable/apps/geogebra.svg" + ''; + }; + + darwinPkg = stdenv.mkDerivation { + inherit pname version meta; + + preferLocalBuild = true; + + src = fetchurl { + url = "https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip"; + sha256 = "16fgqwxz31cfmia0pyzpk05aqzrqr11sjbw37q9zb3xfh3p1r4gz"; + }; + + dontUnpack = true; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + install -dm755 $out/Applications + unzip $src -d $out/Applications + ''; + }; +in +if stdenv.isDarwin +then darwinPkg +else linuxPkg diff --git a/pkgs/applications/science/math/geogebra/geogebra6.nix b/pkgs/applications/science/math/geogebra/geogebra6.nix index 65caff82ead1..7bd582648937 100644 --- a/pkgs/applications/science/math/geogebra/geogebra6.nix +++ b/pkgs/applications/science/math/geogebra/geogebra6.nix @@ -1,46 +1,70 @@ { stdenv, unzip, fetchurl, electron_6, makeWrapper, geogebra }: -stdenv.mkDerivation rec{ - - name = "geogebra-${version}"; - version = "6-0-600-0"; - - src = fetchurl { - urls = [ - "https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" - "https://web.archive.org/web/20200904093945/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" - ]; - sha256 = "1l49rvfkil2cz6r7sa2mi0p6hvb6p66jv3x6xj8hjqls4l3sfhkm"; - }; - - dontConfigure = true; - dontBuild = true; - - nativeBuildInputs = [ - unzip - makeWrapper - ]; - - unpackPhase = '' - unzip $src - ''; - - installPhase = '' - mkdir -p $out/libexec/geogebra/ $out/bin - cp -r GeoGebra-linux-x64/{resources,locales} "$out/" - makeWrapper ${stdenv.lib.getBin electron_6}/bin/electron $out/bin/geogebra --add-flags "$out/resources/app" - install -Dm644 "${desktopItem}/share/applications/"* \ - -t $out/share/applications/ - - install -Dm644 "${srcIcon}" \ - "$out/share/icons/hicolor/scalable/apps/geogebra.svg" - ''; +let + pname = "geogebra"; + version = "6-0-609-0"; srcIcon = geogebra.srcIcon; - desktopItem = geogebra.desktopItem; + meta = with stdenv.lib; geogebra.meta // { license = licenses.geogebra; maintainers = with maintainers; [ voidless ]; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; }; -} + + linuxPkg = stdenv.mkDerivation { + inherit pname version meta; + + src = fetchurl { + urls = [ + "https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" + "https://web.archive.org/web/20201022200156/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" + ]; + sha256 = "0rzcbq587x8827g9v03awa9hz27vyfjc0cz45ymbchqp31lsx49b"; + }; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ + unzip + makeWrapper + ]; + + unpackPhase = '' + unzip $src + ''; + + installPhase = '' + mkdir -p $out/libexec/geogebra/ $out/bin + cp -r GeoGebra-linux-x64/{resources,locales} "$out/" + makeWrapper ${stdenv.lib.getBin electron_6}/bin/electron $out/bin/geogebra --add-flags "$out/resources/app" + install -Dm644 "${desktopItem}/share/applications/"* \ + -t $out/share/applications/ + + install -Dm644 "${srcIcon}" \ + "$out/share/icons/hicolor/scalable/apps/geogebra.svg" + ''; + }; + + darwinPkg = stdenv.mkDerivation { + inherit pname version meta; + + src = fetchurl { + url = "https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"; + sha256 = "0275869zgwbl1qjj593q6629hnxbwk9c15rkm29a3lh10pinb099"; + }; + + dontUnpack = true; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + install -dm755 $out/Applications + unzip $src -d $out/Applications + ''; + }; +in +if stdenv.isDarwin +then darwinPkg +else linuxPkg From e416dc89a1e07b694f4be2550df0486835317da6 Mon Sep 17 00:00:00 2001 From: Magicloud <1886157+Magicloud@users.noreply.github.com> Date: Sat, 24 Oct 2020 02:53:08 +0800 Subject: [PATCH 062/590] virtualbox: 6.1.14 -> 6.1.16 6.1.16 is the latest release of Virtualbox. And it is necessary to have it when using Linux 5.9 kernel. --- pkgs/applications/virtualization/virtualbox/default.nix | 7 +++---- pkgs/applications/virtualization/virtualbox/extpack.nix | 2 +- .../virtualization/virtualbox/guest-additions/default.nix | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index c320eca0bbee..e80edf72677a 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -23,8 +23,7 @@ let buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. - version = "6.1.14"; - tarballVersion = "${version}a"; + version = "6.1.16"; iasl' = iasl.overrideAttrs (old: rec { inherit (old) pname; @@ -40,8 +39,8 @@ in stdenv.mkDerivation { inherit version; src = fetchurl { - url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${tarballVersion}.tar.bz2"; - sha256 = "16f3cb83ab3c4dacf2a9d3cc638cbd18db23767828bba6b8ba1c1b57abeb6aef"; + url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; + sha256 = "49c1990da16d8a3d5bda8cdb961ec8195a901e67e4c79aea44c1521a5fc2f9f1"; }; outputs = [ "out" "modsrc" ]; diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index 03b3be7e96e0..302f2b5945a4 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -12,7 +12,7 @@ fetchurl rec { # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS - let value = "b224e796e886b19bce69f0aaedf6ca82bad0ca29c61fb0ed86166efb84356942"; + let value = "9802482b77b95a954cb5111793da10d009009a4e9a9c4eaa4bd1ae5dafe9db46"; in assert (builtins.stringLength value) == 64; value; meta = { diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 3937d70e869d..180970d51dac 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "dd9f176abb89043c01cea7ec7e20130e76db71bd83beafeb2dc5858d4c9c86cd"; + sha256 = "88db771a5efd7c048228e5c1e0b8fba56542e9d8c1b75f7af5b0c4cf334f0584"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; From 0075ec3ffab4bcb5e7e0a4ee5ad4fb46cec83054 Mon Sep 17 00:00:00 2001 From: Masanori Ogino <167209+omasanori@users.noreply.github.com> Date: Sat, 24 Oct 2020 08:23:20 +0900 Subject: [PATCH 063/590] nuspell: 3.1.2 -> 4.0.0, fix license The license of Nuspell is not GPL-3.0-only but LGPL-3.0-or-later. Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com> --- pkgs/development/libraries/nuspell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index 7de16c7c1199..c8cb7734e90c 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nuspell"; - version = "3.1.2"; + version = "4.0.0"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - sha256 = "0wbb6dwmzlsyy224y0liis0azgzwbjdvcyzc31pw1aw6vbp36na6"; + sha256 = "1jfnwva2i67i9pyh123a5h2zs5p7gw77qh4w7qkx61jigsyxc5v7"; }; nativeBuildInputs = [ cmake pkgconfig ronn ]; @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { description = "Free and open source C++ spell checking library"; homepage = "https://nuspell.github.io/"; maintainers = with maintainers; [ fpletz ]; - license = licenses.gpl3; + license = licenses.lgpl3Plus; }; } From 70dc25abd9a63ca3839c08bba8cba9e7bc974b04 Mon Sep 17 00:00:00 2001 From: WORLDofPEACE Date: Fri, 23 Oct 2020 19:51:09 -0400 Subject: [PATCH 064/590] nixos/gnome3: don't put epiphany in favorite apps --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index acccbdb9950a..842fc4491e77 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -43,7 +43,7 @@ let picture-uri='file://${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath}' [org.gnome.shell] - favorite-apps=[ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ] + favorite-apps=[ 'org.gnome.Geary.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ] ${cfg.extraGSettingsOverrides} EOF From c3144b8f6ff15fc265b61766444f2ff31cecdd10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 24 Oct 2020 08:00:06 +0200 Subject: [PATCH 065/590] sentencepiece: 0.1.93 -> 0.1.94 Changelog: https://github.com/google/sentencepiece/releases/tag/v0.1.94 --- pkgs/development/libraries/sentencepiece/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/development/libraries/sentencepiece/default.nix index 9b699035bf9f..e918a3b3d1d2 100644 --- a/pkgs/development/libraries/sentencepiece/default.nix +++ b/pkgs/development/libraries/sentencepiece/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentencepiece"; - version = "0.1.93"; + version = "0.1.94"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "0h9c1xs0sab23labh8m3ar6kvzfldv2id2f17icja61ihyw06nrd"; + sha256 = "sha256:11cqw4hx33gw2jmrg11jyp7fj9pwzwjwzqcn24jfsbgh6n8gks5x"; }; nativeBuildInputs = [ cmake ] ++ lib.optional withGPerfTools gperftools; From 14502974c9bb2b2ceb6c3b3797f2c813c61255b1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 24 Oct 2020 13:53:30 +0000 Subject: [PATCH 066/590] dpic: 2020.06.01 -> 2020.09.15 --- pkgs/tools/graphics/dpic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/dpic/default.nix b/pkgs/tools/graphics/dpic/default.nix index 7b7eea3d5095..ea65f3dbb55c 100644 --- a/pkgs/tools/graphics/dpic/default.nix +++ b/pkgs/tools/graphics/dpic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dpic"; - version = "2020.06.01"; + version = "2020.09.15"; src = fetchurl { url = "https://ece.uwaterloo.ca/~aplevich/dpic/${pname}-${version}.tar.gz"; - sha256 = "1gbkpbjwjaaifxff8amm9b47dynq4l4698snjdgnn4flndw62q88"; + sha256 = "0gmmp4dlir3bn892nm55a3q8cfsj8yg7fp1dixmhsdhsrgmg1b83"; }; # The prefix passed to configure is not used. From f1c4d5d4798eb9043e04dc0530c08cd66f5c1dc4 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 24 Oct 2020 16:36:38 +0200 Subject: [PATCH 067/590] rocksdb: 6.10.2 -> 6.12.7 https://github.com/facebook/rocksdb/blob/v6.12.7/HISTORY.md#6127-2020-10-14 --- pkgs/development/libraries/rocksdb/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 5f023da49f32..2087c9cc81cd 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -15,29 +15,19 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.10.2"; + version = "6.12.7"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "1f2wqb6px812ijcivq3rsknqgkv01wblc6sd8wavhrw8qljgr3s1"; + sha256 = "0cpi0v691xsh20hj5x2y2z7dmjvhd3brr0swszv0xqjg2q0f7zdb"; }; nativeBuildInputs = [ cmake ninja ]; buildInputs = [ bzip2 lz4 snappy zlib zstd ] ++ stdenv.lib.optional enableJemalloc jemalloc; - patches = [ - # Without this change private dependencies are exported. - # Can be removed after the next release. - # https://github.com/facebook/rocksdb/pull/6790 - (fetchpatch { - url = "https://github.com/facebook/rocksdb/commit/07204837ce8d66e1e6e4893178f3fd040f9c1044.patch"; - sha256 = "17097ybkhy0i089zzkpvcj65c7g5skvjvdzi1k09x4i1d719wm39"; - }) - ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move"; cmakeFlags = [ From 7769e32006a5af1155a862a96a7a2924243586a7 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Tue, 3 Mar 2020 11:50:13 +0100 Subject: [PATCH 068/590] dafny: pin z3 and Boogie version --- pkgs/top-level/dotnet-packages.nix | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index f14ae3133b8b..5c28b36763e5 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -327,14 +327,14 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { Boogie = buildDotnetPackage rec { baseName = "Boogie"; - version = "2019-06-20"; - name = "${baseName}-unstable-${version}"; + version = "2.4.1"; + name = "${baseName}-${version}"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie"; - rev = "2e8fae4dc1724d8f9e7b1f877116e56b0773337e"; - sha256 = "01wjps3yfx8q0qy0zrmmfd1ixjxi2dhkn1wfazb5qm2slav39dp2"; + rev = "v${version}"; + sha256 = "13f6ifkh6gpy4bvx5zhgwmk3wd5rfxzl9wxwfhcj1c90fdrhwh1b"; }; # emulate `nuget restore Source/Boogie.sln` @@ -379,7 +379,20 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - Dafny = buildDotnetPackage rec { + Dafny = let + z3 = pkgs.z3.overrideAttrs (oldAttrs: with oldAttrs; rec { + version = "4.8.4"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "Z3Prover"; + repo = pname; + rev = "z3-${version}"; + sha256 = "014igqm5vwswz0yhz0cdxsj3a6dh7i79hvhgc3jmmmz3z0xm1gyn"; + }; + }); + boogie = assert dotnetPackages.Boogie.version == "2.4.1"; dotnetPackages.Boogie; + in buildDotnetPackage rec { baseName = "Dafny"; version = "2.3.0"; @@ -396,7 +409,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { ''; preBuild = '' - ln -s ${pkgs.z3} Binaries/z3 + ln -s ${z3} Binaries/z3 ''; buildInputs = [ Boogie ]; @@ -415,7 +428,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { # Boogie as an input is not enough. Boogie libraries need to be at the same # place as Dafny ones. Same for "*.dll.mdb". No idea why or how to fix. postFixup = '' - for lib in ${Boogie}/lib/dotnet/${Boogie.baseName}/*.dll{,.mdb}; do + for lib in ${boogie}/lib/dotnet/${boogie.baseName}/*.dll{,.mdb}; do ln -s $lib $out/lib/dotnet/${baseName}/ done # We generate our own executable scripts From b1587f9e1931340869a8b258e75d243aa7d0829c Mon Sep 17 00:00:00 2001 From: WORLDofPEACE Date: Fri, 23 Oct 2020 20:06:22 -0400 Subject: [PATCH 069/590] nixos/gnome3: don't ship gnome-software This serves no purpose without flatpak https://github.com/NixOS/nixpkgs/issues/99648#issuecomment-706691174 --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 842fc4491e77..85525ab6d7f6 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -43,7 +43,7 @@ let picture-uri='file://${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath}' [org.gnome.shell] - favorite-apps=[ 'org.gnome.Geary.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ] + favorite-apps=[ 'org.gnome.Geary.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop' ] ${cfg.extraGSettingsOverrides} EOF @@ -389,7 +389,6 @@ in gnome-music gnome-photos gnome-screenshot - gnome-software gnome-system-monitor gnome-weather nautilus From d89deddd5d806a0226fc110be8c28c062973866e Mon Sep 17 00:00:00 2001 From: WORLDofPEACE Date: Fri, 23 Oct 2020 20:18:19 -0400 Subject: [PATCH 070/590] nixos/flatpak: introduce guiPackages This adds basically an indirection to systemPackages to automatically install an interface for flatpak for their respective environments. e.g if I enable pantheon and flatpak you'll get appcenter, and on gnome you'll see gnome-software. https://github.com/NixOS/nixpkgs/issues/99648#issuecomment-706691174 --- nixos/modules/services/desktops/flatpak.nix | 14 +++++++++++++- .../services/x11/desktop-managers/gnome3.nix | 5 +++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/desktops/flatpak.nix b/nixos/modules/services/desktops/flatpak.nix index 7da92cc9f264..d0f6b66328a4 100644 --- a/nixos/modules/services/desktops/flatpak.nix +++ b/nixos/modules/services/desktops/flatpak.nix @@ -15,6 +15,18 @@ in { options = { services.flatpak = { enable = mkEnableOption "flatpak"; + + guiPackages = mkOption { + internal = true; + type = types.listOf types.package; + default = []; + example = literalExample "[ pkgs.gnome3.gnome-software ]"; + description = '' + Packages that provide an interface for flatpak + (like gnome-software) that will be automatically available + to all users when flatpak is enabled. + ''; + }; }; }; @@ -28,7 +40,7 @@ in { } ]; - environment.systemPackages = [ pkgs.flatpak ]; + environment.systemPackages = [ pkgs.flatpak ] ++ cfg.guiPackages; services.dbus.packages = [ pkgs.flatpak ]; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 85525ab6d7f6..cade13296b59 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -207,6 +207,11 @@ in # If gnome3 is installed, build vim for gtk3 too. nixpkgs.config.vim.gui = "gtk3"; + + # Install gnome-software if flatpak is enabled + services.flatpak.guiPackages = [ + pkgs.gnome3.gnome-software + ]; }) (mkIf flashbackEnabled { From 9cee7772e67c4e081c4d6f40d711dff108d7b9be Mon Sep 17 00:00:00 2001 From: WORLDofPEACE Date: Sat, 24 Oct 2020 11:08:50 -0400 Subject: [PATCH 071/590] nixos/gnome3: add favoriteAppsOverride option Rather messy and only needed for the installation cd, so it's an internal option. --- .../services/x11/desktop-managers/gnome3.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index cade13296b59..e4380cfb92bc 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -17,6 +17,11 @@ let ''; }; + defaultFavoriteAppsOverride = '' + [org.gnome.shell] + favorite-apps=[ 'org.gnome.Geary.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop' ] + ''; + nixos-gsettings-desktop-schemas = let defaultPackages = with pkgs; [ gsettings-desktop-schemas gnome3.gnome-shell ]; in @@ -42,8 +47,7 @@ let [org.gnome.desktop.screensaver] picture-uri='file://${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath}' - [org.gnome.shell] - favorite-apps=[ 'org.gnome.Geary.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop' ] + ${cfg.favoriteAppsOverride} ${cfg.extraGSettingsOverrides} EOF @@ -123,6 +127,17 @@ in apply = list: list ++ [ pkgs.gnome3.gnome-shell pkgs.gnome3.gnome-shell-extensions ]; }; + favoriteAppsOverride = mkOption { + internal = true; # this is messy + default = defaultFavoriteAppsOverride; + type = types.lines; + example = literalExample '' + [org.gnome.shell] + favorite-apps=[ 'firefox.desktop', 'org.gnome.Calendar.desktop' ] + ''; + description = "List of desktop files to put as favorite apps into gnome-shell. These need to be installed somehow globally."; + }; + extraGSettingsOverrides = mkOption { default = ""; type = types.lines; From 7df6af303e78986fa208c84f349afd928874fe62 Mon Sep 17 00:00:00 2001 From: WORLDofPEACE Date: Sat, 24 Oct 2020 11:09:45 -0400 Subject: [PATCH 072/590] nixos/gnome3: add gnome-calendar to favorites --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index e4380cfb92bc..6d9809210bae 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -19,7 +19,7 @@ let defaultFavoriteAppsOverride = '' [org.gnome.shell] - favorite-apps=[ 'org.gnome.Geary.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop' ] + favorite-apps=[ 'org.gnome.Geary.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop' ] ''; nixos-gsettings-desktop-schemas = let From 39d15997672831054d13c10e0eb1a6823d2526a2 Mon Sep 17 00:00:00 2001 From: WORLDofPEACE Date: Sat, 24 Oct 2020 11:13:27 -0400 Subject: [PATCH 073/590] installation-cd-graphical-gnome: add firefox to favorite-apps --- .../installer/cd-dvd/installation-cd-graphical-gnome.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix index 8c98691116dc..803bae4212ef 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix @@ -9,7 +9,14 @@ with lib; isoImage.edition = "gnome"; - services.xserver.desktopManager.gnome3.enable = true; + services.xserver.desktopManager.gnome3 = { + # Add firefox to favorite-apps + favoriteAppsOverride = '' + [org.gnome.shell] + favorite-apps=[ 'firefox.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop' ] + ''; + enable = true; + }; services.xserver.displayManager = { gdm = { From f2ea8e45e297189bd530012fb576a9deeea45956 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 24 Oct 2020 15:15:22 +0000 Subject: [PATCH 074/590] rocksdb: propagate deps to fix build of sortmerna --- pkgs/development/libraries/rocksdb/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 2087c9cc81cd..0cb36fd02606 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -26,7 +26,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; - buildInputs = [ bzip2 lz4 snappy zlib zstd ] ++ stdenv.lib.optional enableJemalloc jemalloc; + propagatedBuildInputs = [ bzip2 lz4 snappy zlib zstd ]; + + buildInputs = stdenv.lib.optional enableJemalloc jemalloc; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move"; From bd1800a4c6a4db5b83d59d7d98c932f730e05d74 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 24 Oct 2020 16:21:46 +0000 Subject: [PATCH 075/590] debianutils: 4.11.1 -> 4.11.2 --- pkgs/tools/misc/debianutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix index 141df3332227..42deec9dc5d2 100644 --- a/pkgs/tools/misc/debianutils/default.nix +++ b/pkgs/tools/misc/debianutils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "debianutils"; - version = "4.11.1"; + version = "4.11.2"; src = fetchurl { url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.xz"; - sha256 = "0g4qmzb2ff0rqszzpsal465hcslnpdl4nhghv59qvhamkkqnks4b"; + sha256 = "1pjh2s5f8qp8jaky2x08yvf125np0s48zb2z6f3h6x4vf20hws1v"; }; meta = with stdenv.lib; { From d14027748b0d47419524acd0c8fd3a2dbc357f8a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 24 Oct 2020 18:33:26 +0000 Subject: [PATCH 076/590] dnsdist: 1.5.0 -> 1.5.1 --- pkgs/servers/dns/dnsdist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix index 3f81ecdf6a9a..b15b0bcd19fa 100644 --- a/pkgs/servers/dns/dnsdist/default.nix +++ b/pkgs/servers/dns/dnsdist/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "dnsdist"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2"; - sha256 = "0n3vy84kczvbwbzmr1d2c9lh3im77gz83wczj0im4zs91kpw81rc"; + sha256 = "1wgv19b6y4fp5x1z54psaaialji2rckl5vdh156kyw47k9r5krya"; }; nativeBuildInputs = [ pkgconfig protobuf ]; From 62ca5390e880cf6740b77883b36f1eaf0c098040 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 24 Oct 2020 19:11:39 +0000 Subject: [PATCH 077/590] ephemeralpg: 3.0 -> 3.1 --- pkgs/development/tools/database/ephemeralpg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/ephemeralpg/default.nix b/pkgs/development/tools/database/ephemeralpg/default.nix index 53f3c1df628d..8fbb6ff789bf 100644 --- a/pkgs/development/tools/database/ephemeralpg/default.nix +++ b/pkgs/development/tools/database/ephemeralpg/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, postgresql, getopt, makeWrapper }: stdenv.mkDerivation rec { pname = "ephemeralpg"; - version = "3.0"; + version = "3.1"; src = fetchurl { url = "http://ephemeralpg.org/code/${pname}-${version}.tar.gz"; - sha256 = "1j0g7g114ma7y7sadbng5p1ss1zsm9zpicm77qspym6565733vvh"; + sha256 = "1ap22ki8yz6agd0qybcjgs4b9izw1rwwcgpxn3jah2ccfyax34s6"; }; buildInputs = [ makeWrapper ]; installPhase = '' From 7c6f4a8169c9360e543f56a657082a8aabc21d1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 24 Oct 2020 22:08:36 +0200 Subject: [PATCH 078/590] x265: fix aarch64 build --- pkgs/development/libraries/x265/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index ad43ac96d7df..9d501f47c3b1 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { "-DENABLE_SHARED=ON" "-DHIGH_BIT_DEPTH=OFF" "-DENABLE_HDR10_PLUS=OFF" - ] ++ stdenv.lib.optionals is64bit [ + ] ++ stdenv.lib.optionals (is64bit && !(stdenv.isAarch64 && stdenv.isLinux)) [ "-DEXTRA_LIB=${libx265-10}/lib/libx265.a;${libx265-12}/lib/libx265.a" "-DLINKED_10BIT=ON" "-DLINKED_12BIT=ON" From 7b7efa47e769a06227ce151c1495dae3f1f01b3b Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Sat, 24 Oct 2020 17:03:20 +0200 Subject: [PATCH 079/590] dafny: use pinned z3 in the full closure --- pkgs/top-level/dotnet-packages.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 5c28b36763e5..9c659e655e93 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -328,7 +328,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { Boogie = buildDotnetPackage rec { baseName = "Boogie"; version = "2.4.1"; - name = "${baseName}-${version}"; src = fetchFromGitHub { owner = "boogie-org"; @@ -380,18 +379,21 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; Dafny = let - z3 = pkgs.z3.overrideAttrs (oldAttrs: with oldAttrs; rec { + z3 = pkgs.z3.overrideAttrs (oldAttrs: rec { version = "4.8.4"; - name = "${pname}-${version}"; + name = "z3-${version}"; src = fetchFromGitHub { owner = "Z3Prover"; - repo = pname; + repo = "z3"; rev = "z3-${version}"; sha256 = "014igqm5vwswz0yhz0cdxsj3a6dh7i79hvhgc3jmmmz3z0xm1gyn"; }; }); - boogie = assert dotnetPackages.Boogie.version == "2.4.1"; dotnetPackages.Boogie; + self' = pkgs.dotnetPackages.override ({ + pkgs = pkgs // { inherit z3; }; + }); + Boogie = assert self'.Boogie.version == "2.4.1"; self'.Boogie; in buildDotnetPackage rec { baseName = "Dafny"; version = "2.3.0"; @@ -428,7 +430,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { # Boogie as an input is not enough. Boogie libraries need to be at the same # place as Dafny ones. Same for "*.dll.mdb". No idea why or how to fix. postFixup = '' - for lib in ${boogie}/lib/dotnet/${boogie.baseName}/*.dll{,.mdb}; do + for lib in ${Boogie}/lib/dotnet/${Boogie.baseName}/*.dll{,.mdb}; do ln -s $lib $out/lib/dotnet/${baseName}/ done # We generate our own executable scripts From 5e09575e032ff5933767a64258def9d5b0bbea4e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Oct 2020 00:37:40 +0000 Subject: [PATCH 080/590] fava: 1.15 -> 1.16 --- pkgs/applications/office/fava/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index b33d978ee0b9..d6b404f9db78 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -5,11 +5,11 @@ let in buildPythonApplication rec { pname = "fava"; - version = "1.15"; + version = "1.16"; src = fetchPypi { inherit pname version; - sha256 = "037fhimfjiqay28wg7hd5sm7r0935ynw9d905iszn965ihr1qsgz"; + sha256 = "436b6f9441a638f8028729c2a39c28433f7878c2af6ddb9bfccaeea9ea3086e1"; }; checkInputs = [ python3.pkgs.pytest ]; From 27510ad13fa4558b1744f41aa68cae18ccfdf630 Mon Sep 17 00:00:00 2001 From: David Arnold Date: Tue, 13 Oct 2020 20:55:02 -0500 Subject: [PATCH 081/590] stale bot: TL;DR moves all the information to the Markdown document that we can dynamically update and tries to make things more concise and scannable. Co-authored-by: Ryan Mulligan Co-authored-by: Travis A. Everett --- .github/STALE-BOT.md | 34 ++++++++++++++++++++++++++++++++++ .github/stale.yml | 36 ++---------------------------------- 2 files changed, 36 insertions(+), 34 deletions(-) create mode 100644 .github/STALE-BOT.md diff --git a/.github/STALE-BOT.md b/.github/STALE-BOT.md new file mode 100644 index 000000000000..3b1599baebf8 --- /dev/null +++ b/.github/STALE-BOT.md @@ -0,0 +1,34 @@ +# Stale bot information + +- Thanks for your contribution! +- To remove the stale label, just leave a new comment. +- _How to find the right people to ping?_ → [`git blame`](https://git-scm.com/docs/git-blame) to the rescue! (or GitHub's history and blame buttons.) +- You can always ask for help on [our Discourse Forum](https://discourse.nixos.org/) or on the [#nixos IRC channel](https://webchat.freenode.net/#nixos). + +## Suggestions for PRs + +1. If it is unfinished but you plan to finish it, please mark it as a draft. +2. If you don't expect to work on it any time soon, closing it with a short comment may encourage someone else to pick up your work. +3. To get things rolling again, rebase the PR against the target branch and address valid comments. +4. If you need a review to move forward, ask in [the Discourse thread for PRs that need help](https://discourse.nixos.org/t/prs-in-distress/3604). +5. If all you need is a merge, check the git history to find and [request reviews](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review) from people who usually merge related contributions. + +## Suggestions for issues + +1. If it is resolved (either for you personally, or in general), please consider closing it. +2. If this might still be an issue, but you are not interested in promoting its resolution, please consider closing it while encouraging others to take over and reopen an issue if they care enough. +3. If you still have interest in resolving it, try to ping somebody who you believe might have an interest in the topic. Consider discussing the problem in [our Discourse Forum](https://discourse.nixos.org/). +4. As with all open source projects, your best option is to submit a Pull Request that addresses this issue. We :heart: this attitude! + +**Memorandum on closing issues** + +Don't be afraid to close an issue that holds valuable information. Closed issues stay in the system for people to search, read, cross-reference, or even reopen--nothing is lost! Closing obsolete issues is an important way to help maintainers focus their time and effort. + +## Useful GitHub search queries + +- [Open PRs with any stale-bot interaction](https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+commenter%3Aapp%2Fstale+) +- [Open PRs with any stale-bot interaction and `2.status: stale`](https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+commenter%3Aapp%2Fstale+label%3A%222.status%3A+stale%22) +- [Open PRs with any stale-bot interaction and NOT `2.status: stale`](https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+commenter%3Aapp%2Fstale+-label%3A%222.status%3A+stale%22+) +- [Open Issues with any stale-bot interaction](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+commenter%3Aapp%2Fstale+) +- [Open Issues with any stale-bot interaction and `2.status: stale`](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+commenter%3Aapp%2Fstale+label%3A%222.status%3A+stale%22+) +- [Open Issues with any stale-bot interaction and NOT `2.status: stale`](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+commenter%3Aapp%2Fstale+-label%3A%222.status%3A+stale%22+) diff --git a/.github/stale.yml b/.github/stale.yml index 606d5637cc57..f6e2240b5085 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -1,41 +1,9 @@ # Configuration for probot-stale - https://github.com/probot/stale -# Number of days of inactivity before an issue becomes stale daysUntilStale: 180 -# Number of days of inactivity before a stale issue is closed daysUntilClose: false -# Issues with these labels will never be considered stale exemptLabels: - "1.severity: security" -# Label to use when marking an issue as stale + - "2.status: never-stale" staleLabel: "2.status: stale" -# Comment to post when marking an issue as stale. Set to `false` to disable -pulls: - markComment: | - Hello, I'm a bot and I thank you in the name of the community for your contributions. - - Nixpkgs is a busy repository, and unfortunately sometimes PRs get left behind for too long. Nevertheless, we'd like to help committers reach the PRs that are still important. This PR has had no activity for 180 days, and so I marked it as stale, but you can rest assured it will never be closed by a non-human. - - If this is still important to you and you'd like to remove the stale label, we ask that you leave a comment. Your comment can be as simple as "still important to me". But there's a bit more you can do: - - If you received an approval by an unprivileged maintainer and you are just waiting for a merge, you can @ mention someone with merge permissions and ask them to help. You might be able to find someone relevant by using [Git blame](https://git-scm.com/docs/git-blame) on the relevant files, or via [GitHub's web interface](https://docs.github.com/en/github/managing-files-in-a-repository/tracking-changes-in-a-file). You can see if someone's a member of the [nixpkgs-committers](https://github.com/orgs/NixOS/teams/nixpkgs-committers) team, by hovering with the mouse over their username on the web interface, or by searching them directly on [the list](https://github.com/orgs/NixOS/teams/nixpkgs-committers). - - If your PR wasn't reviewed at all, it might help to find someone who's perhaps a user of the package or module you are changing, or alternatively, ask once more for a review by the maintainer of the package/module this is about. If you don't know any, you can use [Git blame](https://git-scm.com/docs/git-blame) on the relevant files, or [GitHub's web interface](https://docs.github.com/en/github/managing-files-in-a-repository/tracking-changes-in-a-file) to find someone who touched the relevant files in the past. - - If your PR has had reviews and nevertheless got stale, make sure you've responded to all of the reviewer's requests / questions. Usually when PR authors show responsibility and dedication, reviewers (privileged or not) show dedication as well. If you've pushed a change, it's possible the reviewer wasn't notified about your push via email, so you can always [officially request them for a review](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review), or just @ mention them and say you've addressed their comments. - - Lastly, you can always ask for help at [our Discourse Forum](https://discourse.nixos.org/), or more specifically, [at this thread](https://discourse.nixos.org/t/prs-in-distress/3604) or at [#nixos' IRC channel](https://webchat.freenode.net/#nixos). - -issues: - markComment: | - Hello, I'm a bot and I thank you in the name of the community for opening this issue. - - To help our human contributors focus on the most-relevant reports, I check up on old issues to see if they're still relevant. This issue has had no activity for 180 days, and so I marked it as stale, but you can rest assured it will never be closed by a non-human. - - The community would appreciate your effort in checking if the issue is still valid. If it isn't, please close it. - - If the issue persists, and you'd like to remove the stale label, you simply need to leave a comment. Your comment can be as simple as "still important to me". If you'd like it to get more attention, you can ask for help by searching for maintainers and people that previously touched related code and @ mention them in a comment. You can use [Git blame](https://git-scm.com/docs/git-blame) or [GitHub's web interface](https://docs.github.com/en/github/managing-files-in-a-repository/tracking-changes-in-a-file) on the relevant files to find them. - - Lastly, you can always ask for help at [our Discourse Forum](https://discourse.nixos.org/) or at [#nixos' IRC channel](https://webchat.freenode.net/#nixos). - -# Comment to post when closing a stale issue. Set to `false` to disable +markComment: [Nixpkgs stale bot info](https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md) closeComment: false From 75b702555c80cd623791b1ba61cb6ab3209f8569 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 25 Oct 2020 04:20:00 +0000 Subject: [PATCH 082/590] vale: 2.4.3 -> 2.5.0 --- pkgs/tools/text/vale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index e2fb6b71ead5..4011df997062 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.4.3"; + version = "2.5.0"; subPackages = [ "." ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "1qjsrwabqg9brr5q46dl0zrhy5m5qqp68m5v0kskwkykd3r97qwn"; + sha256 = "0favaijdddm0lajlv0a277mg286jh12kwfndf98zdp0vfq9lv00d"; }; vendorSha256 = null; From 46ddb141aa9403994c8b19e4aea096fc6a22ec2f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 25 Oct 2020 04:20:00 +0000 Subject: [PATCH 083/590] reviewdog: 0.10.2 -> 0.11.0 --- pkgs/development/tools/misc/reviewdog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index de8a113d1011..fccee0ede2b6 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.10.2"; + version = "0.11.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1xi5dfdy66qa6xvy60fk2lmp9gxyi0nfkyvybcazn8mrd99hfh6l"; + sha256 = "0n7hk3va25ym8sb900i1s1hjszgwrfl7gfsjbj1m330fidh3q6jc"; }; - vendorSha256 = "0cxi01jxg89lsk91dv782746i8g9ksanx8igmgafq9vq25lld7yg"; + vendorSha256 = "0xscirzi0gqww33ngwh29jiylarj0w5snn9kvv43wfrphb6c79s5"; doCheck = false; From 0b2d320f39fd0f84c4df1670b3cd246a419ce5a4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 25 Oct 2020 04:20:00 +0000 Subject: [PATCH 084/590] rclone: 1.53.1 -> 1.53.2 --- pkgs/applications/networking/sync/rclone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index bd68531db190..bf9be1b103d7 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rclone"; - version = "1.53.1"; + version = "1.53.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1yi6n5ip680ydqhz8fnd0igr8dy7zzhpx37mdgahsfac7cwf6k0q"; + sha256 = "0ns55b6s4zdw94jlialps3knclghj9xqx84ff8hyrl9ksq02kd3w"; }; vendorSha256 = "1l4iz31k1pylvf0zrp4nhxna70s1ma4981x6q1s3dhszjxil5c88"; From aa09c8014be3c0f84cb211af37c2c6eed9a03a54 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Oct 2020 01:04:44 +0000 Subject: [PATCH 085/590] asunder: 2.9.6 -> 2.9.7 --- pkgs/applications/audio/asunder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix index 998535a8eb0b..610085a137aa 100644 --- a/pkgs/applications/audio/asunder/default.nix +++ b/pkgs/applications/audio/asunder/default.nix @@ -12,11 +12,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.9.6"; + version = "2.9.7"; pname = "asunder"; src = fetchurl { url = "http://littlesvr.ca/asunder/releases/${pname}-${version}.tar.bz2"; - sha256 = "1ycnd82lh7qy1pcbngd4b41s16j9hnm2kyfrncg4cwr3bfk7yg7a"; + sha256 = "1x3l308ss0iqhz90qyjb94gyd8b4piyrm2nzjmg5kf049k9prjf1"; }; nativeBuildInputs = [ intltool makeWrapper pkgconfig ]; From 6ac14e87a2c87d58aa7ead967e8c0b33fe2bfe48 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Oct 2020 00:57:09 +0000 Subject: [PATCH 086/590] asciidoctorj: 2.4.0 -> 2.4.1 --- pkgs/tools/typesetting/asciidoctorj/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/typesetting/asciidoctorj/default.nix b/pkgs/tools/typesetting/asciidoctorj/default.nix index c518ddeaf39d..800ac692ff51 100644 --- a/pkgs/tools/typesetting/asciidoctorj/default.nix +++ b/pkgs/tools/typesetting/asciidoctorj/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "asciidoctorj"; - version = "2.4.0"; + version = "2.4.1"; src = fetchzip { url = "http://dl.bintray.com/asciidoctor/maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip"; - sha256 = "1bp26x5mhbl25s9djlq6yani1vaqrgbi5mjljhwhj97iapwsd0yb"; + sha256 = "1m00cdg1520ampg3i2j64si8gmwph7j4189agjlimx3fjjsp3xrh"; }; nativeBuildInputs = [ makeWrapper ]; @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { AsciidoctorJ is the official library for running Asciidoctor on the JVM. ''; longDescription = '' - AsciidoctorJ is the official library for running Asciidoctor on the JVM. - Using AsciidoctorJ, you can convert AsciiDoc content or analyze the - structure of a parsed AsciiDoc document from Java and other JVM + AsciidoctorJ is the official library for running Asciidoctor on the JVM. + Using AsciidoctorJ, you can convert AsciiDoc content or analyze the + structure of a parsed AsciiDoc document from Java and other JVM languages. ''; homepage = "https://asciidoctor.org/docs/asciidoctorj/"; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ moaxcp ]; }; -} +} From 769f4055227d10caaccc1c586ade799ba5043945 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 21 Oct 2020 21:14:39 +0000 Subject: [PATCH 087/590] birdfont: 2.29.0 -> 2.29.1 --- pkgs/tools/misc/birdfont/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix index 7cec0cab996e..c3361739f0bb 100644 --- a/pkgs/tools/misc/birdfont/default.nix +++ b/pkgs/tools/misc/birdfont/default.nix @@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "birdfont"; - version = "2.29.0"; + version = "2.29.1"; src = fetchurl { url = "https://birdfont.org/releases/${pname}-${version}.tar.xz"; - sha256 = "18z3qbrsbfpn00c4xq3ck1mnmvrnqgl9g1s7m4dgc1871fi6sv8w"; + sha256 = "0620bppcbm9pb8l0d4sc56gfwkr97gw4zjirjz5ikk5lj0m801yi"; }; nativeBuildInputs = [ python3 pkgconfig vala_0_44 gobject-introspection wrapGAppsHook ]; From 297cb34d46d8af9c7a076c3286acd09df1bb8ad8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 15:34:57 +0000 Subject: [PATCH 088/590] kanboard: 1.2.15 -> 1.2.16 --- pkgs/applications/misc/kanboard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix index 4f84420330dd..ebe31b10c60e 100644 --- a/pkgs/applications/misc/kanboard/default.nix +++ b/pkgs/applications/misc/kanboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kanboard"; - version = "1.2.15"; + version = "1.2.16"; src = fetchFromGitHub { owner = "kanboard"; repo = "kanboard"; rev = "v${version}"; - sha256 = "0lib2qlc8a59i9dak0g1j5hymwbq9vhflp5srhcjislxypfvrizs"; + sha256 = "1nps7xcw1gp7kfdp13wyj2sprc8hn5iamdb0xj4202qygpzm63wq"; }; dontBuild = true; From 3302edd92f045498fbbaf8aeef021749aeb074b4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 14:45:57 +0000 Subject: [PATCH 089/590] j4-dmenu-desktop: 2.17 -> 2.18 --- pkgs/applications/misc/j4-dmenu-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/pkgs/applications/misc/j4-dmenu-desktop/default.nix index c20fa4ed9d9b..2b1b093fd354 100644 --- a/pkgs/applications/misc/j4-dmenu-desktop/default.nix +++ b/pkgs/applications/misc/j4-dmenu-desktop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "j4-dmenu-desktop"; - version = "2.17"; + version = "2.18"; src = fetchFromGitHub { owner = "enkore"; repo = pname; rev = "r${version}"; - sha256 = "0v23fimkn83dcm5p53y2ymhklff3kwppxhf75sm8xmswrzkixpgc"; + sha256 = "1gxpgifzy0hnpd0ymw3r32amzr32z3bgb90ldjzl438p6h1q0i26"; }; postPatch = '' From 07025477a13682279c35aa3ab19ae05f31f8a9ee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 09:27:38 +0000 Subject: [PATCH 090/590] gllvm: 1.2.7 -> 1.2.8 --- pkgs/development/tools/gllvm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix index 7c4213b4cc0b..58416e30a8c9 100644 --- a/pkgs/development/tools/gllvm/default.nix +++ b/pkgs/development/tools/gllvm/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "gllvm"; - version = "1.2.7"; + version = "1.2.8"; goPackagePath = "github.com/SRI-CSL/gllvm"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "SRI-CSL"; repo = "gllvm"; rev = "v${version}"; - sha256 = "13cmmgbcdfgyxnxqfrn4m6vf0bhpday8lmrr3sm6rk48g77cq203"; + sha256 = "090ghg7ivf6snkabba00pn8a9x5wj8dgpdq7qjhmw1lpijd0mq0y"; }; meta = with stdenv.lib; { From fd58c55861e7798e39ee8bad09b2d0c06730289f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 11:34:14 +0000 Subject: [PATCH 091/590] hebcal: 4.21 -> 4.22 --- pkgs/tools/misc/hebcal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/tools/misc/hebcal/default.nix index 96c958484403..049a79fa7574 100644 --- a/pkgs/tools/misc/hebcal/default.nix +++ b/pkgs/tools/misc/hebcal/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - version = "4.21"; + version = "4.22"; pname = "hebcal"; src = fetchFromGitHub { owner = "hebcal"; repo = "hebcal"; rev = "v${version}"; - sha256 = "0gqjhl5i0hvnpvsg6cfc2z5ckrs66h3jlrdgim62azn3hh5bday2"; + sha256 = "0bm29n51qi9q4vx4qsz3l9l1wvpvsk138zixfl5f5yz4kngzbx24"; }; nativeBuildInputs = [ autoreconfHook ]; From 2e5f96c7a4e8c41967cb20537255291a45887bc9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 11:40:15 +0000 Subject: [PATCH 092/590] heimer: 1.19.0 -> 1.20.0 --- pkgs/applications/misc/heimer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index 19034c1dc762..2a443303e203 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "18paabqfxz49fahdi4fs5z870aynmyfj3xw8q768qffgc26zhl3m"; + sha256 = "01pgmwq539a0z7xsgx60vz6hmnr0c72xp6apx75qkvjsqbwmzhjh"; }; nativeBuildInputs = [ cmake ]; From 782cf9ba0bb17b5821855f57688a79b9fba584a9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 18:27:10 +0000 Subject: [PATCH 093/590] bitwarden: 1.22.1 -> 1.22.2 --- pkgs/tools/security/bitwarden/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index d10a938ea023..113c00b88887 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -17,11 +17,11 @@ let pname = "bitwarden"; version = { - x86_64-linux = "1.22.1"; + x86_64-linux = "1.22.2"; }.${system} or ""; sha256 = { - x86_64-linux = "1pbcrkafyjjcsd27s99g511llkz05d9qkny7g15wp6piyyv89k3n"; + x86_64-linux = "1yx550whld0dg3b10x57r2nzizydla4i40zqqm6dzd3wic8yi365"; }.${system} or ""; meta = with stdenv.lib; { From a01de936b987383094d20814b8550586fd2441f6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 17:54:05 +0000 Subject: [PATCH 094/590] bdf2sfd: 1.1.3 -> 1.1.4 --- pkgs/tools/misc/bdf2sfd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bdf2sfd/default.nix b/pkgs/tools/misc/bdf2sfd/default.nix index e7a9d98aaf23..096164990458 100644 --- a/pkgs/tools/misc/bdf2sfd/default.nix +++ b/pkgs/tools/misc/bdf2sfd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bdf2sfd"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "fcambus"; repo = pname; rev = version; - sha256 = "0v1kkds35qfyv1h5kxc2m7f2gsprg9c7jzpsm3p4f71qn982wry6"; + sha256 = "1lg3yabnf26lghlrmhpq7hbhydmw85q0k64246b8fwv1dnxc7afd"; }; nativeBuildInputs = [ cmake ]; From 4b023fb1dacf77edc6cd28ff4dbb03eba2195179 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 20:19:37 +0000 Subject: [PATCH 095/590] caddy: 2.2.0 -> 2.2.1 --- pkgs/servers/caddy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index a4e787db739f..37f3f1082ec0 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "caddy"; - version = "2.2.0"; + version = "2.2.1"; subPackages = [ "cmd/caddy" ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "caddyserver"; repo = pname; rev = "v${version}"; - sha256 = "086zgbwb3v11gik2w024p7m7ywkzn0w27y6hrngd4rxylj7jq7c8"; + sha256 = "065kxnyapjk4r07qrr55zs5w72p8rb8mapq3dh9lr1y13b8sgka9"; }; vendorSha256 = "1rm7v03v6rf9fdqrrl639z8a46cdzswjp8rdpygcsndqfznn5w7b"; From 06d0a7c22191776a254806a8aa8edd1b999c0fe8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 14:01:42 +0000 Subject: [PATCH 096/590] igraph: 0.8.2 -> 0.8.3 --- pkgs/development/libraries/igraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index 6a55359e168b..70b3d7e767c1 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "igraph"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - sha256 = "015yh9s19lmxm7l1ld8adlsqh1lrmzicl801saixdwl9w05hfva4"; + sha256 = "05k5ws1qgbfkxf6y923r61m42gy45l9awqqbfjqgrb3ricfr4wha"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; From 7461989bd9a8bcdccab83c5de66c09d4b4b39ae1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 13:51:36 +0000 Subject: [PATCH 097/590] icingaweb2: 2.8.1 -> 2.8.2 --- pkgs/servers/icingaweb2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index 6414d445a00d..eaf16e388048 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, php }: with lib; stdenv.mkDerivation rec { pname = "icingaweb2"; - version = "2.8.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "Icinga"; repo = "icingaweb2"; rev = "v${version}"; - sha256 = "1hmw681a2qv578npr389szkxpbhcfqzq9c1wzkbjjm3avnvi37mf"; + sha256 = "1zrni1hzblaangiqm7iqbvg2h9rdc2l3pzzymz52r7mri4qnr4s8"; }; nativeBuildInputs = [ makeWrapper ]; From 6fecc33dad9cd62ab5e06cfadf4fe0d8a019c3e6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 17 Oct 2020 17:24:56 +0000 Subject: [PATCH 098/590] bazarr: 0.9.0.2 -> 0.9.0.5 --- pkgs/servers/bazarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index 92ca263f46fe..f220f4002a06 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bazarr"; - version = "0.9.0.2"; + version = "0.9.0.5"; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz"; - sha256 = "1lvldklj61hg9h1m0ixaa4zcf4ggdj6wf4myhwwampq4bmr2havj"; + sha256 = "1mm8qghkif48jr7fq28kp7zk5x71zm43isf0a96crpi9qi91sdd5"; }; nativeBuildInputs = [ makeWrapper ]; From d82188bf90f70880229a746b6dfd666a53f85b50 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 22 Oct 2020 22:04:04 +0200 Subject: [PATCH 099/590] pythonPackages.python-rtmidi: 1.4.5 -> 1.4.6 --- pkgs/development/python-modules/python-rtmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-rtmidi/default.nix b/pkgs/development/python-modules/python-rtmidi/default.nix index c2cced83509e..2b65a658f982 100644 --- a/pkgs/development/python-modules/python-rtmidi/default.nix +++ b/pkgs/development/python-modules/python-rtmidi/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "python-rtmidi"; - version = "1.4.5"; + version = "1.4.6"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "3dd1909d0f44f03a4191131f1829cac2ee6a94f5a4be2a9606354748e594e704"; + sha256 = "1aqhsl9w3h0rwf3mhr8parjbxm2sb6sn5mac6725cvm535pqqyhz"; }; nativeBuildInputs = [ pkg-config ]; From 3dc6b14b7235376c16dca1859d3dfd89427e0642 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 24 Oct 2020 00:48:59 +0000 Subject: [PATCH 100/590] all-packages.nix: pkgs.config.cudaSupport -> config.cudaSupport --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e53a98e0aa9a..04e44e58adcd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1389,7 +1389,7 @@ in tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; libtensorflow-bin = callPackage ../development/libraries/science/math/tensorflow/bin.nix { - cudaSupport = pkgs.config.cudaSupport or false; + cudaSupport = config.cudaSupport or false; inherit (linuxPackages) nvidia_x11; cudatoolkit = cudatoolkit_10_0; cudnn = cudnn_cudatoolkit_10_0; @@ -1402,7 +1402,7 @@ in libtorch-bin = callPackage ../development/libraries/science/math/libtorch/bin.nix { inherit (linuxPackages) nvidia_x11; - cudaSupport = pkgs.config.cudaSupport or false; + cudaSupport = config.cudaSupport or false; }; behdad-fonts = callPackage ../data/fonts/behdad-fonts { }; @@ -26694,7 +26694,7 @@ in stdenv = gcc7Stdenv; inherit (linuxPackages) nvidia_x11; opencv3 = opencv3WithoutCuda; # Used only for image loading. - cudaSupport = pkgs.config.cudaSupport or false; + cudaSupport = config.cudaSupport or false; }; ecm = callPackage ../applications/science/math/ecm { }; From 2f74dff8664b0258c34abb9ab9037dfa8c3bf8fa Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Sun, 25 Oct 2020 11:06:47 +0200 Subject: [PATCH 101/590] slurp: 1.2.0 -> 1.3.0 --- pkgs/tools/misc/slurp/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/slurp/default.nix b/pkgs/tools/misc/slurp/default.nix index dbec2324674b..bdbea7367b81 100644 --- a/pkgs/tools/misc/slurp/default.nix +++ b/pkgs/tools/misc/slurp/default.nix @@ -1,27 +1,28 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig -, cairo, wayland, wayland-protocols +{ stdenv, fetchFromGitHub, meson, ninja, pkg-config +, cairo, libxkbcommon, wayland, wayland-protocols , buildDocs ? true, scdoc }: stdenv.mkDerivation rec { pname = "slurp"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "emersion"; repo = "slurp"; rev = "v${version}"; - sha256 = "0580m6kaiilgsrcj608r837r37sl6a25y7w21p7d6ij20fs3gvg1"; + sha256 = "191yjn909dax8z66ks58wjadrycpbwryirkfjcy99dhq7dijg9fh"; }; nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config ] ++ stdenv.lib.optional buildDocs scdoc; buildInputs = [ cairo + libxkbcommon wayland wayland-protocols ]; From b7fdb27f7310a20df1b1a6f467ad3f081496e115 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 24 Oct 2020 16:45:24 +0000 Subject: [PATCH 102/590] dar: 2.6.10 -> 2.6.12 --- pkgs/tools/backup/dar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index 1f379feece49..8689bc9cd86f 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -8,12 +8,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.6.10"; + version = "2.6.12"; pname = "dar"; src = fetchurl { url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz"; - sha256 = "1ryj4xxar18hshg38j1ljhplypgmfprwqn72k1jwxi28qravg80n"; + sha256 = "0jwgaim2p93skdpjwiz5qgibd3j9965ycqn47wrrjlcvzk93mvyk"; }; outputs = [ "out" "dev" ]; From ef92fe9c43f0538ce009f77b132a1f5f1d7a21ac Mon Sep 17 00:00:00 2001 From: Nicolai Kellerer Date: Thu, 22 Oct 2020 19:14:01 +0200 Subject: [PATCH 103/590] pythonPackages.Shapely: 1.7.0 -> 1.7.1 --- pkgs/development/python-modules/shapely/default.nix | 4 ++-- .../python-modules/shapely/library-paths.patch | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index d895f00285d4..d4d52a9bf035 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Shapely"; - version = "1.7.0"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "07lmrihj6pa7f99m97hbf2anqlhhwippcdz03bqkyihnlkhry6p2"; + sha256 = "0adiz4jwmwxk7k1awqifb1a9bj5x4nx4gglb5dz9liam21674h8n"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/shapely/library-paths.patch b/pkgs/development/python-modules/shapely/library-paths.patch index 4081936abe36..319eb8a72db5 100644 --- a/pkgs/development/python-modules/shapely/library-paths.patch +++ b/pkgs/development/python-modules/shapely/library-paths.patch @@ -2,7 +2,7 @@ diff --git a/shapely/geos.py b/shapely/geos.py index d5a67d2..19b7ffc 100644 --- a/shapely/geos.py +++ b/shapely/geos.py -@@ -61,123 +61,11 @@ def load_dll(libname, fallbacks=None, mode=DEFAULT_MODE): +@@ -61,127 +61,10 @@ def load_dll(libname, fallbacks=None, mode=DEFAULT_MODE): "Could not find lib {} or load any of its variants {}.".format( libname, fallbacks or [])) @@ -80,7 +80,11 @@ index d5a67d2..19b7ffc 100644 - ] - _lgeos = load_dll('geos_c', fallbacks=alt_paths) - -- free = load_dll('c').free +- # ctypes.CDLL(None) internally calls dlopen(NULL), and as the dlopen +- # manpage says, "If filename is NULL, then the returned handle is for the +- # main program". This way we can let the linker do the work to figure out +- # which libc Python is actually using. +- free = CDLL(None).free - free.argtypes = [c_void_p] - free.restype = None - @@ -112,7 +116,7 @@ index d5a67d2..19b7ffc 100644 - except WindowsError: - # XXX: See http://trac.gispython.org/projects/PCL/ticket/149 - pass - +- -elif sys.platform == 'sunos5': - _lgeos = load_dll('geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so']) - free = CDLL('libc.so.1').free From f9ae2b7dac309b0b085840655051cd98a814fff0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 29 Aug 2020 14:57:03 +0200 Subject: [PATCH 104/590] pythonPackages.django_3: init at 3.1 --- pkgs/development/python-modules/django/3.nix | 48 +++++++++++++++++++ .../django/django_3_set_geos_gdal_lib.patch | 24 ++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 74 insertions(+) create mode 100644 pkgs/development/python-modules/django/3.nix create mode 100644 pkgs/development/python-modules/django/django_3_set_geos_gdal_lib.patch diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix new file mode 100644 index 000000000000..dc8a40a3d88e --- /dev/null +++ b/pkgs/development/python-modules/django/3.nix @@ -0,0 +1,48 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, substituteAll +, geos +, gdal +, asgiref +, pytz +, sqlparse +, pythonOlder +, withGdal ? false +}: + +buildPythonPackage rec { + pname = "Django"; + version = "3.1"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "2d390268a13c655c97e0e2ede9d117007996db692c1bb93eabebd4fb7ea7012b"; + }; + + patches = stdenv.lib.optional withGdal + (substituteAll { + src = ./django_3_set_geos_gdal_lib.patch; + geos = geos; + gdal = gdal; + extension = stdenv.hostPlatform.extensions.sharedLibrary; + }); + + propagatedBuildInputs = [ + asgiref + pytz + sqlparse + ]; + + # too complicated to setup + doCheck = false; + + meta = with stdenv.lib; { + description = "A high-level Python Web framework"; + homepage = "https://www.djangoproject.com/"; + license = licenses.bsd3; + maintainers = with maintainers; [ georgewhewell lsix ]; + }; +} diff --git a/pkgs/development/python-modules/django/django_3_set_geos_gdal_lib.patch b/pkgs/development/python-modules/django/django_3_set_geos_gdal_lib.patch new file mode 100644 index 000000000000..6b853f8d85f0 --- /dev/null +++ b/pkgs/development/python-modules/django/django_3_set_geos_gdal_lib.patch @@ -0,0 +1,24 @@ +diff -Nur a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py +--- a/django/contrib/gis/gdal/libgdal.py 2020-07-09 22:34:05.330568948 +0100 ++++ b/django/contrib/gis/gdal/libgdal.py 2020-07-09 22:35:08.679095615 +0100 +@@ -14,7 +14,7 @@ + from django.conf import settings + lib_path = settings.GDAL_LIBRARY_PATH + except (AttributeError, ImportError, ImproperlyConfigured, OSError): +- lib_path = None ++ lib_path = "@gdal@/lib/libgdal@extension@" + + if lib_path: + lib_names = None +diff -Nur a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py +--- a/django/contrib/gis/geos/libgeos.py 2020-07-09 22:34:05.331568941 +0100 ++++ b/django/contrib/gis/geos/libgeos.py 2020-07-09 22:36:24.863526276 +0100 +@@ -24,7 +24,7 @@ + from django.conf import settings + lib_path = settings.GEOS_LIBRARY_PATH + except (AttributeError, ImportError, ImproperlyConfigured, OSError): +- lib_path = None ++ lib_path = "@geos@/lib/libgeos_c@extension@" + + # Setting the appropriate names for the GEOS-C library. + if lib_path: diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 945f55adc70d..cf6b4235090c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1599,6 +1599,8 @@ in { django_2_2 = callPackage ../development/python-modules/django/2_2.nix { }; + django_3 = callPackage ../development/python-modules/django/3.nix { }; + django-allauth = callPackage ../development/python-modules/django-allauth { }; django-anymail = callPackage ../development/python-modules/django-anymail { }; From 00d5a1332234de8f0b8ac947f06a025689894e8c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 31 Aug 2020 17:01:09 +0200 Subject: [PATCH 105/590] pythonPackages.django: clarify versions, remove django_lts attribute Every major version will have only a single LTS release, which is the one we typically keep in Nixpkgs. https://www.djangoproject.com/download/ --- pkgs/development/python-modules/django/{2_2.nix => 2.nix} | 0 pkgs/top-level/python-packages.nix | 8 +++++--- 2 files changed, 5 insertions(+), 3 deletions(-) rename pkgs/development/python-modules/django/{2_2.nix => 2.nix} (100%) diff --git a/pkgs/development/python-modules/django/2_2.nix b/pkgs/development/python-modules/django/2.nix similarity index 100% rename from pkgs/development/python-modules/django/2_2.nix rename to pkgs/development/python-modules/django/2.nix diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cf6b4235090c..b501610df180 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1597,8 +1597,12 @@ in { distutils_extra = callPackage ../development/python-modules/distutils_extra { }; - django_2_2 = callPackage ../development/python-modules/django/2_2.nix { }; + django = self.django_2; + # Current LTS + django_2 = callPackage ../development/python-modules/django/2.nix { }; + + # Current latest django_3 = callPackage ../development/python-modules/django/3.nix { }; django-allauth = callPackage ../development/python-modules/django-allauth { }; @@ -1706,8 +1710,6 @@ in { django-sampledatahelper = callPackage ../development/python-modules/django-sampledatahelper { }; - django = self.django_lts; - django-sesame = callPackage ../development/python-modules/django-sesame { }; django_silk = callPackage ../development/python-modules/django_silk { }; From 0791fdaa6e4862bbbfec76a80003f1fd63a840ae Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 22 Sep 2020 13:31:17 +0100 Subject: [PATCH 106/590] pythonPackages.django_3: 3.1 -> 3.1.1 See https://docs.djangoproject.com/en/3.1/releases/3.1.1/ --- pkgs/development/python-modules/django/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index dc8a40a3d88e..fd7937806d12 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "Django"; - version = "3.1"; + version = "3.1.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "2d390268a13c655c97e0e2ede9d117007996db692c1bb93eabebd4fb7ea7012b"; + sha256 = "0bzwy58hrxbsh7szak1yfh7qvvfnpdpi8ay1x7d3pvbkm1f15j2r"; }; patches = stdenv.lib.optional withGdal From 484178cca62fffb90bc6d58c0d46682daadd4201 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 25 Oct 2020 10:16:09 +0100 Subject: [PATCH 107/590] python3Packages.Django: 3.1.1 -> 3.1.2 --- pkgs/development/python-modules/django/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index fd7937806d12..0648552b6f1a 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "Django"; - version = "3.1.1"; + version = "3.1.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0bzwy58hrxbsh7szak1yfh7qvvfnpdpi8ay1x7d3pvbkm1f15j2r"; + sha256 = "a2127ad0150ec6966655bedf15dbbff9697cc86d61653db2da1afa506c0b04cc"; }; patches = stdenv.lib.optional withGdal From 8e17389a56530f6f55812b2beb7447d2a753aae7 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 30 Sep 2020 12:25:54 -0400 Subject: [PATCH 108/590] graspy: rename to graspologic --- .../python-modules/{graspy => graspologic}/default.nix | 8 ++++---- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/python-modules/{graspy => graspologic}/default.nix (84%) diff --git a/pkgs/development/python-modules/graspy/default.nix b/pkgs/development/python-modules/graspologic/default.nix similarity index 84% rename from pkgs/development/python-modules/graspy/default.nix rename to pkgs/development/python-modules/graspologic/default.nix index 0281e6a97341..4fd6ccf19c57 100644 --- a/pkgs/development/python-modules/graspy/default.nix +++ b/pkgs/development/python-modules/graspologic/default.nix @@ -14,14 +14,14 @@ }: buildPythonPackage rec { - pname = "graspy"; + pname = "graspologic"; version = "0.3"; disabled = isPy27; src = fetchFromGitHub { - owner = "neurodata"; - repo = pname; + owner = "microsoft"; + repo = "graspologic"; rev = "v${version}"; sha256 = "0lab76qiryxvwl6zrcikhnxil1xywl0wkkm2vzi4v9mdzpa7w29r"; }; @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://graspy.neurodata.io"; description = "A package for graph statistical algorithms"; - license = licenses.asl20; + license = licenses.asl20; # changing to `licenses.mit` in next release maintainers = with maintainers; [ bcdarwin ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b501610df180..9df155600bde 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2574,7 +2574,7 @@ in { grappelli_safe = callPackage ../development/python-modules/grappelli_safe { }; - graspy = callPackage ../development/python-modules/graspy { }; + graspologic = callPackage ../development/python-modules/graspologic { }; greatfet = callPackage ../development/python-modules/greatfet { }; From c12c13029e18a802bb16fb12e15e204e8eeb086d Mon Sep 17 00:00:00 2001 From: Jonathan Strickland Date: Tue, 20 Oct 2020 23:03:38 -0400 Subject: [PATCH 109/590] maintainers: add djanatyn --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c5afc7faff92..23d3d4b589a2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2169,6 +2169,12 @@ githubId = 8852888; name = "David Izquierdo"; }; + djanatyn = { + email = "djanatyn@gmail.com"; + github = "djanatyn"; + githubId = 523628; + name = "Jonathan Strickland"; + }; Dje4321 = { email = "dje4321@gmail.com"; github = "dje4321"; From b775bc734ec52b4a6287892af338ef5eef435b6d Mon Sep 17 00:00:00 2001 From: Jonathan Strickland Date: Thu, 22 Oct 2020 12:54:54 -0400 Subject: [PATCH 110/590] pinboard: init at 2.1.8 --- .../python-modules/pinboard/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/pinboard/default.nix diff --git a/pkgs/development/python-modules/pinboard/default.nix b/pkgs/development/python-modules/pinboard/default.nix new file mode 100644 index 000000000000..af144e0a8669 --- /dev/null +++ b/pkgs/development/python-modules/pinboard/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "pinboard"; + version = "2.1.8"; + + src = fetchFromGitHub { + owner = "lionheart"; + repo = pname; + rev = version; + sha256 = "0ppc3vwv48ahqx6n5c7d7066zhi31cjdik0ma9chq6fscq2idgdf"; + }; + + # tests require an API key + doCheck = false; + + meta = with lib; { + description = "A Python wrapper for Pinboard.in"; + maintainers = with maintainers; [ djanatyn ]; + license = licenses.asl20; + homepage = "http://github.com/lionheart/pinboard.py"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04e44e58adcd..531a553905e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21264,6 +21264,8 @@ in musikcube = callPackage ../applications/audio/musikcube {}; + pinboard = with python3Packages; toPythonApplication pinboard; + pinboard-notes-backup = haskell.lib.overrideCabal (haskell.lib.generateOptparseApplicativeCompletion "pnbackup" haskellPackages.pinboard-notes-backup) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9df155600bde..5aca07da615d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4502,6 +4502,8 @@ in { pims = callPackage ../development/python-modules/pims { }; + pinboard = callPackage ../development/python-modules/pinboard { }; + pint = callPackage ../development/python-modules/pint { }; pip = callPackage ../development/python-modules/pip { }; From bc5cf003aa9fd9f44f208a60c225864a8684440c Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Wed, 21 Oct 2020 22:06:38 -0400 Subject: [PATCH 111/590] keepassxc: 2.6.1 -> 2.6.2 KeePassXC has a new release. [Changelog](https://github.com/keepassxreboot/keepassxc/releases/tag/2.6.2) --- pkgs/applications/misc/keepassx/community.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index f0131712b237..f718ab4d8047 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -40,13 +40,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "keepassxc"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = version; - sha256 = "0wgn0glmcxaa670bpxh7n7abjlxcx4h1rl1169cmah0ddxnxnxpq"; + sha256 = "032dzywvwpclhsl3n1pq2m9gyxqpg0gkci6axbvbs7bn82wznc4h"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [ From 43200b172a58f00a75fc388f9b5d278b2578ceb4 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Thu, 10 Sep 2020 21:24:28 -0400 Subject: [PATCH 112/590] python3Packages.dask: 2.22.0 -> 2.25.0 Update meta homepage & changelog links. https://github.com/dask/dask/releases/tag/2.25.0 Changelog: https://docs.dask.org/en/latest/changelog.html --- pkgs/development/python-modules/dask/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 2a088706f6c8..59ea588851ec 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dask"; - version = "2.22.0"; + version = "2.25.0"; disabled = pythonOlder "3.5"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - sha256 = "08nvxj81cz9x92dh2gbmm4imkr8cfljfi2hxkballv2ygwcbzg8g"; + sha256 = "1irp6s577yyjvrvkg00hh1wnl8vrv7pbnbr09mk67z9y7s6xhiw3"; }; checkInputs = [ @@ -70,7 +70,8 @@ buildPythonPackage rec { meta = { description = "Minimal task scheduling abstraction"; - homepage = "https://github.com/ContinuumIO/dask/"; + homepage = "https://dask.org/"; + changelog = "https://docs.dask.org/en/latest/changelog.html"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; From b3053385e5cdf956da99bab1549f3a33bb6f4f37 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 6 Jul 2020 11:12:51 +0200 Subject: [PATCH 113/590] glances: add py-cpuinfo dependency This enables the Quicklook CPU info module. --- pkgs/applications/system/glances/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index 6b77914539cc..b0bd5cc8b150 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -4,6 +4,7 @@ , bottle, pysnmp , hddtemp , netifaces # IP module +, py-cpuinfo }: buildPythonApplication rec { @@ -41,6 +42,7 @@ buildPythonApplication rec { psutil pysnmp setuptools + py-cpuinfo ] ++ lib.optional stdenv.isLinux hddtemp; preConfigure = '' From 627b6f3f09ef1043f3f425945267b2e2b38afb6a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 24 Oct 2020 19:30:46 +0000 Subject: [PATCH 114/590] easyrpg-player: 0.6.2.1 -> 0.6.2.3 --- pkgs/games/easyrpg-player/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/easyrpg-player/default.nix b/pkgs/games/easyrpg-player/default.nix index 79628d0d2ae9..f3f039fe78bb 100644 --- a/pkgs/games/easyrpg-player/default.nix +++ b/pkgs/games/easyrpg-player/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "easyrpg-player"; - version = "0.6.2.1"; + version = "0.6.2.3"; src = fetchFromGitHub { owner = "EasyRPG"; repo = "Player"; rev = version; - sha256 = "19wpjvlkjmjhdv1dbph6i2da1xx479zhr532x0ili1aphw1j9hi6"; + sha256 = "103ywad12dcfjpf97kyx22smilqrw1f20xcfvjjr4mm3walc2mdp"; }; nativeBuildInputs = [ cmake doxygen pkgconfig ]; From 0a60bb7575d52d79973ece39bcbf61513a356369 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 24 Oct 2020 14:52:31 +0000 Subject: [PATCH 115/590] liberfa: 1.7.0 -> 1.7.1 --- pkgs/development/libraries/liberfa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liberfa/default.nix b/pkgs/development/libraries/liberfa/default.nix index 097b0b85e3e8..a1ca15536da6 100644 --- a/pkgs/development/libraries/liberfa/default.nix +++ b/pkgs/development/libraries/liberfa/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "erfa"; - version = "1.7.0"; + version = "1.7.1"; buildInputs = [ autoreconfHook ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "liberfa"; repo = "erfa"; rev = "v${version}"; - sha256 = "1z4k2phrw6wwi0kax6ac80jk9c036gi7pmhmg6gaf3lk81k6xz2r"; + sha256 = "0j7v9y7jsw9vjmhdpksq44ah2af10b9gl1vfm8riw178lvf246wg"; }; configureFlags = [ "--enable-shared" ]; From a14611b9415d279ec2d19adbe08252b3bdd97dbf Mon Sep 17 00:00:00 2001 From: nek0 Date: Fri, 16 Oct 2020 11:29:45 +0200 Subject: [PATCH 116/590] krita: 4.3.0 -> 4.4.0 --- pkgs/applications/graphics/krita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 95a3e1e09280..6ffe7f3c4fa0 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "krita"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "19qlpp9ds60bab73pwi64dq1zn4zn2hcdkrxhjr1j438mc4pflsd"; + sha256 = "0ydmxql8iym62q0nqwn9mnb94jz1nh84i6bni0mgzwjk8p4zfzw3"; }; # *somtimes* fails with can't find ui_manager.h, also see https://github.com/NixOS/nixpkgs/issues/35359 From 166a0642d4117efb804cac270c41e6385de31ce3 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Tue, 20 Oct 2020 09:06:43 +0200 Subject: [PATCH 117/590] croc: add passthru.tests --- pkgs/tools/networking/croc/default.nix | 7 ++++++- .../networking/croc/test-local-relay.nix | 20 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/networking/croc/test-local-relay.nix diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index f11379041871..36fc5583439f 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, callPackage}: buildGoModule rec { pname = "croc"; @@ -17,6 +17,11 @@ buildGoModule rec { subPackages = [ "." ]; + passthru = { + tests = { + local-relay = callPackage ./test-local-relay.nix {}; + }; + }; meta = with stdenv.lib; { description = "Easily and securely send things from one computer to another"; diff --git a/pkgs/tools/networking/croc/test-local-relay.nix b/pkgs/tools/networking/croc/test-local-relay.nix new file mode 100644 index 000000000000..bde05d6deb0a --- /dev/null +++ b/pkgs/tools/networking/croc/test-local-relay.nix @@ -0,0 +1,20 @@ +{ stdenv, croc }: + +stdenv.mkDerivation { + name = "croc-test-local-relay"; + meta.timeout = 300; + buildCommand = '' + HOME=$(mktemp -d) + # start a local relay + ${croc}/bin/croc relay --ports 11111,11112 & + # start sender in background + MSG="See you later, alligator!" + ${croc}/bin/croc --relay localhost:11111 send --code correct-horse-battery-staple --text "$MSG" & + # wait for things to settle + sleep 1 + # receive + MSG2=$(${croc}/bin/croc --relay localhost:11111 --yes correct-horse-battery-staple) + # compare + [ "$MSG" = "$MSG2" ] && touch $out + ''; +} From 53c52f1a45c8276a24b2d0c485c85f6626f65928 Mon Sep 17 00:00:00 2001 From: georgewhewell Date: Thu, 1 Oct 2020 11:47:23 +0100 Subject: [PATCH 118/590] kodi: remove jre override, use headless --- pkgs/applications/video/kodi/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 56788ae4f10e..fcbb546a1fa1 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -3,7 +3,7 @@ , libgcrypt, libgpgerror, libunistring , boost, avahi, lame, autoreconfHook , gettext, pcre-cpp, yajl, fribidi, which -, openssl, gperf, tinyxml2, taglib, libssh, swig, jre +, openssl, gperf, tinyxml2, taglib, libssh, swig, jre_headless , libxml2, systemd , alsaLib, libGLU, libGL, glew, fontconfig, freetype, ftgl , libjpeg, libpng, libtiff @@ -211,7 +211,7 @@ in stdenv.mkDerivation { which pkgconfig gnumake autoconf automake libtool # still needed for some components. Check if that is the case with 19.0 - jre yasm gettext python2Packages.python flatbuffers + jre_headless yasm gettext python2Packages.python flatbuffers # for TexturePacker giflib zlib libpng libjpeg lzo diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 531a553905e6..9efc75240c02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24385,18 +24385,14 @@ in gtk = gtk2; }; - kodiPlain = callPackage ../applications/video/kodi { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + kodiPlain = callPackage ../applications/video/kodi { }; kodiPlainWayland = callPackage ../applications/video/kodi { useWayland = true; - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; kodiGBM = callPackage ../applications/video/kodi { useGbm = true; - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {}); From 542f75079b95bf15a0b4274d0a5a8a39ab19f703 Mon Sep 17 00:00:00 2001 From: Felix Tenley Date: Wed, 21 Oct 2020 17:30:12 +0200 Subject: [PATCH 119/590] nixos/mosquitto: add passwordFile and hashedPasswordFile options --- .../modules/services/networking/mosquitto.nix | 36 +++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix index d2feb93e2b72..4a85b3956dae 100644 --- a/nixos/modules/services/networking/mosquitto.nix +++ b/nixos/modules/services/networking/mosquitto.nix @@ -123,12 +123,33 @@ in ''; }; + passwordFile = mkOption { + type = with types; uniq (nullOr str); + example = "/path/to/file"; + default = null; + description = '' + Specifies the path to a file containing the + clear text password for the MQTT user. + ''; + }; + hashedPassword = mkOption { type = with types; uniq (nullOr str); default = null; description = '' Specifies the hashed password for the MQTT User. - overrides . + To generate hashed password install mosquitto + package and use mosquitto_passwd. + ''; + }; + + hashedPasswordFile = mkOption { + type = with types; uniq (nullOr str); + example = "/path/to/file"; + default = null; + description = '' + Specifies the path to a file containing the + hashed password for the MQTT user. To generate hashed password install mosquitto package and use mosquitto_passwd. ''; @@ -190,6 +211,13 @@ in config = mkIf cfg.enable { + assertions = mapAttrsToList (name: cfg: { + assertion = length (filter (s: s != null) (with cfg; [ + password passwordFile hashedPassword hashedPasswordFile + ])) <= 1; + message = "Cannot set more than one password option"; + }) cfg.users; + systemd.services.mosquitto = { description = "Mosquitto MQTT Broker Daemon"; wantedBy = [ "multi-user.target" ]; @@ -210,7 +238,11 @@ in touch ${cfg.dataDir}/passwd '' + concatStringsSep "\n" ( mapAttrsToList (n: c: - if c.hashedPassword != null then + if c.hashedPasswordFile != null then + "echo '${n}:'$(cat '${c.hashedPasswordFile}') >> ${cfg.dataDir}/passwd" + else if c.passwordFile != null then + "${pkgs.mosquitto}/bin/mosquitto_passwd -b ${cfg.dataDir}/passwd ${n} $(cat '${c.passwordFile}')" + else if c.hashedPassword != null then "echo '${n}:${c.hashedPassword}' >> ${cfg.dataDir}/passwd" else optionalString (c.password != null) "${pkgs.mosquitto}/bin/mosquitto_passwd -b ${cfg.dataDir}/passwd ${n} '${c.password}'" From 07913f838b14d3f13e610f649e0e965a261996c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Wed, 21 Oct 2020 12:11:52 +0200 Subject: [PATCH 120/590] vscode-extensions: recurse into publishers The vscode-extensions set is already marked as recurseIntoAttrs, but this has no effect, since this set is two layers deep instead of the usual one which recurseIntoAttrs applies to. By applying recurseIntoAttrs to all publishers, the extensions will be considered by nix tools when listing packages. --- pkgs/misc/vscode-extensions/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 70c68abe313a..c9ec277e21e7 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -10,6 +10,7 @@ in # So an extension's attribute name should be of the form: # "${mktplcRef.publisher}.${mktplcRef.name}". # +stdenv.lib.mapAttrs (_n: stdenv.lib.recurseIntoAttrs) { alanz.vscode-hie-server = buildVscodeMarketplaceExtension { From 331348799739277e9e6c055226a9918fff4f4fc7 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Tue, 15 Sep 2020 15:27:51 -0700 Subject: [PATCH 121/590] nixos/tests/syncthing: Use curl --fail --- nixos/tests/syncthing-relay.nix | 2 +- nixos/tests/syncthing.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/syncthing-relay.nix b/nixos/tests/syncthing-relay.nix index cd72ef1cbe1d..c144bf7fca37 100644 --- a/nixos/tests/syncthing-relay.nix +++ b/nixos/tests/syncthing-relay.nix @@ -19,7 +19,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { machine.wait_for_open_port(12346) out = machine.succeed( - "curl -sS http://localhost:12346/status | jq -r '.options.\"provided-by\"'" + "curl -sSf http://localhost:12346/status | jq -r '.options.\"provided-by\"'" ) assert "nixos-test" in out ''; diff --git a/nixos/tests/syncthing.nix b/nixos/tests/syncthing.nix index 9e2a8e01e3fb..ac9df5e50c8c 100644 --- a/nixos/tests/syncthing.nix +++ b/nixos/tests/syncthing.nix @@ -25,7 +25,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { "xmllint --xpath 'string(configuration/gui/apikey)' %s/config.xml" % confdir ).strip() oldConf = host.succeed( - "curl -Ss -H 'X-API-Key: %s' 127.0.0.1:8384/rest/system/config" % APIKey + "curl -Ssf -H 'X-API-Key: %s' 127.0.0.1:8384/rest/system/config" % APIKey ) conf = json.loads(oldConf) conf["devices"].append({"deviceID": deviceID, "id": name}) @@ -39,7 +39,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { ) newConf = json.dumps(conf) host.succeed( - "curl -Ss -H 'X-API-Key: %s' 127.0.0.1:8384/rest/system/config -d %s" + "curl -Ssf -H 'X-API-Key: %s' 127.0.0.1:8384/rest/system/config -d %s" % (APIKey, shlex.quote(newConf)) ) From a91aa489a6623b6ac5106687d6ac916f2baa34ec Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Tue, 15 Sep 2020 15:28:08 -0700 Subject: [PATCH 122/590] nixos/tests/matrix-synapse: Use curl --fail --- nixos/tests/matrix-synapse.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/matrix-synapse.nix b/nixos/tests/matrix-synapse.nix index 9ca808721763..6c8f1e188d52 100644 --- a/nixos/tests/matrix-synapse.nix +++ b/nixos/tests/matrix-synapse.nix @@ -77,12 +77,12 @@ in { start_all() serverpostgres.wait_for_unit("matrix-synapse.service") serverpostgres.wait_until_succeeds( - "curl -L --cacert ${ca_pem} https://localhost:8448/" + "curl --fail -L --cacert ${ca_pem} https://localhost:8448/" ) serverpostgres.require_unit_state("postgresql.service") serversqlite.wait_for_unit("matrix-synapse.service") serversqlite.wait_until_succeeds( - "curl -L --cacert ${ca_pem} https://localhost:8448/" + "curl --fail -L --cacert ${ca_pem} https://localhost:8448/" ) serversqlite.succeed("[ -e /var/lib/matrix-synapse/homeserver.db ]") ''; From d2eec4bb1158fcfd820e2d9c64a0123330d51012 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Tue, 15 Sep 2020 15:34:42 -0700 Subject: [PATCH 123/590] nixos/tests/prometheus: Use curl --fail --- nixos/tests/prometheus.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix index af2aa66a5526..de1d10aa7ca9 100644 --- a/nixos/tests/prometheus.nix +++ b/nixos/tests/prometheus.nix @@ -193,13 +193,13 @@ in import ./make-test-python.nix { # Check if prometheus responds to requests: prometheus.wait_for_unit("prometheus.service") prometheus.wait_for_open_port(${toString queryPort}) - prometheus.succeed("curl -s http://127.0.0.1:${toString queryPort}/metrics") + prometheus.succeed("curl -sf http://127.0.0.1:${toString queryPort}/metrics") # Let's test if pushing a metric to the pushgateway succeeds: prometheus.wait_for_unit("pushgateway.service") prometheus.succeed( "echo 'some_metric 3.14' | " - + "curl --data-binary \@- " + + "curl -f --data-binary \@- " + "http://127.0.0.1:${toString pushgwPort}/metrics/job/some_job" ) From 5e6dfb17f91b2eb5374bffc4d0c28bcc9645e605 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Tue, 15 Sep 2020 15:38:02 -0700 Subject: [PATCH 124/590] nixos/tests/haproxy: Use curl --fail --- nixos/tests/haproxy.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/haproxy.nix b/nixos/tests/haproxy.nix index ffb77c052a24..2c3878131b68 100644 --- a/nixos/tests/haproxy.nix +++ b/nixos/tests/haproxy.nix @@ -39,9 +39,9 @@ import ./make-test-python.nix ({ pkgs, ...}: { machine.wait_for_unit("multi-user.target") machine.wait_for_unit("haproxy.service") machine.wait_for_unit("httpd.service") - assert "We are all good!" in machine.succeed("curl -k http://localhost:80/index.txt") + assert "We are all good!" in machine.succeed("curl -fk http://localhost:80/index.txt") assert "haproxy_process_pool_allocated_bytes" in machine.succeed( - "curl -k http://localhost:80/metrics" + "curl -fk http://localhost:80/metrics" ) with subtest("reload"): @@ -49,7 +49,7 @@ import ./make-test-python.nix ({ pkgs, ...}: { # wait some time to ensure the following request hits the reloaded haproxy machine.sleep(5) assert "We are all good!" in machine.succeed( - "curl -k http://localhost:80/index.txt" + "curl -fk http://localhost:80/index.txt" ) ''; }) From 0cb41a253f20510752d1b6d43dd675989f4f7f62 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Tue, 15 Sep 2020 15:40:59 -0700 Subject: [PATCH 125/590] nixos/tests/trac: Use curl --fail --- nixos/tests/trac.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix index 7953f8d41f77..af7182d1e185 100644 --- a/nixos/tests/trac.nix +++ b/nixos/tests/trac.nix @@ -14,6 +14,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { start_all() machine.wait_for_unit("trac.service") machine.wait_for_open_port(8000) - machine.wait_until_succeeds("curl -L http://localhost:8000/ | grep 'Trac Powered'") + machine.wait_until_succeeds("curl -fL http://localhost:8000/ | grep 'Trac Powered'") ''; }) From 6cd28e4f07e0d7c28c9552a80d15f31d2d5ef61c Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Tue, 15 Sep 2020 15:43:39 -0700 Subject: [PATCH 126/590] nixos/tests/mediawiki: Use curl --fail --- nixos/tests/mediawiki.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/mediawiki.nix b/nixos/tests/mediawiki.nix index 008682310cf6..702fefefa161 100644 --- a/nixos/tests/mediawiki.nix +++ b/nixos/tests/mediawiki.nix @@ -22,7 +22,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { machine.wait_for_unit("phpfpm-mediawiki.service") - page = machine.succeed("curl -L http://localhost/") + page = machine.succeed("curl -fL http://localhost/") assert "MediaWiki has been installed" in page ''; }) From 416d9af81b8aaee1af51a1cdf3ddfd3a39420328 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Tue, 15 Sep 2020 23:03:14 -0700 Subject: [PATCH 127/590] nixos/tests/neo4j: Use curl --fail --- nixos/tests/neo4j.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/neo4j.nix b/nixos/tests/neo4j.nix index 32ee7f501b8b..8329e5630d7a 100644 --- a/nixos/tests/neo4j.nix +++ b/nixos/tests/neo4j.nix @@ -15,6 +15,6 @@ import ./make-test-python.nix { master.wait_for_unit("neo4j") master.wait_for_open_port(7474) - master.succeed("curl http://localhost:7474/") + master.succeed("curl -f http://localhost:7474/") ''; } From e90e600ebb30368d55dc65b59756a3af92b73529 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Tue, 15 Sep 2020 23:07:45 -0700 Subject: [PATCH 128/590] nixos/tests/upnp: Use curl --fail --- nixos/tests/upnp.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/upnp.nix b/nixos/tests/upnp.nix index a7d837ea0708..046c0a56b2a7 100644 --- a/nixos/tests/upnp.nix +++ b/nixos/tests/upnp.nix @@ -90,7 +90,7 @@ in client1.succeed("upnpc -a ${internalClient1Address} 9000 9000 TCP") client1.wait_for_unit("httpd") - client2.wait_until_succeeds("curl http://${externalRouterAddress}:9000/") + client2.wait_until_succeeds("curl -f http://${externalRouterAddress}:9000/") ''; }) From e9c61e813abd0c32c5579f8976222edd038969f3 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 07:44:27 -0700 Subject: [PATCH 129/590] nixos/tests/mailcatcher: Use curl --fail --- nixos/tests/mailcatcher.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/mailcatcher.nix b/nixos/tests/mailcatcher.nix index 2ef38544fe0a..a55fba8a9950 100644 --- a/nixos/tests/mailcatcher.nix +++ b/nixos/tests/mailcatcher.nix @@ -24,7 +24,7 @@ import ./make-test-python.nix ({ lib, ... }: 'echo "this is the body of the email" | mail -s "subject" root@example.org' ) assert "this is the body of the email" in machine.succeed( - "curl http://localhost:1080/messages/1.source" + "curl -f http://localhost:1080/messages/1.source" ) ''; }) From 7fbe33fde30e031c6a16b9536aa61395307989aa Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 07:45:15 -0700 Subject: [PATCH 130/590] nixos/tests/nzbget: Use curl --fail --- nixos/tests/nzbget.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/nzbget.nix b/nixos/tests/nzbget.nix index 12d8ed6ea8da..b39c9b035e61 100644 --- a/nixos/tests/nzbget.nix +++ b/nixos/tests/nzbget.nix @@ -21,7 +21,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { server.wait_for_unit("network.target") server.wait_for_open_port(6789) assert "This file is part of nzbget" in server.succeed( - "curl -s -u nzbget:tegbzn6789 http://127.0.0.1:6789" + "curl -f -s -u nzbget:tegbzn6789 http://127.0.0.1:6789" ) server.succeed( "${pkgs.nzbget}/bin/nzbget -n -o Control_iP=127.0.0.1 -o Control_port=6789 -o Control_password=tegbzn6789 -V" From d58ef9d20b5eb160097582934bfeeaedf5d9b657 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 07:50:13 -0700 Subject: [PATCH 131/590] nixos/tests/peerflix: Use curl --fail --- nixos/tests/peerflix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/peerflix.nix b/nixos/tests/peerflix.nix index 37628604d49b..6e534dedc471 100644 --- a/nixos/tests/peerflix.nix +++ b/nixos/tests/peerflix.nix @@ -18,6 +18,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { start_all() peerflix.wait_for_unit("peerflix.service") - peerflix.wait_until_succeeds("curl localhost:9000") + peerflix.wait_until_succeeds("curl -f localhost:9000") ''; }) From bc4f47c19a68b64dd5e8fd9e99b12e55b6189f33 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 07:53:00 -0700 Subject: [PATCH 132/590] nixos/tests/go-neb: Use curl --fail --- nixos/tests/go-neb.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/go-neb.nix b/nixos/tests/go-neb.nix index d9e5db0b4a53..531ab5a66714 100644 --- a/nixos/tests/go-neb.nix +++ b/nixos/tests/go-neb.nix @@ -34,7 +34,7 @@ import ./make-test-python.nix ({ pkgs, ... }: start_all() server.wait_for_unit("go-neb.service") server.wait_until_succeeds( - "curl -L http://localhost:4050/services/hooks/d2lraXBlZGlhX3NlcnZpY2U" + "curl -fL http://localhost:4050/services/hooks/d2lraXBlZGlhX3NlcnZpY2U" ) server.wait_until_succeeds( "journalctl -eu go-neb -o cat | grep -q service_id=wikipedia_service" From bbd1f02b162197175db58ad4c249144786f27af8 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 07:54:06 -0700 Subject: [PATCH 133/590] nixos/tests/hound: Use curl --fail --- nixos/tests/hound.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/hound.nix b/nixos/tests/hound.nix index 27c65abdf27c..b8b10022bd92 100644 --- a/nixos/tests/hound.nix +++ b/nixos/tests/hound.nix @@ -53,7 +53,7 @@ import ./make-test-python.nix ({ pkgs, ... } : { machine.wait_for_unit("hound.service") machine.wait_for_open_port(6080) machine.wait_until_succeeds( - "curl http://127.0.0.1:6080/api/v1/search\?stats\=fosho\&repos\=\*\&rng=%3A20\&q\=hi\&files\=\&i=nope | grep 'Filename' | grep 'hello'" + "curl -f http://127.0.0.1:6080/api/v1/search\?stats\=fosho\&repos\=\*\&rng=%3A20\&q\=hi\&files\=\&i=nope | grep 'Filename' | grep 'hello'" ) ''; }) From 4fc64f27c7fbc7ff3bd719405ce7ebac74d7bab5 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 07:54:41 -0700 Subject: [PATCH 134/590] nixos/tests/paperless: Use curl --fail --- nixos/tests/paperless.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/paperless.nix b/nixos/tests/paperless.nix index 355e7041d3fe..fb83e6f976de 100644 --- a/nixos/tests/paperless.nix +++ b/nixos/tests/paperless.nix @@ -23,14 +23,14 @@ import ./make-test-python.nix ({ lib, ... } : { with subtest("Service gets ready"): machine.wait_for_unit("paperless-server.service") # Wait until server accepts connections - machine.wait_until_succeeds("curl -s localhost:28981") + machine.wait_until_succeeds("curl -fs localhost:28981") with subtest("Test document is consumed"): machine.wait_until_succeeds( - "(($(curl -s localhost:28981/api/documents/ | jq .count) == 1))" + "(($(curl -fs localhost:28981/api/documents/ | jq .count) == 1))" ) assert "2005-10-16" in machine.succeed( - "curl -s localhost:28981/api/documents/ | jq '.results | .[0] | .created'" + "curl -fs localhost:28981/api/documents/ | jq '.results | .[0] | .created'" ) ''; }) From 47fd1c535616047b792e25ce39fa86fbde2db51d Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 08:03:37 -0700 Subject: [PATCH 135/590] nixos/tests/morty: Use curl --fail --- nixos/tests/morty.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/morty.nix b/nixos/tests/morty.nix index 64c5a27665d6..ff30b7c072bb 100644 --- a/nixos/tests/morty.nix +++ b/nixos/tests/morty.nix @@ -24,7 +24,7 @@ import ./make-test-python.nix ({ pkgs, ... }: '' mortyProxyWithKey.wait_for_unit("default.target") mortyProxyWithKey.wait_for_open_port(3001) - mortyProxyWithKey.succeed("curl -L 127.0.0.1:3001 | grep MortyProxy") + mortyProxyWithKey.succeed("curl -fL 127.0.0.1:3001 | grep MortyProxy") ''; }) From ba0eda6cc5cf0b8c87243dd32542aff0d2c9f109 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 08:10:29 -0700 Subject: [PATCH 136/590] nixos/tests/trezord: Use curl --fail --- nixos/tests/trezord.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/trezord.nix b/nixos/tests/trezord.nix index b7b3dd31942b..7c8370f409ed 100644 --- a/nixos/tests/trezord.nix +++ b/nixos/tests/trezord.nix @@ -14,6 +14,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { start_all() machine.wait_for_unit("trezord.service") machine.wait_for_open_port(21325) - machine.wait_until_succeeds("curl -L http://localhost:21325/status/ | grep Version") + machine.wait_until_succeeds("curl -fL http://localhost:21325/status/ | grep Version") ''; }) From c69d4eda3d1b3badc2c928fc4201f1dc60062db4 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 08:19:47 -0700 Subject: [PATCH 137/590] nixos/tests/uwsgi: Use curl --fail --- nixos/tests/uwsgi.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/uwsgi.nix b/nixos/tests/uwsgi.nix index 78a87147f55c..7f4945a88030 100644 --- a/nixos/tests/uwsgi.nix +++ b/nixos/tests/uwsgi.nix @@ -33,6 +33,6 @@ import ./make-test-python.nix ({ pkgs, ... }: machine.wait_for_unit("multi-user.target") machine.wait_for_unit("uwsgi.service") machine.wait_for_open_port(8000) - assert "Hello World" in machine.succeed("curl -v 127.0.0.1:8000") + assert "Hello World" in machine.succeed("curl -fv 127.0.0.1:8000") ''; }) From 1959ab707ca7ac41bf99ad3feefc17ab56cc425a Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 08:21:54 -0700 Subject: [PATCH 138/590] nixos/tests/victoriametrics: Use curl --fail --- nixos/tests/victoriametrics.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/tests/victoriametrics.nix b/nixos/tests/victoriametrics.nix index 73ef8b728615..fff8d7005da1 100644 --- a/nixos/tests/victoriametrics.nix +++ b/nixos/tests/victoriametrics.nix @@ -19,9 +19,11 @@ import ./make-test-python.nix ({ pkgs, ...} : { # write some points and run simple query out = one.succeed( - "curl -d 'measurement,tag1=value1,tag2=value2 field1=123,field2=1.23' -X POST 'http://localhost:8428/write'" + "curl -f -d 'measurement,tag1=value1,tag2=value2 field1=123,field2=1.23' -X POST 'http://localhost:8428/write'" + ) + cmd = ( + """curl -f -s -G 'http://localhost:8428/api/v1/export' -d 'match={__name__!=""}'""" ) - cmd = """curl -s -G 'http://localhost:8428/api/v1/export' -d 'match={__name__!=""}'""" # data takes a while to appear one.wait_until_succeeds(f"[[ $({cmd} | wc -l) -ne 0 ]]") out = one.succeed(cmd) From a6a9e3188d395bec217ae4f2c51af1a415da0960 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 08:23:15 -0700 Subject: [PATCH 139/590] nixos/tests/spacecookie: Use curl --fail --- nixos/tests/spacecookie.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/spacecookie.nix b/nixos/tests/spacecookie.nix index 6eff32a2e75d..5b5022a74278 100644 --- a/nixos/tests/spacecookie.nix +++ b/nixos/tests/spacecookie.nix @@ -32,7 +32,7 @@ in ${gopherHost}.wait_for_unit("spacecookie.service") client.wait_for_unit("network.target") - fileResponse = client.succeed("curl -s gopher://${gopherHost}//${fileName}") + fileResponse = client.succeed("curl -f -s gopher://${gopherHost}//${fileName}") # the file response should return our created file exactly if not (fileResponse == "${fileContent}\n"): @@ -41,7 +41,7 @@ in # sanity check on the directory listing: we serve a directory and a file # via gopher, so the directory listing should have exactly two entries, # one with gopher file type 0 (file) and one with file type 1 (directory). - dirResponse = client.succeed("curl -s gopher://${gopherHost}") + dirResponse = client.succeed("curl -f -s gopher://${gopherHost}") dirEntries = [l[0] for l in dirResponse.split("\n") if len(l) > 0] dirEntries.sort() From 8a9554bf9b18c02baabea69968843c9b7c1db635 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 08:25:34 -0700 Subject: [PATCH 140/590] nixos/tests/service-runner: Use curl --fail --- nixos/tests/service-runner.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/service-runner.nix b/nixos/tests/service-runner.nix index 39ae66fe1116..55fbbb729344 100644 --- a/nixos/tests/service-runner.nix +++ b/nixos/tests/service-runner.nix @@ -29,7 +29,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { """ ) machine.wait_for_open_port(80) - machine.succeed(f"curl {url}") + machine.succeed(f"curl -f {url}") machine.succeed("kill -INT $(cat my-nginx.pid)") machine.wait_for_closed_port(80) ''; From ebeb8d72876d399e2f700e57955ea6237a01c5d5 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 08:30:16 -0700 Subject: [PATCH 141/590] nixos/tests/sslh: Use curl --fail --- nixos/tests/sslh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/sslh.nix b/nixos/tests/sslh.nix index 2a800aa52d0a..17094606e8e6 100644 --- a/nixos/tests/sslh.nix +++ b/nixos/tests/sslh.nix @@ -78,6 +78,6 @@ import ./make-test-python.nix { server.succeed(f"grep '{ip}' /tmp/foo{arg}") # check that http through sslh works - assert client.succeed(f"curl {arg} http://server:443").strip() == "hello world" + assert client.succeed(f"curl -f {arg} http://server:443").strip() == "hello world" ''; } From 7b51945dcb715d48acdb9a05f3eff51bbdf524cd Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 08:31:03 -0700 Subject: [PATCH 142/590] nixos/tests/trickster: Use curl --fail --- nixos/tests/trickster.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/tests/trickster.nix b/nixos/tests/trickster.nix index 713ac8f0b2fa..e32f919a1ada 100644 --- a/nixos/tests/trickster.nix +++ b/nixos/tests/trickster.nix @@ -19,19 +19,19 @@ import ./make-test-python.nix ({ pkgs, ... }: { prometheus.wait_for_unit("prometheus.service") prometheus.wait_for_open_port(9090) prometheus.wait_until_succeeds( - "curl -L http://localhost:9090/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'" + "curl -fL http://localhost:9090/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'" ) trickster.wait_for_unit("trickster.service") trickster.wait_for_open_port(8082) trickster.wait_for_open_port(9090) trickster.wait_until_succeeds( - "curl -L http://localhost:8082/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'" + "curl -fL http://localhost:8082/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'" ) trickster.wait_until_succeeds( - "curl -L http://prometheus:9090/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'" + "curl -fL http://prometheus:9090/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'" ) trickster.wait_until_succeeds( - "curl -L http://localhost:9090/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'" + "curl -fL http://localhost:9090/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'" ) ''; }) From 8bf2635afcefd3198f19fb15fafdea86c66b2a4c Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 08:31:34 -0700 Subject: [PATCH 143/590] nixos/tests/oci-containers: Use curl --fail --- nixos/tests/oci-containers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/oci-containers.nix b/nixos/tests/oci-containers.nix index bb6c019f07c9..0dfc7ffb276b 100644 --- a/nixos/tests/oci-containers.nix +++ b/nixos/tests/oci-containers.nix @@ -32,7 +32,7 @@ let start_all() ${backend}.wait_for_unit("${backend}-nginx.service") ${backend}.wait_for_open_port(8181) - ${backend}.wait_until_succeeds("curl http://localhost:8181 | grep Hello") + ${backend}.wait_until_succeeds("curl -f http://localhost:8181 | grep Hello") ''; }; From 1332215d5974bc27810d8d9cc5bc030c31788eab Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 08:32:56 -0700 Subject: [PATCH 144/590] nixos/tests/php: Use curl --fail --- nixos/tests/php/fpm.nix | 2 +- nixos/tests/php/httpd.nix | 2 +- nixos/tests/php/pcre.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/php/fpm.nix b/nixos/tests/php/fpm.nix index 513abd943737..9ad515ebdde0 100644 --- a/nixos/tests/php/fpm.nix +++ b/nixos/tests/php/fpm.nix @@ -43,7 +43,7 @@ import ../make-test-python.nix ({pkgs, lib, ...}: { machine.wait_for_unit("phpfpm-foobar.service") # Check so we get an evaluated PHP back - response = machine.succeed("curl -vvv -s http://127.0.0.1:80/") + response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/") assert "PHP Version ${pkgs.php.version}" in response, "PHP version not detected" # Check so we have database and some other extensions loaded diff --git a/nixos/tests/php/httpd.nix b/nixos/tests/php/httpd.nix index 1092e0ecadd3..27ea7a24e3a9 100644 --- a/nixos/tests/php/httpd.nix +++ b/nixos/tests/php/httpd.nix @@ -21,7 +21,7 @@ import ../make-test-python.nix ({pkgs, lib, ...}: { machine.wait_for_unit("httpd.service") # Check so we get an evaluated PHP back - response = machine.succeed("curl -vvv -s http://127.0.0.1:80/") + response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/") assert "PHP Version ${pkgs.php.version}" in response, "PHP version not detected" # Check so we have database and some other extensions loaded diff --git a/nixos/tests/php/pcre.nix b/nixos/tests/php/pcre.nix index 3dd0964e60fb..3ea19304bffd 100644 --- a/nixos/tests/php/pcre.nix +++ b/nixos/tests/php/pcre.nix @@ -32,7 +32,7 @@ in import ../make-test-python.nix ({lib, ...}: { '' machine.wait_for_unit("httpd.service") # Ensure php evaluation by matching on the var_dump syntax - response = machine.succeed("curl -vvv -s http://127.0.0.1:80/index.php") + response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/index.php") expected = 'string(${toString (builtins.stringLength testString)}) "${testString}"' assert expected in response, "Does not appear to be able to use subgroups." ''; From 22f52cdb797da094ba46ba3fb7be22b3394aad9f Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 08:47:12 -0700 Subject: [PATCH 145/590] nixos/tests/osrm-backend: Use curl --fail --- nixos/tests/osrm-backend.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/osrm-backend.nix b/nixos/tests/osrm-backend.nix index db67a5a589f9..4067d5b1a239 100644 --- a/nixos/tests/osrm-backend.nix +++ b/nixos/tests/osrm-backend.nix @@ -48,10 +48,10 @@ in { machine.wait_for_unit("osrm.service") machine.wait_for_open_port(${toString port}) assert "Boulevard Rainier III" in machine.succeed( - "curl --silent '${query}' | jq .waypoints[0].name" + "curl --fail --silent '${query}' | jq .waypoints[0].name" ) assert "Avenue de la Costa" in machine.succeed( - "curl --silent '${query}' | jq .waypoints[1].name" + "curl --fail --silent '${query}' | jq .waypoints[1].name" ) ''; }) From 1d5130a97fa63752325e42a38565c20f61c6a9eb Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 08:47:48 -0700 Subject: [PATCH 146/590] nixos/tests/leaps: Use curl --fail --- nixos/tests/leaps.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/leaps.nix b/nixos/tests/leaps.nix index ac0c602d4450..ec5b69a76290 100644 --- a/nixos/tests/leaps.nix +++ b/nixos/tests/leaps.nix @@ -26,7 +26,7 @@ import ./make-test-python.nix ({ pkgs, ... }: server.wait_for_open_port(6666) client.wait_for_unit("network.target") assert "leaps" in client.succeed( - "${pkgs.curl}/bin/curl http://server:6666/leaps/" + "${pkgs.curl}/bin/curl -f http://server:6666/leaps/" ) ''; }) From 238dbb45170e02a55d103f82abe2cfec1725b5e7 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 08:48:13 -0700 Subject: [PATCH 147/590] nixos/tests/limesurvey: Use curl --fail --- nixos/tests/limesurvey.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/limesurvey.nix b/nixos/tests/limesurvey.nix index 7228fcb83315..dad807fb7330 100644 --- a/nixos/tests/limesurvey.nix +++ b/nixos/tests/limesurvey.nix @@ -20,7 +20,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.wait_for_unit("phpfpm-limesurvey.service") assert "The following surveys are available" in machine.succeed( - "curl http://example.local/" + "curl -f http://example.local/" ) ''; }) From 726950775deb0e3d65d11b89163bdedfb44b0485 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 08:48:44 -0700 Subject: [PATCH 148/590] nixos/tests/sympa: Use curl --fail --- nixos/tests/sympa.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/sympa.nix b/nixos/tests/sympa.nix index 280691f7cb40..eb38df180a78 100644 --- a/nixos/tests/sympa.nix +++ b/nixos/tests/sympa.nix @@ -30,7 +30,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { machine.wait_for_unit("sympa.service") machine.wait_for_unit("wwsympa.service") assert "Mailing lists service" in machine.succeed( - "curl --insecure -L http://localhost/" + "curl --fail --insecure -L http://localhost/" ) ''; }) From 6e46a88dfbc1fb66eee67f62371b4b7dae8d2fca Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 08:50:41 -0700 Subject: [PATCH 149/590] nixos/tests/unit-php: Use curl --fail --- nixos/tests/web-servers/unit-php.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/web-servers/unit-php.nix b/nixos/tests/web-servers/unit-php.nix index 2a0a5bdaa5d5..033036ee7667 100644 --- a/nixos/tests/web-servers/unit-php.nix +++ b/nixos/tests/web-servers/unit-php.nix @@ -47,7 +47,7 @@ in { machine.wait_for_unit("unit.service") # Check so we get an evaluated PHP back - response = machine.succeed("curl -vvv -s http://127.0.0.1:9074/") + response = machine.succeed("curl -f -vvv -s http://127.0.0.1:9074/") assert "PHP Version ${pkgs.unit.usedPhp74.version}" in response, "PHP version not detected" # Check so we have database and some other extensions loaded From d16e547f2e3dd220928022014d2b92b895a2f928 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 08:52:42 -0700 Subject: [PATCH 150/590] nixos/tests/wordpress: Use curl --fail --- nixos/tests/wordpress.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix index b7449859f7e6..5d740502bb57 100644 --- a/nixos/tests/wordpress.nix +++ b/nixos/tests/wordpress.nix @@ -40,7 +40,7 @@ import ./make-test-python.nix ({ pkgs, ... }: with subtest("website returns welcome screen"): for site_name in site_names: - assert "Welcome to the famous" in machine.succeed(f"curl -L {site_name}") + assert "Welcome to the famous" in machine.succeed(f"curl -fL {site_name}") with subtest("wordpress-init went through"): for site_name in site_names: From 19034ed7a4b2264191fdf74d462c8de09858b97c Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 08:54:14 -0700 Subject: [PATCH 151/590] nixos/tests/metabase: Use curl --fail --- nixos/tests/metabase.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/metabase.nix b/nixos/tests/metabase.nix index 1450a4e9086f..65619cc793a7 100644 --- a/nixos/tests/metabase.nix +++ b/nixos/tests/metabase.nix @@ -15,6 +15,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { start_all() machine.wait_for_unit("metabase.service") machine.wait_for_open_port(3000) - machine.wait_until_succeeds("curl -L http://localhost:3000/setup | grep Metabase") + machine.wait_until_succeeds("curl -fL http://localhost:3000/setup | grep Metabase") ''; }) From 1abfb504b12350afbf83560fc54c472b289a128c Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 08:55:42 -0700 Subject: [PATCH 152/590] nixos/tests/hitch: Use curl --fail --- nixos/tests/hitch/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/hitch/default.nix b/nixos/tests/hitch/default.nix index 904d12619d70..8a2193e75f2a 100644 --- a/nixos/tests/hitch/default.nix +++ b/nixos/tests/hitch/default.nix @@ -28,6 +28,6 @@ import ../make-test-python.nix ({ pkgs, ... }: machine.wait_for_unit("multi-user.target") machine.wait_for_unit("hitch.service") machine.wait_for_open_port(443) - assert "We are all good!" in machine.succeed("curl -k https://localhost:443/index.txt") + assert "We are all good!" in machine.succeed("curl -fk https://localhost:443/index.txt") ''; }) From eff7338d982744cd43f0e94166da7ed68500d261 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 09:01:44 -0700 Subject: [PATCH 153/590] nixos/tests/convos: Use curl --fail --- nixos/tests/convos.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/convos.nix b/nixos/tests/convos.nix index b4ff1188fd8b..af2758c857d0 100644 --- a/nixos/tests/convos.nix +++ b/nixos/tests/convos.nix @@ -25,6 +25,6 @@ in machine.wait_for_unit("convos") machine.wait_for_open_port("${toString port}") machine.succeed("journalctl -u convos | grep -q 'Listening at.*${toString port}'") - machine.succeed("curl http://localhost:${toString port}/") + machine.succeed("curl -f http://localhost:${toString port}/") ''; }) From ecbd2a8bc15684e6157bef2e4ae97ea1d4ac2b03 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 09:02:28 -0700 Subject: [PATCH 154/590] nixos/tests/cadvisor: Use curl --fail --- nixos/tests/cadvisor.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/cadvisor.nix b/nixos/tests/cadvisor.nix index 60c04f147800..664aa3ad876a 100644 --- a/nixos/tests/cadvisor.nix +++ b/nixos/tests/cadvisor.nix @@ -19,16 +19,16 @@ import ./make-test-python.nix ({ pkgs, ... } : { testScript = '' start_all() machine.wait_for_unit("cadvisor.service") - machine.succeed("curl http://localhost:8080/containers/") + machine.succeed("curl -f http://localhost:8080/containers/") influxdb.wait_for_unit("influxdb.service") # create influxdb database influxdb.succeed( - 'curl -XPOST http://localhost:8086/query --data-urlencode "q=CREATE DATABASE root"' + 'curl -f -XPOST http://localhost:8086/query --data-urlencode "q=CREATE DATABASE root"' ) influxdb.wait_for_unit("cadvisor.service") - influxdb.succeed("curl http://localhost:8080/containers/") + influxdb.succeed("curl -f http://localhost:8080/containers/") ''; }) From 8adaa71b52b2df413366f488b4ab5ebb4372b7db Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 09:03:04 -0700 Subject: [PATCH 155/590] nixos/tests/caddy: Use curl --fail --- nixos/tests/caddy.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/tests/caddy.nix b/nixos/tests/caddy.nix index 445a7fa6b0b4..f2de34ff2da2 100644 --- a/nixos/tests/caddy.nix +++ b/nixos/tests/caddy.nix @@ -57,11 +57,13 @@ import ./make-test-python.nix ({ pkgs, ... }: { def check_etag(url): etag = webserver.succeed( - "curl -v '{}' 2>&1 | sed -n -e \"s/^< [Ee][Tt][Aa][Gg]: *//p\"".format(url) + "curl --fail -v '{}' 2>&1 | sed -n -e \"s/^< [Ee][Tt][Aa][Gg]: *//p\"".format( + url + ) ) etag = etag.replace("\r\n", " ") http_code = webserver.succeed( - "curl --silent --show-error -o /dev/null -w \"%{{http_code}}\" --head -H 'If-None-Match: {}' {}".format( + "curl --fail --silent --show-error -o /dev/null -w \"%{{http_code}}\" --head -H 'If-None-Match: {}' {}".format( etag, url ) ) From ad96a2e52b82793adc2bd25fe57507174f4ae3a9 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 09:03:28 -0700 Subject: [PATCH 156/590] nixos/tests/cfssl: Use curl --fail --- nixos/tests/cfssl.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/cfssl.nix b/nixos/tests/cfssl.nix index e291fc285fba..170f09d9b76c 100644 --- a/nixos/tests/cfssl.nix +++ b/nixos/tests/cfssl.nix @@ -38,7 +38,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { testScript = let cfsslrequest = with pkgs; writeScript "cfsslrequest" '' - curl -X POST -H "Content-Type: application/json" -d @${csr} \ + curl -f -X POST -H "Content-Type: application/json" -d @${csr} \ http://localhost:8888/api/v1/cfssl/newkey | ${cfssl}/bin/cfssljson /tmp/certificate ''; csr = pkgs.writeText "csr.json" (builtins.toJSON { From 0812bb843d366c43a06ca599716062937527ab04 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 09:55:54 -0700 Subject: [PATCH 157/590] nixos/tests/corerad: Use curl --fail --- nixos/tests/corerad.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/corerad.nix b/nixos/tests/corerad.nix index 37a1e90477a8..638010f92f44 100644 --- a/nixos/tests/corerad.nix +++ b/nixos/tests/corerad.nix @@ -80,7 +80,7 @@ import ./make-test-python.nix ( ), "SLAAC temporary address was not configured on client after router advertisement" with subtest("Verify HTTP debug server is configured"): - out = router.succeed("curl localhost:9430/metrics") + out = router.succeed("curl -f localhost:9430/metrics") assert ( "corerad_build_info" in out From f6ecfdac39f3e60560c3bb87e16656a51d102866 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 09:58:09 -0700 Subject: [PATCH 158/590] nixos/tests/bitcoind: Use curl --fail --- nixos/tests/bitcoind.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/tests/bitcoind.nix b/nixos/tests/bitcoind.nix index 09f3e4a6ec07..9068b29b8e5c 100644 --- a/nixos/tests/bitcoind.nix +++ b/nixos/tests/bitcoind.nix @@ -31,16 +31,16 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.wait_for_unit("bitcoind-testnet.service") machine.wait_until_succeeds( - 'curl --user rpc:rpc --data-binary \'{"jsonrpc": "1.0", "id":"curltest", "method": "getblockchaininfo", "params": [] }\' -H \'content-type: text/plain;\' localhost:8332 | grep \'"chain":"main"\' ' + 'curl --fail --user rpc:rpc --data-binary \'{"jsonrpc": "1.0", "id":"curltest", "method": "getblockchaininfo", "params": [] }\' -H \'content-type: text/plain;\' localhost:8332 | grep \'"chain":"main"\' ' ) machine.wait_until_succeeds( - 'curl --user rpc2:rpc2 --data-binary \'{"jsonrpc": "1.0", "id":"curltest", "method": "getblockchaininfo", "params": [] }\' -H \'content-type: text/plain;\' localhost:8332 | grep \'"chain":"main"\' ' + 'curl --fail --user rpc2:rpc2 --data-binary \'{"jsonrpc": "1.0", "id":"curltest", "method": "getblockchaininfo", "params": [] }\' -H \'content-type: text/plain;\' localhost:8332 | grep \'"chain":"main"\' ' ) machine.wait_until_succeeds( - 'curl --user rpc:rpc --data-binary \'{"jsonrpc": "1.0", "id":"curltest", "method": "getblockchaininfo", "params": [] }\' -H \'content-type: text/plain;\' localhost:18332 | grep \'"chain":"test"\' ' + 'curl --fail --user rpc:rpc --data-binary \'{"jsonrpc": "1.0", "id":"curltest", "method": "getblockchaininfo", "params": [] }\' -H \'content-type: text/plain;\' localhost:18332 | grep \'"chain":"test"\' ' ) machine.wait_until_succeeds( - 'curl --user rpc2:rpc2 --data-binary \'{"jsonrpc": "1.0", "id":"curltest", "method": "getblockchaininfo", "params": [] }\' -H \'content-type: text/plain;\' localhost:18332 | grep \'"chain":"test"\' ' + 'curl --fail --user rpc2:rpc2 --data-binary \'{"jsonrpc": "1.0", "id":"curltest", "method": "getblockchaininfo", "params": [] }\' -H \'content-type: text/plain;\' localhost:18332 | grep \'"chain":"test"\' ' ) ''; }) From c25ccf6b4b1269cb9e2694779dd4590495e68c57 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 10:00:25 -0700 Subject: [PATCH 159/590] nixos/tests/docker-tools: Use curl --fail --- nixos/tests/docker-tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index edb9aec62db3..c1c41b0fc110 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -115,7 +115,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { "docker load --input='${examples.nginx}'", "docker run --name nginx -d -p 8000:80 ${examples.nginx.imageName}", ) - docker.wait_until_succeeds("curl http://localhost:8000/") + docker.wait_until_succeeds("curl -f http://localhost:8000/") docker.succeed( "docker rm --force nginx", "docker rmi '${examples.nginx.imageName}'", ) From f99b6369b1fe48759e7c40fdf18bc5281f2dd24a Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 16 Sep 2020 10:01:10 -0700 Subject: [PATCH 160/590] nixos/tests/hadoop: Use curl --fail --- nixos/tests/hadoop/hdfs.nix | 4 ++-- nixos/tests/hadoop/yarn.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/tests/hadoop/hdfs.nix b/nixos/tests/hadoop/hdfs.nix index 85aaab34b158..f1f98ed42eb3 100644 --- a/nixos/tests/hadoop/hdfs.nix +++ b/nixos/tests/hadoop/hdfs.nix @@ -48,7 +48,7 @@ import ../make-test-python.nix ({...}: { datanode.wait_for_open_port(9866) datanode.wait_for_open_port(9867) - namenode.succeed("curl http://namenode:9870") - datanode.succeed("curl http://datanode:9864") + namenode.succeed("curl -f http://namenode:9870") + datanode.succeed("curl -f http://datanode:9864") ''; }) diff --git a/nixos/tests/hadoop/yarn.nix b/nixos/tests/hadoop/yarn.nix index 2264ecaff155..01077245d397 100644 --- a/nixos/tests/hadoop/yarn.nix +++ b/nixos/tests/hadoop/yarn.nix @@ -40,7 +40,7 @@ import ../make-test-python.nix ({...}: { nodemanager.wait_for_open_port(8042) nodemanager.wait_for_open_port(8041) - resourcemanager.succeed("curl http://localhost:8088") - nodemanager.succeed("curl http://localhost:8042") + resourcemanager.succeed("curl -f http://localhost:8088") + nodemanager.succeed("curl -f http://localhost:8042") ''; }) From 8b2e5dcf278182f58dd999528966d36cb9784d65 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 18 Oct 2020 14:29:03 +0200 Subject: [PATCH 161/590] ocamlPackages.parse-argv: init at 0.2.0 --- .../ocaml-modules/parse-argv/default.nix | 28 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/ocaml-modules/parse-argv/default.nix diff --git a/pkgs/development/ocaml-modules/parse-argv/default.nix b/pkgs/development/ocaml-modules/parse-argv/default.nix new file mode 100644 index 000000000000..64cc7c0c6b73 --- /dev/null +++ b/pkgs/development/ocaml-modules/parse-argv/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchurl, buildDunePackage, ocaml +, astring +, ounit +}: + +buildDunePackage rec { + pname = "parse-argv"; + version = "0.2.0"; + + minimumOCamlVersion = "4.03"; + + src = fetchurl { + url = "https://github.com/mirage/parse-argv/releases/download/v${version}/parse-argv-v${version}.tbz"; + sha256 = "06dl04fcmwpkydzni2fzwrhk0bqypd55mgxfax9v82x65xrgj5gw"; + }; + + propagatedBuildInputs = [ astring ]; + + doCheck = lib.versionAtLeast ocaml.version "4.04"; + checkInputs = [ ounit ]; + + meta = { + description = "Process strings into sets of command-line arguments"; + homepage = "https://github.com/mirage/parse-argv"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index bad6c505d7ba..715c1dc0a926 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -750,6 +750,8 @@ let ounit2 = callPackage ../development/ocaml-modules/ounit2 { }; + parse-argv = callPackage ../development/ocaml-modules/parse-argv { }; + pgsolver = callPackage ../development/ocaml-modules/pgsolver { }; phylogenetics = callPackage ../development/ocaml-modules/phylogenetics { }; From aa7977af2c0468eb4ab91cf9144564a70a1f08c8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 18 Oct 2020 14:29:10 +0200 Subject: [PATCH 162/590] ocamlPackages.mirage-bootvar-unix: init at 0.1.0 --- .../mirage-bootvar-unix/default.nix | 22 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/ocaml-modules/mirage-bootvar-unix/default.nix diff --git a/pkgs/development/ocaml-modules/mirage-bootvar-unix/default.nix b/pkgs/development/ocaml-modules/mirage-bootvar-unix/default.nix new file mode 100644 index 000000000000..9b9a1ae185ec --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-bootvar-unix/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchurl, buildDunePackage +, lwt, parse-argv +}: + +buildDunePackage rec { + pname = "mirage-bootvar-unix"; + version = "0.1.0"; + + src = fetchurl { + url = "https://github.com/mirage/mirage-bootvar-unix/releases/download/${version}/mirage-bootvar-unix-${version}.tbz"; + sha256 = "0r92s6y7nxg0ci330a7p0hii4if51iq0sixn20cnm5j4a2clprbf"; + }; + + propagatedBuildInputs = [ lwt parse-argv ]; + + meta = { + description = "Unix implementation of MirageOS Bootvar interface"; + homepage = "https://github.com/mirage/mirage-bootvar-unix"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 715c1dc0a926..1508b7504e0c 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -539,6 +539,8 @@ let minisat = callPackage ../development/ocaml-modules/minisat { }; + mirage-bootvar-unix = callPackage ../development/ocaml-modules/mirage-bootvar-unix { }; + mirage-clock = callPackage ../development/ocaml-modules/mirage-clock { }; mirage-clock-unix = callPackage ../development/ocaml-modules/mirage-clock/unix.nix { }; From 03d85e8aacaeff6789f995e9691a763205c32173 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Sun, 25 Oct 2020 11:44:32 +0100 Subject: [PATCH 163/590] tor-browser-bundle-bin: 10.0.1 -> 10.0.2 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 52f2d51fb694..d362e4c9b253 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -91,19 +91,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "10.0.1"; + version = "10.0.2"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "0c71dl1afl9dwpry2vshlf87pl1gfb7wrccxgqxf7mlkcir8xjcq"; + sha256 = "sha256-JBJDMC44VSh1ekXPxsVvFk5nOB8Ro4UGtD32pG1weP8="; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "1cf9z2li4ip0xpfn892icq4415dvp60ncdwfkfpih82jlvyxnhi1"; + sha256 = "sha256-EanW2Q8TtCPY5FSp8zfgBXMte9+RfKE24fu8ROtArK0="; }; }; in From f4d74931628accc733f9e0e996575b5ca3042d8a Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sun, 25 Oct 2020 13:19:25 +0100 Subject: [PATCH 164/590] nixos/tests: only apply qemu parameters if the options are defined This fixes an eval error that occurred on hydra with the small channel and the `nixos.tests.boot.biosCdrom.x86_64-linux` attribute: > $ nix-instantiate nixos/release-small.nix -A nixos.tests.boot.biosCdrom.x86_64-linux > warning: unknown setting 'experimental-features' > error: The option `virtualisation.qemu' does not exist. Definition values: > - In `/home/andi/dev/nixos/nixpkgs/nixos/modules/testing/test-instrumentation.nix': > { > consoles = [ ]; > package = { > _type = "override"; > content = ; > ... > (use '--show-trace' to show detailed location information) In bc2188b we changed test test-instrumentation to also set the QEMU package that is being used. That change unfortunately caused us to always assing values to the virtualisation.qemu.package option even when the option is not defined. The original code was explicitly testing for the consoles case but the then newly extended version did not adjust the check as the intention was probably not clear. With this commit we are always ensuring the entire virtualisation.qemu section exists and can thus drop the individual tests for each of the sections since the QEMU module always defines both the package and the consoles option when it's root is defined.. --- .../modules/testing/test-instrumentation.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 2986bd4c4e31..be5fa88b8ade 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -45,15 +45,21 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; }; systemd.services."serial-getty@${qemuSerialDevice}".enable = false; systemd.services."serial-getty@hvc0".enable = false; - # Only use a serial console, no TTY. - # NOTE: optionalAttrs - # test-instrumentation.nix appears to be used without qemu-vm.nix, so - # we avoid defining consoles if not possible. - # TODO: refactor such that test-instrumentation can import qemu-vm - # or declare virtualisation.qemu.console option in a module that's always imported - virtualisation.qemu = { - consoles = lib.optional (options ? virtualisation.qemu.consoles) qemuSerialDevice; - package = lib.mkDefault pkgs.qemu_test; + # Only set these settings when the options exist. Some tests (e.g. those + # that do not specify any nodes, or an empty attr set as nodes) will not + # have the QEMU module loaded and thuse these options can't and should not + # be set. + virtualisation = lib.optionalAttrs (options ? virtualisation.qemu) { + qemu = { + # Only use a serial console, no TTY. + # NOTE: optionalAttrs + # test-instrumentation.nix appears to be used without qemu-vm.nix, so + # we avoid defining consoles if not possible. + # TODO: refactor such that test-instrumentation can import qemu-vm + # or declare virtualisation.qemu.console option in a module that's always imported + consoles = [ qemuSerialDevice ]; + package = lib.mkDefault pkgs.qemu_test; + }; }; boot.initrd.preDeviceCommands = From af8a48c3c12fc731f96eaa85a4531bea013d13c8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 25 Oct 2020 13:41:51 +0100 Subject: [PATCH 165/590] Revert "pythonPackages.django: clarify versions, remove django_lts attribute" Fix eval. This reverts commit 00d5a1332234de8f0b8ac947f06a025689894e8c. --- pkgs/development/python-modules/django/{2.nix => 2_2.nix} | 0 pkgs/top-level/python-packages.nix | 8 +++----- 2 files changed, 3 insertions(+), 5 deletions(-) rename pkgs/development/python-modules/django/{2.nix => 2_2.nix} (100%) diff --git a/pkgs/development/python-modules/django/2.nix b/pkgs/development/python-modules/django/2_2.nix similarity index 100% rename from pkgs/development/python-modules/django/2.nix rename to pkgs/development/python-modules/django/2_2.nix diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5aca07da615d..26347eed8e1d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1597,12 +1597,8 @@ in { distutils_extra = callPackage ../development/python-modules/distutils_extra { }; - django = self.django_2; + django_2_2 = callPackage ../development/python-modules/django/2_2.nix { }; - # Current LTS - django_2 = callPackage ../development/python-modules/django/2.nix { }; - - # Current latest django_3 = callPackage ../development/python-modules/django/3.nix { }; django-allauth = callPackage ../development/python-modules/django-allauth { }; @@ -1710,6 +1706,8 @@ in { django-sampledatahelper = callPackage ../development/python-modules/django-sampledatahelper { }; + django = self.django_lts; + django-sesame = callPackage ../development/python-modules/django-sesame { }; django_silk = callPackage ../development/python-modules/django_silk { }; From 89a60382e4895149dc705ef002a343abdeaa579b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 25 Oct 2020 13:49:32 +0100 Subject: [PATCH 166/590] Revert "Revert "pythonPackages.django: clarify versions, remove django_lts attribute"" Every major version will have only a single LTS release, which is the one we typically keep in Nixpkgs. https://www.djangoproject.com/download/ This reverts commit af8a48c3c12fc731f96eaa85a4531bea013d13c8. --- .../office/paperless/python-modules/default.nix | 2 +- .../python-modules/django-oauth-toolkit/default.nix | 4 ++-- .../python-modules/django/{2_2.nix => 2.nix} | 0 pkgs/top-level/python-packages.nix | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) rename pkgs/development/python-modules/django/{2_2.nix => 2.nix} (100%) diff --git a/pkgs/applications/office/paperless/python-modules/default.nix b/pkgs/applications/office/paperless/python-modules/default.nix index 40a496312fa9..4c5510ebb743 100644 --- a/pkgs/applications/office/paperless/python-modules/default.nix +++ b/pkgs/applications/office/paperless/python-modules/default.nix @@ -1,6 +1,6 @@ pyPkgs: fetchFromGitHub: { - django_2_0 = pyPkgs.django_2_2.overridePythonAttrs (old: rec { + django_2_0 = pyPkgs.django_2.overridePythonAttrs (old: rec { version = "2.0.12"; src = pyPkgs.fetchPypi { inherit (old) pname; diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix index 700fc3ae4e87..83f1049a2e56 100644 --- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix +++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchFromGitHub -, django_2_2, requests, oauthlib +, django, requests, oauthlib }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1zbksxrcxlqnapmlvx4rgvpqc4plgnq0xnf45cjwzwi1626zs8g6"; }; - propagatedBuildInputs = [ django_2_2 requests oauthlib ]; + propagatedBuildInputs = [ django requests oauthlib ]; # django.core.exceptions.ImproperlyConfigured: Requested setting OAUTH2_PROVIDER, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings doCheck = false; diff --git a/pkgs/development/python-modules/django/2_2.nix b/pkgs/development/python-modules/django/2.nix similarity index 100% rename from pkgs/development/python-modules/django/2_2.nix rename to pkgs/development/python-modules/django/2.nix diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 26347eed8e1d..bcbc6a9ba987 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1597,8 +1597,12 @@ in { distutils_extra = callPackage ../development/python-modules/distutils_extra { }; - django_2_2 = callPackage ../development/python-modules/django/2_2.nix { }; + django = self.django_2; + # Current LTS + django_2 = callPackage ../development/python-modules/django/2.nix { }; + + # Current latest django_3 = callPackage ../development/python-modules/django/3.nix { }; django-allauth = callPackage ../development/python-modules/django-allauth { }; @@ -1658,8 +1662,6 @@ in { django-logentry-admin = callPackage ../development/python-modules/django-logentry-admin { }; - django_lts = self.django_2_2; - django-mailman3 = callPackage ../development/python-modules/django-mailman3 { }; django_modelcluster = callPackage ../development/python-modules/django_modelcluster { }; @@ -1706,8 +1708,6 @@ in { django-sampledatahelper = callPackage ../development/python-modules/django-sampledatahelper { }; - django = self.django_lts; - django-sesame = callPackage ../development/python-modules/django-sesame { }; django_silk = callPackage ../development/python-modules/django_silk { }; From 5737e856f960b8be4692f7d9a81bc340622ce5f1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 24 Oct 2020 23:26:19 +0000 Subject: [PATCH 167/590] urh: 2.8.8 -> 2.8.9 --- pkgs/applications/radio/urh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index 730b679ba61e..008697211f75 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urh"; - version = "2.8.8"; + version = "2.8.9"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; rev = "v${version}"; - sha256 = "0knymy85n9kxj364jpxjc4v9c238b00nl40rafi1ripkqx36bsfv"; + sha256 = "0axzqyljbmpc4c9bnqmdrrz5la5r9qynp49fig645xyxs87vq6b0"; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; From f006f30cb4f081251ce3374cdac52b551b5d42f1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Oct 2020 00:08:07 +0000 Subject: [PATCH 168/590] picard: 2.4.4 -> 2.5 --- pkgs/applications/audio/picard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index d8c927be268b..cf8523b4ef74 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -12,13 +12,13 @@ let ; in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.4.4"; + version = "2.5"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "0iw2v37j70881v0a2rjp2miq97nscq04x1ysk1dqmi1b9hi0y17q"; + sha256 = "02px6r086pyhpf6wia876c73bgr4xa4pyx2yykv6j74zyp5wig3z"; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] From 6981011d9052d9f6eb7901562102d06c5dd96e7b Mon Sep 17 00:00:00 2001 From: Matt Wittmann Date: Tue, 20 Oct 2020 19:42:36 -0700 Subject: [PATCH 169/590] vscode-extensions.dhall.dhall-lang: init at 0.0.4 --- pkgs/misc/vscode-extensions/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index c9ec277e21e7..91978f2c234d 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -49,6 +49,16 @@ stdenv.lib.mapAttrs (_n: stdenv.lib.recurseIntoAttrs) }; }; + dhall.dhall-lang = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "dhall-lang"; + publisher = "dhall"; + version = "0.0.4"; + sha256 = "0sa04srhqmngmw71slnrapi2xay0arj42j4gkan8i11n7bfi1xpf"; + }; + meta = { license = stdenv.lib.licenses.mit; }; + }; + formulahendry.auto-close-tag = buildVscodeMarketplaceExtension { mktplcRef = { name = "auto-close-tag"; From cc254086523b5337dd57a850928860e650ea8e3a Mon Sep 17 00:00:00 2001 From: Matt Wittmann Date: Tue, 20 Oct 2020 19:49:24 -0700 Subject: [PATCH 170/590] vscode-extensions.dhall.vscode-dhall-lsp-server: init at 0.0.4 --- pkgs/misc/vscode-extensions/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 91978f2c234d..53796981e59c 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -59,6 +59,16 @@ stdenv.lib.mapAttrs (_n: stdenv.lib.recurseIntoAttrs) meta = { license = stdenv.lib.licenses.mit; }; }; + dhall.vscode-dhall-lsp-server = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-dhall-lsp-server"; + publisher = "dhall"; + version = "0.0.4"; + sha256 = "1zin7s827bpf9yvzpxpr5n6mv0b5rhh3civsqzmj52mdq365d2js"; + }; + meta = { license = stdenv.lib.licenses.mit; }; + }; + formulahendry.auto-close-tag = buildVscodeMarketplaceExtension { mktplcRef = { name = "auto-close-tag"; From c98962e1a3ccd6034989fe0f2f208beec349c742 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 25 Oct 2020 20:13:18 +0700 Subject: [PATCH 171/590] treewide: remove periods from end of package descriptions --- pkgs/development/compilers/flutter/flutter.nix | 3 +-- pkgs/development/libraries/libfishsound/default.nix | 3 ++- pkgs/development/python-modules/yamale/default.nix | 2 +- pkgs/development/tools/database/ephemeralpg/default.nix | 2 +- pkgs/games/pro-office-calculator/default.nix | 2 +- pkgs/games/tes3cmd/default.nix | 2 +- pkgs/tools/admin/chamber/default.nix | 2 +- pkgs/tools/system/snooze/default.nix | 3 +-- pkgs/tools/system/thinkfan/default.nix | 3 ++- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index fad2a646a165..e9b60253cda0 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -110,8 +110,7 @@ in runCommand drvName { allowSubstitutes = false; passthru = { unwrapped = flutter; }; meta = with stdenv.lib; { - description = - "Flutter is Google's SDK for building mobile, web and desktop with Dart."; + description = "Flutter is Google's SDK for building mobile, web and desktop with Dart"; longDescription = '' Flutter is Google’s UI toolkit for building beautiful, natively compiled applications for mobile, web, and desktop from a single codebase. diff --git a/pkgs/development/libraries/libfishsound/default.nix b/pkgs/development/libraries/libfishsound/default.nix index 3843f4a97ce4..23d828033e3e 100644 --- a/pkgs/development/libraries/libfishsound/default.nix +++ b/pkgs/development/libraries/libfishsound/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://xiph.org/fishsound/"; - description = ''libfishsound by itself is designed to handle raw codec streams from a lower level layer such as UDP datagrams. When these codecs are used in files, they are commonly encapsulated in Ogg to produce Ogg FLAC, Speex and Ogg Vorbis files. + description = "A simple programming interface for decoding and encoding audio data using Xiph.org codecs (FLAC, Speex and Vorbis)"; + longDescription = ''libfishsound by itself is designed to handle raw codec streams from a lower level layer such as UDP datagrams. When these codecs are used in files, they are commonly encapsulated in Ogg to produce Ogg FLAC, Speex and Ogg Vorbis files. libfishsound is a wrapper around the existing codec libraries and provides a consistent, higher-level programming interface. It has been designed for use in a wide variety of applications; it has no direct dependencies on Ogg encapsulation, though it is most commonly used in conjunction with liboggz to decode or encode FLAC, Speex or Vorbis audio tracks in Ogg files, including Ogg Theora and Annodex. diff --git a/pkgs/development/python-modules/yamale/default.nix b/pkgs/development/python-modules/yamale/default.nix index d6fb713185d7..9b2c7b116c6d 100644 --- a/pkgs/development/python-modules/yamale/default.nix +++ b/pkgs/development/python-modules/yamale/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A schema and validator for YAML."; + description = "A schema and validator for YAML"; homepage = "https://github.com/23andMe/Yamale"; license = licenses.mit; maintainers = with maintainers; [ rtburns-jpl ]; diff --git a/pkgs/development/tools/database/ephemeralpg/default.nix b/pkgs/development/tools/database/ephemeralpg/default.nix index 53f3c1df628d..925fd5f7166c 100644 --- a/pkgs/development/tools/database/ephemeralpg/default.nix +++ b/pkgs/development/tools/database/ephemeralpg/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/pg_tmp --prefix PATH : ${stdenv.lib.makeBinPath [ postgresql getopt ]} ''; meta = with stdenv.lib; { - description = ''Run tests on an isolated, temporary PostgreSQL database.''; + description = "Run tests on an isolated, temporary PostgreSQL database"; license = licenses.isc; homepage = "http://ephemeralpg.org/"; platforms = platforms.all; diff --git a/pkgs/games/pro-office-calculator/default.nix b/pkgs/games/pro-office-calculator/default.nix index 7a0e3bec78d4..35571ff149ac 100644 --- a/pkgs/games/pro-office-calculator/default.nix +++ b/pkgs/games/pro-office-calculator/default.nix @@ -15,7 +15,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { - description = "Just an ordinary calculator. Nothing to see here..."; + description = "A completely normal office calculator"; homepage = "https://proofficecalculator.com/"; maintainers = [ maintainers.pmiddend ]; platforms = platforms.linux; diff --git a/pkgs/games/tes3cmd/default.nix b/pkgs/games/tes3cmd/default.nix index b71f9930cade..3778aadda9c5 100644 --- a/pkgs/games/tes3cmd/default.nix +++ b/pkgs/games/tes3cmd/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A command line tool for examining and modifying plugins for the Elder Scrolls game Morrowind by Bethesda Softworks."; + description = "A command line tool for examining and modifying plugins for the Elder Scrolls game Morrowind by Bethesda Softworks"; homepage = "https://github.com/john-moonsugar/tes3cmd"; license = licenses.mit; maintainers = [ maintainers.marius851000 ]; diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/tools/admin/chamber/default.nix index fb21bda41505..7a80ed371884 100644 --- a/pkgs/tools/admin/chamber/default.nix +++ b/pkgs/tools/admin/chamber/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { meta = with lib; { description = - "Chamber is a tool for managing secrets by storing them in AWS SSM Parameter Store."; + "A tool for managing secrets by storing them in AWS SSM Parameter Store"; homepage = "https://github.com/segmentio/chamber"; license = licenses.mit; maintainers = with maintainers; [ kalekseev ]; diff --git a/pkgs/tools/system/snooze/default.nix b/pkgs/tools/system/snooze/default.nix index a82db1dbd423..fb1ceaf897b8 100644 --- a/pkgs/tools/system/snooze/default.nix +++ b/pkgs/tools/system/snooze/default.nix @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" ]; meta = with stdenv.lib; { - description = - "Tool for waiting until a particular time and then running a command."; + description = "Tool for waiting until a particular time and then running a command"; maintainers = with maintainers; [ kaction ]; license = licenses.cc0; platforms = platforms.linux; diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix index 4edcfb63fe56..62c299cce7a3 100644 --- a/pkgs/tools/system/thinkfan/default.nix +++ b/pkgs/tools/system/thinkfan/default.nix @@ -35,7 +35,8 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A minimalist fan control program. Originally designed + description = "A minimalist fan control program"; + longDescription = "A minimalist fan control program. Originally designed specifically for IBM/Lenovo Thinkpads, it now supports any kind of system via the sysfs hwmon interface (/sys/class/hwmon)."; license = licenses.gpl3; From 2436e419166f1caef100686bfc4174cbc676599c Mon Sep 17 00:00:00 2001 From: Lucas Ransan Date: Sun, 25 Oct 2020 13:51:32 +0100 Subject: [PATCH 172/590] rofi-calc: 1.8 -> 1.9 --- pkgs/applications/science/math/rofi-calc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/rofi-calc/default.nix b/pkgs/applications/science/math/rofi-calc/default.nix index 40b2711ff65a..ebf2d2f0475d 100644 --- a/pkgs/applications/science/math/rofi-calc/default.nix +++ b/pkgs/applications/science/math/rofi-calc/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "rofi-calc"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "0vwb9c3xvd2cms6cw8j8parg7w4bsxvvrd1wgggr8sz2p8rrvy5p"; + sha256 = "ZGY4ZtAG/ZnEnC80modZBV4RdRQElbkjeoKCEFVrncE="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/svenstaro/rofi-calc"; license = licenses.mit; maintainers = with maintainers; [ luc65r albakham ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = with platforms; linux; }; } From 7426e53f95169881d1696bf7c631561ed9a75465 Mon Sep 17 00:00:00 2001 From: Sebastian Nagel Date: Tue, 7 Apr 2020 17:43:08 +0200 Subject: [PATCH 173/590] zsh-autoenv: fix zsh-autoenv-share description Fix a copy & paste error in zsh-autoenv-share documentation --- pkgs/tools/misc/zsh-autoenv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/tools/misc/zsh-autoenv/default.nix index c44837b877d1..f4295443f69e 100644 --- a/pkgs/tools/misc/zsh-autoenv/default.nix +++ b/pkgs/tools/misc/zsh-autoenv/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { cat <