From 7b9129a98146cff91360419541955f55c5a09aec Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm+nix@sourcephile.fr>
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 <benwolsieffer@gmail.com>
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 <ben.e.saunders@gmail.com>
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 <mail@vonfry.name>
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 <atemu.main@gmail.com>
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 <mjbauer95@gmail.com>
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 <mjbauer95@gmail.com>
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 <me@f4814n.de>
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 <benwolsieffer@gmail.com>
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?= <me@danieldk.eu>
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 <puck@puck.moe>
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 <inttypes.h>
- #include <parted/parted.h>
- #include <parted/debug.h>
-+#include <parted/filesys.h>
- #include <parted/unit.h>
-
- #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 <elis@hirwing.se>
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 <sohalt@sohalt.net>
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 <hexa@darmstadt.ccc.de>
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 <hexa@darmstadt.ccc.de>
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 <hexa@darmstadt.ccc.de>
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 <hexa@darmstadt.ccc.de>
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 <hexa@darmstadt.ccc.de>
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 <hexa@darmstadt.ccc.de>
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 <marsam@users.noreply.github.com>
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 <hexa@darmstadt.ccc.de>
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 <marsam@users.noreply.github.com>
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?= <hoe.dom@gmx.de>
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 @@
<option>--flake</option> <replaceable>flake-uri</replaceable>
</arg>
+ <arg>
+ <group choice='req'>
+ <arg choice='plain'><option>--impure</option></arg>
+ </group>
+ </arg>
+
<arg>
<arg choice='plain'>
<option>--channel</option>
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" <xablau@tuta.io>
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 <me@nickhu.co.uk>
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
+ <command>gpg-agent</command>. The keygrips of all keys to be
+ unlocked should be written to <filename>~/.pam-gnupg</filename>,
+ and can be queried with <command>gpg -K --with-keygrip</command>.
+ Presetting passphrases must be enabled by adding
+ <literal>allow-preset-passphrase</literal> in
+ <filename>~/.gnupg/gpg-agent.conf</filename>.
+ '';
+ };
+
+ noAutostart = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Don't start <command>gpg-agent</command> if it is not running.
+ Useful in conjunction with starting <command>gpg-agent</command> 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
+ <literal>session</literal>.
+ '';
+ };
+ };
+
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 <mail@beyermatthias.de>
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 <mail@beyermatthias.de>
---
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?= <janne@hess.ooo>
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 <trepetti@cs.columbia.edu>
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 <trepetti@cs.columbia.edu>
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 <bart@magnetophon.nl>
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" <ryantm-bot@ryantm.com>
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 <dev.primeos@gmail.com>
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 <nicolas@normie.dev>
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 <marsam@users.noreply.github.com>
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 <v@anomalous.eu>
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 <v@anomalous.eu>
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 <jesusmartinez93@gmail.com>
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 <samuel@dionne-riel.com>
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 <gnidorah@users.noreply.github.com>
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 <hexa@darmstadt.ccc.de>
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 <git@midchildan.org>
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 <wbutz@cyberfnord.de>
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 <me@cab404.ru>
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" <ryantm-bot@ryantm.com>
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 <wbutz@cyberfnord.de>
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 <wbutz@cyberfnord.de>
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 <robert@roberthensing.nl>
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 <robert@roberthensing.nl>
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 <robert@roberthensing.nl>
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 <nixpkgs/.git>
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}-<feat> 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 <robert@roberthensing.nl>
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 <robert@roberthensing.nl>
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 <robert@roberthensing.nl>
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 <robert@roberthensing.nl>
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 <robert@roberthensing.nl>
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 <lucas@m1cr0man.com>
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 <lucas@m1cr0man.com>
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 <nixpkgs> {},
+ 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?= <mkg20001@gmail.com>
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 <arcnmx@users.noreply.github.com>
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 <sikmir@gmail.com>
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 <worldofpeace@protonmail.ch>
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?= <me@danieldk.eu>
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" <ryantm-bot@ryantm.com>
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 <v.dijk.bas@gmail.com>
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 <layus.on@gmail.com>
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 <worldofpeace@protonmail.ch>
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 <worldofpeace@protonmail.ch>
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 <worldofpeace@protonmail.ch>
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 <worldofpeace@protonmail.ch>
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 <worldofpeace@protonmail.ch>
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 <bas@dfinity.org>
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" <ryantm-bot@ryantm.com>
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" <ryantm-bot@ryantm.com>
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" <ryantm-bot@ryantm.com>
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?= <joerg@thalheim.io>
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 <layus.on@gmail.com>
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" <ryantm-bot@ryantm.com>
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 <dar@xoe.solutions>
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 <ryan@ryantm.com>
Co-authored-by: Travis A. Everett <travis.a.everett@gmail.com>
---
.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 <marsam@users.noreply.github.com>
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 <marsam@users.noreply.github.com>
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 <marsam@users.noreply.github.com>
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" <ryantm-bot@ryantm.com>
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" <ryantm-bot@ryantm.com>
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" <ryantm-bot@ryantm.com>
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" <ryantm-bot@ryantm.com>
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" <ryantm-bot@ryantm.com>
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" <ryantm-bot@ryantm.com>
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" <ryantm-bot@ryantm.com>
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" <ryantm-bot@ryantm.com>
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" <ryantm-bot@ryantm.com>
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" <ryantm-bot@ryantm.com>
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" <ryantm-bot@ryantm.com>
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" <ryantm-bot@ryantm.com>
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" <ryantm-bot@ryantm.com>
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" <ryantm-bot@ryantm.com>
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 <hexa@darmstadt.ccc.de>
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 <volth@volth.com>
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 <dywedir@gra.red>
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" <ryantm-bot@ryantm.com>
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 <nicolai@kellerer.me>
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 <fridh@fridh.nl>
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 <fridh@fridh.nl>
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 <lsix@lancelotsix.com>
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 <fridh@fridh.nl>
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 <bcdarwin@gmail.com>
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 <djanatyn@gmail.com>
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 <djanatyn@gmail.com>
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 <jon@jonafato.com>
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 <drewrisinger@users.noreply.github.com>
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 <luflosi@luflosi.de>
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" <ryantm-bot@ryantm.com>
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" <ryantm-bot@ryantm.com>
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 <nek0@nek0.eu>
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" <github-dev@mail2013.wamser.eu>
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 <georgerw@gmail.com>
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 <dev@felschr.com>
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.
- <option>hashedPassword</option> overrides <option>password</option>.
+ To generate hashed password install <literal>mosquitto</literal>
+ package and use <literal>mosquitto_passwd</literal>.
+ '';
+ };
+
+ 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 <literal>mosquitto</literal>
package and use <literal>mosquitto_passwd</literal>.
'';
@@ -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?= <fabianm88@gmail.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <scottworley@scottworley.com>
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 <Vincent.Laporte@gmail.com>
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 <Vincent.Laporte@gmail.com>
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 <justin.humm@posteo.de>
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 <andreas@rammhold.de>
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 = <derivation /nix/store/q72h2cdcb9zjgiay5gdgzwddjkbjr7xq-qemu-host-cpu-only-for-vm-tests-5.1.0.drv>;
> ...
> (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 <fridh@fridh.nl>
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 <fridh@fridh.nl>
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" <ryantm-bot@ryantm.com>
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" <ryantm-bot@ryantm.com>
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 <mcwitt@gmail.com>
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 <mcwitt@gmail.com>
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 <bensiraphob@gmail.com>
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 <lucas@ransan.tk>
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 <sebastian.nagel@ncoding.at>
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 <<SCRIPT > $out/bin/zsh-autoenv-share
#!${runtimeShell}
- # Run this script to find the fzf shared folder where all the shell
+ # Run this script to find the zsh-autoenv shared folder where all the shell
# integration scripts are living.
echo $out/share/zsh-autoenv
SCRIPT
From ce1bc3c3b00706cbac32891484c45d0b9b015a96 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 14:40:51 +0000
Subject: [PATCH 174/590] gobuster: 3.0.1 -> 3.1.0
---
pkgs/tools/security/gobuster/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/security/gobuster/default.nix b/pkgs/tools/security/gobuster/default.nix
index 6e049917de2c..cc436a16b587 100644
--- a/pkgs/tools/security/gobuster/default.nix
+++ b/pkgs/tools/security/gobuster/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "gobuster";
- version = "3.0.1";
+ version = "3.1.0";
src = fetchFromGitHub {
owner = "OJ";
repo = "gobuster";
rev = "v${version}";
- sha256 = "0q8ighqykh8qyvidnm6az6dc9mp32bbmhkmkqzl1ybbw6paa8pym";
+ sha256 = "0nal2g5c6z46x6337yh0s6mqgnsigp91i7mp1l3sa91p5ihk71wr";
};
- vendorSha256 = "0kr9i2nm5csf3070hwaiss137pfa3088xbw2zigp7aqb2naky036";
+ vendorSha256 = "1isp2jd6k4ppns5zi9irj09090imnc0xp6vcps135ymgp8qg4163";
doCheck = false;
From 7392ef4ccefd02dc486e722aa5cfc1d25b3cc93c Mon Sep 17 00:00:00 2001
From: MrKorner <62303226+MrKorner@users.noreply.github.com>
Date: Tue, 17 Mar 2020 18:37:29 +0100
Subject: [PATCH 175/590] Update default.nix
---
.../xfce/panel-plugins/xfce4-netload-plugin/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix
index 8d258220175b..32644f10b1b7 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix
@@ -11,6 +11,6 @@ mkXfceDerivation {
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
meta = {
- description = "Battery plugin for Xfce panel";
+ description = "Internet load speed plugin for Xfce panel";
};
}
From e8268c7627229a100e8442b69ea8b31e95cabf39 Mon Sep 17 00:00:00 2001
From: MrKorner <62303226+MrKorner@users.noreply.github.com>
Date: Tue, 17 Mar 2020 18:40:37 +0100
Subject: [PATCH 176/590] Update default.nix
---
.../xfce/panel-plugins/xfce4-netload-plugin/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix
index 32644f10b1b7..4ee50a07a34b 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix
@@ -11,6 +11,6 @@ mkXfceDerivation {
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
meta = {
- description = "Internet load speed plugin for Xfce panel";
+ description = "Internet load speed plugin for Xfce4 panel";
};
}
From fdba3f6db0a32a21825ad899e4b2effbebf79a8f Mon Sep 17 00:00:00 2001
From: Guillaume Pagnoux <guillaume.pagnoux@lse.epita.fr>
Date: Fri, 8 Nov 2019 12:09:13 +0100
Subject: [PATCH 177/590] boxfort: unstable-2019-09-19 -> unstable-2019-10-09
Signed-off-by: Guillaume Pagnoux <guillaume.pagnoux@lse.epita.fr>
---
.../development/libraries/boxfort/default.nix | 32 ++++++-------------
1 file changed, 9 insertions(+), 23 deletions(-)
diff --git a/pkgs/development/libraries/boxfort/default.nix b/pkgs/development/libraries/boxfort/default.nix
index fb6e735c46e7..9a4e2c233561 100644
--- a/pkgs/development/libraries/boxfort/default.nix
+++ b/pkgs/development/libraries/boxfort/default.nix
@@ -1,36 +1,25 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config, gettext, libcsptr, dyncall
-, nanomsg, python37Packages }:
+{ stdenv, fetchFromGitHub, meson, ninja, python37Packages }:
stdenv.mkDerivation rec {
- version = "unstable-2019-09-19";
+ version = "unstable-2019-10-09";
pname = "boxfort";
src = fetchFromGitHub {
owner = "Snaipe";
repo = "BoxFort";
- rev = "926bd4ce968592dbbba97ec1bb9aeca3edf29b0d";
- sha256 = "0mzy4f8qij6ckn5578y3l4rni2470pdkjy5xww7ak99l1kh3p3v6";
+ rev = "356f047db08b7344ea7980576b705e65b9fc8772";
+ sha256 = "1p0llz7n0p5gzpvqszmra9p88vnr0j88sp5ixhgbfz89bswg62ss";
};
- enableParallelBuilding = true;
+ nativeBuildInputs = [ meson ninja ];
- nativeBuildInputs = [ cmake pkg-config ];
-
- buildInputs = [
- dyncall
- gettext
- libcsptr
- nanomsg
- ];
+ preConfigure = ''
+ patchShebangs ci/isdir.py
+ '';
checkInputs = with python37Packages; [ cram ];
- cmakeFlags = [ "-DBXF_FORK_RESILIENCE=OFF" ];
-
doCheck = true;
- preCheck = ''
- export LD_LIBRARY_PATH=`pwd`''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
- '';
outputs = [ "dev" "out" ];
@@ -38,10 +27,7 @@ stdenv.mkDerivation rec {
description = "Convenient & cross-platform sandboxing C library";
homepage = "https://github.com/Snaipe/BoxFort";
license = licenses.mit;
- maintainers = with maintainers; [
- thesola10
- Yumasi
- ];
+ maintainers = with maintainers; [ thesola10 Yumasi ];
platforms = platforms.unix;
};
}
From f20b89d1d412d7aac217ab81d20a81ceca3264e2 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 3 Nov 2019 18:50:21 +0000
Subject: [PATCH 178/590] dtc,python.pkgs.libfdt: drop python buildInput
This doesn't seem to be necessary to build the library with
strictDeps = true, or when cross-compiling.
---
pkgs/development/compilers/dtc/default.nix | 1 -
1 file changed, 1 deletion(-)
diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix
index b7fcbe1c611d..0a694e29ee83 100644
--- a/pkgs/development/compilers/dtc/default.nix
+++ b/pkgs/development/compilers/dtc/default.nix
@@ -13,7 +13,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ flex bison pkgconfig which ] ++ lib.optionals pythonSupport [ python swig ];
- buildInputs = lib.optionals pythonSupport [ python ];
postPatch = ''
patchShebangs pylibfdt/
From 1920b371c870f4e939e1e73ee83db9d8b6e0b217 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 14:56:58 +0000
Subject: [PATCH 179/590] golangci-lint: 1.31.0 -> 1.32.0
---
pkgs/development/tools/golangci-lint/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix
index 1eaa00e80864..743247d6014e 100644
--- a/pkgs/development/tools/golangci-lint/default.nix
+++ b/pkgs/development/tools/golangci-lint/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "golangci-lint";
- version = "1.31.0";
+ version = "1.32.0";
src = fetchFromGitHub {
owner = "golangci";
repo = "golangci-lint";
rev = "v${version}";
- sha256 = "10divgsc095jiw7n3gwzikbgvsd0hdwjyv469vq939zm7rqq3acy";
+ sha256 = "157sqpwhb2984yri7w6x6pzp53ql56svv8bvbigcih3syrngxspr";
};
- vendorSha256 = "1pa99jfz6i696x6v06aq56r0kmxmz4khb1hw7pvxds0bn16a4swr";
+ vendorSha256 = "1caf0flmq032azxwyfq6dvhw757nncxigfkf32s2a6g3jmqr1g3y";
doCheck = false;
From b5f396e43ac1279324f1678aaf32f93cc18e07a9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 24 Oct 2020 15:34:55 +0200
Subject: [PATCH 180/590] ocamlPackages.mirage-net: init at 3.0.1
---
.../ocaml-modules/mirage-net/default.nix | 24 +++++++++++++++++++
pkgs/top-level/ocaml-packages.nix | 2 ++
2 files changed, 26 insertions(+)
create mode 100644 pkgs/development/ocaml-modules/mirage-net/default.nix
diff --git a/pkgs/development/ocaml-modules/mirage-net/default.nix b/pkgs/development/ocaml-modules/mirage-net/default.nix
new file mode 100644
index 000000000000..a29727d7ee17
--- /dev/null
+++ b/pkgs/development/ocaml-modules/mirage-net/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchurl, buildDunePackage
+, cstruct, fmt, lwt, macaddr, mirage-device
+}:
+
+buildDunePackage rec {
+ pname = "mirage-net";
+ version = "3.0.1";
+
+ useDune2 = true;
+
+ src = fetchurl {
+ url = "https://github.com/mirage/mirage-net/releases/download/v${version}/mirage-net-v${version}.tbz";
+ sha256 = "0yfvl0fgs7xy5i7kkparaa7a315a2h7kb1z24fmmnwnyaji57dg3";
+ };
+
+ propagatedBuildInputs = [ cstruct fmt lwt macaddr mirage-device ];
+
+ meta = {
+ description = "Network signatures for MirageOS";
+ homepage = "https://github.com/mirage/mirage-net";
+ 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 1508b7504e0c..250329573056 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -565,6 +565,8 @@ let
mirage-kv = callPackage ../development/ocaml-modules/mirage-kv { };
+ mirage-net = callPackage ../development/ocaml-modules/mirage-net { };
+
mirage-protocols = callPackage ../development/ocaml-modules/mirage-protocols { };
mirage-random = callPackage ../development/ocaml-modules/mirage-random { };
From 11eb8167b1a33324da790617369f7e581789012a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 15:03:21 +0000
Subject: [PATCH 181/590] gomuks: 0.2.0 -> 0.2.1
---
.../networking/instant-messengers/gomuks/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
index c98fd9e80406..00134e2597be 100644
--- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gomuks";
- version = "0.2.0";
+ version = "0.2.1";
src = fetchFromGitHub {
owner = "tulir";
repo = pname;
rev = "v" + version;
- sha256 = "0sf1nqwimxqql8wm6763jyc5rclhd4zxgg9gfi0qvg5ccm1r1z5q";
+ sha256 = "0xa4ch4p48w6sd0f4s1sp0hl1w4fvzhff7w2ar19ki0ydy5g368n";
};
- vendorSha256 = "sha256:0n9mwbzjkvlljlns7sby8nb9gm4vj0v4idp1zxv5xssqr5qalihf";
+ vendorSha256 = "1rhvwk8bdbbffhx2d03a8p9jc5c8v3pi7kw1dmyyngz6p7wq1g0x";
doCheck = false;
From ce383a198503a003b309679a6f066ba4a3dfb2be Mon Sep 17 00:00:00 2001
From: Lucas Ransan <lucas@ransan.tk>
Date: Sun, 25 Oct 2020 14:25:44 +0100
Subject: [PATCH 182/590] ssh-chat: 1.9 -> 1.10
---
.../networking/instant-messengers/ssh-chat/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix b/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix
index 5806a269104b..e964c654c708 100644
--- a/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "ssh-chat";
- version = "1.9";
+ version = "1.10";
goPackagePath = "github.com/shazow/ssh-chat";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "shazow";
repo = "ssh-chat";
rev = "v${version}";
- sha256 = "04yszan6a7x9498s80xymf7wd10530yjrxcdw4czbplyhjdigxlg";
+ sha256 = "e4COAyheY+mE5zltR1Ms2OJ3I8iG/N1CZ6D7I9PDW5U=";
};
goDeps = ./deps.nix;
From 254d30d4c95f35d6d0f54c2b1c2a76339ae76de9 Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Sat, 24 Oct 2020 11:23:43 +0200
Subject: [PATCH 183/590] test-driver.py: remove bufsize=1 from Popen calls
According to Python documentation [0], `bufsize=1` is only meaningful in
text mode. As we don't pass in an argument called `universal_newlines`,
`encoding`, `errors` or `text` the file objects aren't opened in text
mode, which means the argument is ignored with a warning in Python 3.8.
line buffering (buffering=1) isn't supported in binary mode,
the default buffer size will be used
This commit removes this warning that appared when using
interactive test driver built with `-A driver`. This is done by
removing `bufsize=1` from Popen calls.
The default parameter when unspecified for `bufsize` is `-1` which
according to the documentation will be interpreted as
`io.DEFAULT_BUFFER_SIZE`. As mentioned by a warning, Python already
uses default buffer size when providing `buffering=1` parameter for
file objects not opened in text mode.
[0]: https://docs.python.org/3/library/subprocess.html#subprocess.Popen
---
nixos/lib/test-driver/test-driver.py | 2 --
1 file changed, 2 deletions(-)
diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py
index 156392ad1e32..68bd35dd98e9 100644
--- a/nixos/lib/test-driver/test-driver.py
+++ b/nixos/lib/test-driver/test-driver.py
@@ -110,7 +110,6 @@ def create_vlan(vlan_nr: str) -> Tuple[str, str, "subprocess.Popen[bytes]", Any]
pty_master, pty_slave = pty.openpty()
vde_process = subprocess.Popen(
["vde_switch", "-s", vde_socket, "--dirmode", "0700"],
- bufsize=1,
stdin=pty_slave,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
@@ -748,7 +747,6 @@ class Machine:
self.process = subprocess.Popen(
self.script,
- bufsize=1,
stdin=subprocess.DEVNULL,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
From 74ae6e12095be00acbd1e17b82629c0c4bcf9903 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 15:38:58 +0000
Subject: [PATCH 184/590] helmfile: 0.131.0 -> 0.132.1
---
pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
index 8cd9a230be88..f8c7ce2254ef 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "helmfile";
- version = "0.131.0";
+ version = "0.132.1";
src = fetchFromGitHub {
owner = "roboll";
repo = "helmfile";
rev = "v${version}";
- sha256 = "1jhmw916acf0i3wji0i1srni90n2rxax95y09h1zszpccw60x4bf";
+ sha256 = "03i9pl3iwqk5az73qm9rxdq8c5nd9l4w3c28yk55bfgpwpnxcwjc";
};
- vendorSha256 = "1r94yc9b57jvpa2mhnla32nxa01rh9s7zf8qjgcpw63hm20mbbgc";
+ vendorSha256 = "0r4p4nwhmxg06qyf86gd2g61l4r1mlpblh4vhsc1shbz9iigykzi";
doCheck = false;
From 96a163601a3ab5462473ceeec4df4d3efc73ebf0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 16:27:37 +0000
Subject: [PATCH 185/590] jackett: 0.16.1757 -> 0.16.1883
---
pkgs/servers/jackett/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 89bf306fefa9..3058ef5a4a62 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "jackett";
- version = "0.16.1757";
+ version = "0.16.1883";
src = fetchurl {
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
- sha256 = "1scf7sh4cpq0drz6jn60l6163g0dcqvp6ifq5gyj3484zwpxmnsf";
+ sha256 = "1l16zzjyvwq6rd4q6dg4m0a81fiw50c7naksa43g3yhv7wg7wfll";
};
nativeBuildInputs = [ makeWrapper ];
From ab0faef05f2d7fa64e048d70bea0f5c8b70e747b Mon Sep 17 00:00:00 2001
From: Maxwell L-T <maxwell.lt@live.com>
Date: Sun, 25 Oct 2020 13:23:50 -0400
Subject: [PATCH 186/590] mullvad-vpn: 2020.5 -> 2020.6
---
pkgs/applications/networking/mullvad-vpn/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix
index aa7aaab29ac2..52adbca18b17 100644
--- a/pkgs/applications/networking/mullvad-vpn/default.nix
+++ b/pkgs/applications/networking/mullvad-vpn/default.nix
@@ -41,11 +41,11 @@ in
stdenv.mkDerivation rec {
pname = "mullvad-vpn";
- version = "2020.5";
+ version = "2020.6";
src = fetchurl {
url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb";
- sha256 = "131z6qlpjwxcn5a62f1f147f2z1xg185jmr0vbin8h0dwa1182vn";
+ sha256 = "0d9rv874avx86jppl1dky0nfq1633as0z8yz3h3f69nhmcbwhlr3";
};
nativeBuildInputs = [
From 665597f50b4c72247a47ce86549bee39884e9580 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 25 Oct 2020 17:29:09 +0100
Subject: [PATCH 187/590] lispPackages: add some more, mainly from Quicklisp
top 100
---
.../quicklisp-to-nix-output/access.nix | 39 +
.../quicklisp-to-nix-output/arnesi.nix | 34 +
.../quicklisp-to-nix-output/cl-dot.nix | 25 +
.../quicklisp-to-nix-output/cl-locale.nix | 37 +
.../quicklisp-to-nix-output/cl-qprint.nix | 28 +
.../quicklisp-to-nix-output/cl-slice.nix | 29 +
.../quicklisp-to-nix-output/clunit.nix | 24 +
.../quicklisp-to-nix-output/djula.nix | 53 +
.../quicklisp-to-nix-output/fare-csv.nix | 24 +
.../quicklisp-to-nix-output/fare-mop.nix | 28 +
.../quicklisp-to-nix-output/gettext.nix | 30 +
.../inferior-shell.nix | 54 +
.../more-conditions.nix | 34 +
.../net-telent-date.nix | 25 +
.../parser-combinators.nix | 30 +
.../parser_dot_common-rules.nix | 34 +
.../quicklisp-to-nix-output/postmodern.nix | 48 +
.../quicklisp-to-nix-output/s-sql.nix | 42 +
.../simple-date-time.nix | 25 +
.../quicklisp-to-nix-output/unix-options.nix | 25 +
.../utilities_dot_print-items.nix | 30 +
.../utilities_dot_print-tree.nix | 31 +
.../quicklisp-to-nix-output/uuid.nix | 29 +
.../xml_dot_location.nix | 47 +
.../quicklisp-to-nix-overrides.nix | 15 +-
.../lisp-modules/quicklisp-to-nix-systems.txt | 106 +-
.../lisp-modules/quicklisp-to-nix.nix | 2888 ++++++++++-------
27 files changed, 2521 insertions(+), 1293 deletions(-)
create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix
create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix
create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix
create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix
create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix
create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix
create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix
create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix
create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix
create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix
create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix
create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix
create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix
create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix
create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix
create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix
create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix
create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix
create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix
create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix
create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix
create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix
create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix
new file mode 100644
index 000000000000..deb0c7f89cb7
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix
@@ -0,0 +1,39 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''access'';
+ version = ''20151218-git'';
+
+ parasites = [ "access-test" ];
+
+ description = ''A library providing functions that unify data-structure access for Common Lisp:
+ access and (setf access)'';
+
+ deps = [ args."alexandria" args."anaphora" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/access/2015-12-18/access-20151218-git.tgz'';
+ sha256 = ''0f4257cxd1rpp46wm2qbnk0ynlc3dli9ib4qbn45hglh8zy7snfl'';
+ };
+
+ packageName = "access";
+
+ asdFilesToKeep = ["access.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM access DESCRIPTION
+ A library providing functions that unify data-structure access for Common Lisp:
+ access and (setf access)
+ SHA256 0f4257cxd1rpp46wm2qbnk0ynlc3dli9ib4qbn45hglh8zy7snfl URL
+ http://beta.quicklisp.org/archive/access/2015-12-18/access-20151218-git.tgz
+ MD5 a6f1eb4a1823b04c6db4fa2dc16d648f NAME access FILENAME access DEPS
+ ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
+ (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre)
+ (NAME cl-unicode FILENAME cl-unicode)
+ (NAME closer-mop FILENAME closer-mop)
+ (NAME flexi-streams FILENAME flexi-streams)
+ (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2)
+ (NAME named-readtables FILENAME named-readtables))
+ DEPENDENCIES
+ (alexandria anaphora cl-interpol cl-ppcre cl-unicode closer-mop
+ flexi-streams iterate lisp-unit2 named-readtables)
+ VERSION 20151218-git SIBLINGS NIL PARASITES (access-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix
new file mode 100644
index 000000000000..97ae196c0f52
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix
@@ -0,0 +1,34 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''arnesi'';
+ version = ''20170403-git'';
+
+ parasites = [ "arnesi/cl-ppcre-extras" "arnesi/slime-extras" ];
+
+ description = ''A bag-of-tools utilities library used to aid in implementing the bese.it toolkit'';
+
+ deps = [ args."alexandria" args."cl-ppcre" args."closer-mop" args."collectors" args."iterate" args."swank" args."symbol-munger" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/arnesi/2017-04-03/arnesi-20170403-git.tgz'';
+ sha256 = ''01kirjpgv5pgbcdxjrnw3ld4jw7wrqm3rgqnxwac4gxaphr2s6q4'';
+ };
+
+ packageName = "arnesi";
+
+ asdFilesToKeep = ["arnesi.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM arnesi DESCRIPTION
+ A bag-of-tools utilities library used to aid in implementing the bese.it toolkit
+ SHA256 01kirjpgv5pgbcdxjrnw3ld4jw7wrqm3rgqnxwac4gxaphr2s6q4 URL
+ http://beta.quicklisp.org/archive/arnesi/2017-04-03/arnesi-20170403-git.tgz
+ MD5 bbb34e1a646b2cc489766690c741d964 NAME arnesi FILENAME arnesi DEPS
+ ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre)
+ (NAME closer-mop FILENAME closer-mop)
+ (NAME collectors FILENAME collectors) (NAME iterate FILENAME iterate)
+ (NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger))
+ DEPENDENCIES
+ (alexandria cl-ppcre closer-mop collectors iterate swank symbol-munger)
+ VERSION 20170403-git SIBLINGS NIL PARASITES
+ (arnesi/cl-ppcre-extras arnesi/slime-extras)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix
new file mode 100644
index 000000000000..53cf2214ed25
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix
@@ -0,0 +1,25 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''cl-dot'';
+ version = ''20200925-git'';
+
+ description = ''Generate Dot Output from Arbitrary Lisp Data'';
+
+ deps = [ args."uiop" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/cl-dot/2020-09-25/cl-dot-20200925-git.tgz'';
+ sha256 = ''01vx4yzasmgswrlyagjr2cz76g906jsijdwikdf8wvxyyq77gkla'';
+ };
+
+ packageName = "cl-dot";
+
+ asdFilesToKeep = ["cl-dot.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM cl-dot DESCRIPTION Generate Dot Output from Arbitrary Lisp Data
+ SHA256 01vx4yzasmgswrlyagjr2cz76g906jsijdwikdf8wvxyyq77gkla URL
+ http://beta.quicklisp.org/archive/cl-dot/2020-09-25/cl-dot-20200925-git.tgz
+ MD5 35c68f431f188d4c1c7604b4b1af220f NAME cl-dot FILENAME cl-dot DEPS
+ ((NAME uiop FILENAME uiop)) DEPENDENCIES (uiop) VERSION 20200925-git
+ SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix
new file mode 100644
index 000000000000..f0d727a633f5
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix
@@ -0,0 +1,37 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''cl-locale'';
+ version = ''20151031-git'';
+
+ description = ''Simple i18n library for Common Lisp'';
+
+ deps = [ args."alexandria" args."anaphora" args."arnesi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."collectors" args."iterate" args."named-readtables" args."symbol-munger" args."trivial-types" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz'';
+ sha256 = ''14j4xazrx2v5cj4q4irfwra0ksvl2l0s7073fimpwc0xqjfsnjpg'';
+ };
+
+ packageName = "cl-locale";
+
+ asdFilesToKeep = ["cl-locale.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM cl-locale DESCRIPTION Simple i18n library for Common Lisp SHA256
+ 14j4xazrx2v5cj4q4irfwra0ksvl2l0s7073fimpwc0xqjfsnjpg URL
+ http://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz
+ MD5 7a8fb3678938af6dc5c9fd6431428aff NAME cl-locale FILENAME cl-locale DEPS
+ ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
+ (NAME arnesi FILENAME arnesi) (NAME cl-annot FILENAME cl-annot)
+ (NAME cl-syntax FILENAME cl-syntax)
+ (NAME cl-syntax-annot FILENAME cl-syntax-annot)
+ (NAME closer-mop FILENAME closer-mop)
+ (NAME collectors FILENAME collectors) (NAME iterate FILENAME iterate)
+ (NAME named-readtables FILENAME named-readtables)
+ (NAME symbol-munger FILENAME symbol-munger)
+ (NAME trivial-types FILENAME trivial-types))
+ DEPENDENCIES
+ (alexandria anaphora arnesi cl-annot cl-syntax cl-syntax-annot closer-mop
+ collectors iterate named-readtables symbol-munger trivial-types)
+ VERSION 20151031-git SIBLINGS (cl-locale-syntax cl-locale-test) PARASITES
+ NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix
new file mode 100644
index 000000000000..1ccf6af5cba4
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix
@@ -0,0 +1,28 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''cl-qprint'';
+ version = ''20150804-git'';
+
+ description = ''Encode and decode quoted-printable encoded strings.'';
+
+ deps = [ args."flexi-streams" args."trivial-gray-streams" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/cl-qprint/2015-08-04/cl-qprint-20150804-git.tgz'';
+ sha256 = ''042nq9airkc4yaqzpmly5iszmkbwfn38wsgi9k361ldf1y54lq28'';
+ };
+
+ packageName = "cl-qprint";
+
+ asdFilesToKeep = ["cl-qprint.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM cl-qprint DESCRIPTION
+ Encode and decode quoted-printable encoded strings. SHA256
+ 042nq9airkc4yaqzpmly5iszmkbwfn38wsgi9k361ldf1y54lq28 URL
+ http://beta.quicklisp.org/archive/cl-qprint/2015-08-04/cl-qprint-20150804-git.tgz
+ MD5 74376a69e0b078724c94cc268f69e0f7 NAME cl-qprint FILENAME cl-qprint DEPS
+ ((NAME flexi-streams FILENAME flexi-streams)
+ (NAME trivial-gray-streams FILENAME trivial-gray-streams))
+ DEPENDENCIES (flexi-streams trivial-gray-streams) VERSION 20150804-git
+ SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix
new file mode 100644
index 000000000000..2c4fd03f94da
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix
@@ -0,0 +1,29 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''cl-slice'';
+ version = ''20171130-git'';
+
+ parasites = [ "cl-slice-tests" ];
+
+ description = ''DSL for array slices in Common Lisp.'';
+
+ deps = [ args."alexandria" args."anaphora" args."clunit" args."let-plus" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/cl-slice/2017-11-30/cl-slice-20171130-git.tgz'';
+ sha256 = ''0nay95qsnck40kdxjgjdii5rcgrdhf880pg9ajmbxilgw84xb2zn'';
+ };
+
+ packageName = "cl-slice";
+
+ asdFilesToKeep = ["cl-slice.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM cl-slice DESCRIPTION DSL for array slices in Common Lisp. SHA256
+ 0nay95qsnck40kdxjgjdii5rcgrdhf880pg9ajmbxilgw84xb2zn URL
+ http://beta.quicklisp.org/archive/cl-slice/2017-11-30/cl-slice-20171130-git.tgz
+ MD5 b83a7a9aa503dc01cba43cf1e494e67d NAME cl-slice FILENAME cl-slice DEPS
+ ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
+ (NAME clunit FILENAME clunit) (NAME let-plus FILENAME let-plus))
+ DEPENDENCIES (alexandria anaphora clunit let-plus) VERSION 20171130-git
+ SIBLINGS NIL PARASITES (cl-slice-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix
new file mode 100644
index 000000000000..7ab00c034463
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix
@@ -0,0 +1,24 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''clunit'';
+ version = ''20171019-git'';
+
+ description = ''CLUnit is a Common Lisp unit testing framework.'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/clunit/2017-10-19/clunit-20171019-git.tgz'';
+ sha256 = ''1rapyh0fbjnksj8j3y6imzya1kw80882w18j0fv9iq1hlp718zs5'';
+ };
+
+ packageName = "clunit";
+
+ asdFilesToKeep = ["clunit.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM clunit DESCRIPTION CLUnit is a Common Lisp unit testing framework.
+ SHA256 1rapyh0fbjnksj8j3y6imzya1kw80882w18j0fv9iq1hlp718zs5 URL
+ http://beta.quicklisp.org/archive/clunit/2017-10-19/clunit-20171019-git.tgz
+ MD5 389017f2f05a6287078ddacd0471817e NAME clunit FILENAME clunit DEPS NIL
+ DEPENDENCIES NIL VERSION 20171019-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix
new file mode 100644
index 000000000000..1b919e63a5f3
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix
@@ -0,0 +1,53 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''djula'';
+ version = ''20201016-git'';
+
+ description = ''An implementation of Django templates for Common Lisp.'';
+
+ deps = [ args."access" args."alexandria" args."anaphora" args."arnesi" args."babel" args."cl-annot" args."cl-interpol" args."cl-locale" args."cl-ppcre" args."cl-slice" args."cl-syntax" args."cl-syntax-annot" args."cl-unicode" args."closer-mop" args."collectors" args."flexi-streams" args."gettext" args."iterate" args."let-plus" args."local-time" args."named-readtables" args."parser-combinators" args."split-sequence" args."symbol-munger" args."trivial-backtrace" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."yacc" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/djula/2020-10-16/djula-20201016-git.tgz'';
+ sha256 = ''09j9wmvs3vgx291p11dclrpwx0dqknazzadikg2320nv7a29zgiy'';
+ };
+
+ packageName = "djula";
+
+ asdFilesToKeep = ["djula.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM djula DESCRIPTION
+ An implementation of Django templates for Common Lisp. SHA256
+ 09j9wmvs3vgx291p11dclrpwx0dqknazzadikg2320nv7a29zgiy URL
+ http://beta.quicklisp.org/archive/djula/2020-10-16/djula-20201016-git.tgz
+ MD5 524843c7ff05d01dcb19a10eb793e967 NAME djula FILENAME djula DEPS
+ ((NAME access FILENAME access) (NAME alexandria FILENAME alexandria)
+ (NAME anaphora FILENAME anaphora) (NAME arnesi FILENAME arnesi)
+ (NAME babel FILENAME babel) (NAME cl-annot FILENAME cl-annot)
+ (NAME cl-interpol FILENAME cl-interpol)
+ (NAME cl-locale FILENAME cl-locale) (NAME cl-ppcre FILENAME cl-ppcre)
+ (NAME cl-slice FILENAME cl-slice) (NAME cl-syntax FILENAME cl-syntax)
+ (NAME cl-syntax-annot FILENAME cl-syntax-annot)
+ (NAME cl-unicode FILENAME cl-unicode)
+ (NAME closer-mop FILENAME closer-mop)
+ (NAME collectors FILENAME collectors)
+ (NAME flexi-streams FILENAME flexi-streams)
+ (NAME gettext FILENAME gettext) (NAME iterate FILENAME iterate)
+ (NAME let-plus FILENAME let-plus) (NAME local-time FILENAME local-time)
+ (NAME named-readtables FILENAME named-readtables)
+ (NAME parser-combinators FILENAME parser-combinators)
+ (NAME split-sequence FILENAME split-sequence)
+ (NAME symbol-munger FILENAME symbol-munger)
+ (NAME trivial-backtrace FILENAME trivial-backtrace)
+ (NAME trivial-features FILENAME trivial-features)
+ (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+ (NAME trivial-types FILENAME trivial-types) (NAME yacc FILENAME yacc))
+ DEPENDENCIES
+ (access alexandria anaphora arnesi babel cl-annot cl-interpol cl-locale
+ cl-ppcre cl-slice cl-syntax cl-syntax-annot cl-unicode closer-mop
+ collectors flexi-streams gettext iterate let-plus local-time
+ named-readtables parser-combinators split-sequence symbol-munger
+ trivial-backtrace trivial-features trivial-gray-streams trivial-types
+ yacc)
+ VERSION 20201016-git SIBLINGS (djula-demo djula-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix
new file mode 100644
index 000000000000..67d75b89dbd2
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix
@@ -0,0 +1,24 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''fare-csv'';
+ version = ''20171227-git'';
+
+ description = ''Robust CSV parser and printer'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/fare-csv/2017-12-27/fare-csv-20171227-git.tgz'';
+ sha256 = ''1hkzg05kq2c4xihsfx4wk1k6mmjq2fw40id8vy0315rpa47a5i7x'';
+ };
+
+ packageName = "fare-csv";
+
+ asdFilesToKeep = ["fare-csv.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM fare-csv DESCRIPTION Robust CSV parser and printer SHA256
+ 1hkzg05kq2c4xihsfx4wk1k6mmjq2fw40id8vy0315rpa47a5i7x URL
+ http://beta.quicklisp.org/archive/fare-csv/2017-12-27/fare-csv-20171227-git.tgz
+ MD5 1d73aaac9fcd86cc5ddb72019722bc2a NAME fare-csv FILENAME fare-csv DEPS
+ NIL DEPENDENCIES NIL VERSION 20171227-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix
new file mode 100644
index 000000000000..a5cec39c15fd
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix
@@ -0,0 +1,28 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''fare-mop'';
+ version = ''20151218-git'';
+
+ description = ''Utilities using the MOP; notably make informative pretty-printing trivial'';
+
+ deps = [ args."closer-mop" args."fare-utils" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/fare-mop/2015-12-18/fare-mop-20151218-git.tgz'';
+ sha256 = ''0bvrwqvacy114xsblrk2w28qk6b484a3p0w14mzl264b3wjrdna9'';
+ };
+
+ packageName = "fare-mop";
+
+ asdFilesToKeep = ["fare-mop.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM fare-mop DESCRIPTION
+ Utilities using the MOP; notably make informative pretty-printing trivial
+ SHA256 0bvrwqvacy114xsblrk2w28qk6b484a3p0w14mzl264b3wjrdna9 URL
+ http://beta.quicklisp.org/archive/fare-mop/2015-12-18/fare-mop-20151218-git.tgz
+ MD5 4721ff62e2ac2c55079cdd4f2a0f6d4a NAME fare-mop FILENAME fare-mop DEPS
+ ((NAME closer-mop FILENAME closer-mop)
+ (NAME fare-utils FILENAME fare-utils))
+ DEPENDENCIES (closer-mop fare-utils) VERSION 20151218-git SIBLINGS NIL
+ PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix
new file mode 100644
index 000000000000..ffc517973d5d
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix
@@ -0,0 +1,30 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''gettext'';
+ version = ''20171130-git'';
+
+ description = ''An pure Common Lisp implementation of gettext runtime. gettext is an internationalization and localization (i18n) system commonly used for writing multilingual programs on Unix-like computer operating systems.'';
+
+ deps = [ args."flexi-streams" args."split-sequence" args."trivial-gray-streams" args."yacc" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz'';
+ sha256 = ''0nb8i66sb5qmpnk6rk2adlr87m322bra0xpirp63872mybd3y6yd'';
+ };
+
+ packageName = "gettext";
+
+ asdFilesToKeep = ["gettext.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM gettext DESCRIPTION
+ An pure Common Lisp implementation of gettext runtime. gettext is an internationalization and localization (i18n) system commonly used for writing multilingual programs on Unix-like computer operating systems.
+ SHA256 0nb8i66sb5qmpnk6rk2adlr87m322bra0xpirp63872mybd3y6yd URL
+ http://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz
+ MD5 d162cb5310db5011c82ef6343fd280ed NAME gettext FILENAME gettext DEPS
+ ((NAME flexi-streams FILENAME flexi-streams)
+ (NAME split-sequence FILENAME split-sequence)
+ (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+ (NAME yacc FILENAME yacc))
+ DEPENDENCIES (flexi-streams split-sequence trivial-gray-streams yacc)
+ VERSION 20171130-git SIBLINGS (gettext-example gettext-tests) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix
new file mode 100644
index 000000000000..2072945f2645
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix
@@ -0,0 +1,54 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''inferior-shell'';
+ version = ''20200925-git'';
+
+ parasites = [ "inferior-shell/test" ];
+
+ description = ''spawn local or remote processes and shell pipes'';
+
+ deps = [ args."alexandria" args."closer-mop" args."fare-mop" args."fare-quasiquote" args."fare-quasiquote-extras" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."hu_dot_dwim_dot_stefil" args."introspect-environment" args."iterate" args."lisp-namespace" args."named-readtables" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/inferior-shell/2020-09-25/inferior-shell-20200925-git.tgz'';
+ sha256 = ''1hykybcmdpcjk0irl4f1lmqc4aawpp1zfvh27qp6mldsibra7l80'';
+ };
+
+ packageName = "inferior-shell";
+
+ asdFilesToKeep = ["inferior-shell.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM inferior-shell DESCRIPTION
+ spawn local or remote processes and shell pipes SHA256
+ 1hykybcmdpcjk0irl4f1lmqc4aawpp1zfvh27qp6mldsibra7l80 URL
+ http://beta.quicklisp.org/archive/inferior-shell/2020-09-25/inferior-shell-20200925-git.tgz
+ MD5 7ca5f15446ef80715758610a930bccba NAME inferior-shell FILENAME
+ inferior-shell DEPS
+ ((NAME alexandria FILENAME alexandria)
+ (NAME closer-mop FILENAME closer-mop) (NAME fare-mop FILENAME fare-mop)
+ (NAME fare-quasiquote FILENAME fare-quasiquote)
+ (NAME fare-quasiquote-extras FILENAME fare-quasiquote-extras)
+ (NAME fare-quasiquote-optima FILENAME fare-quasiquote-optima)
+ (NAME fare-quasiquote-readtable FILENAME fare-quasiquote-readtable)
+ (NAME fare-utils FILENAME fare-utils)
+ (NAME hu.dwim.stefil FILENAME hu_dot_dwim_dot_stefil)
+ (NAME introspect-environment FILENAME introspect-environment)
+ (NAME iterate FILENAME iterate)
+ (NAME lisp-namespace FILENAME lisp-namespace)
+ (NAME named-readtables FILENAME named-readtables)
+ (NAME trivia FILENAME trivia)
+ (NAME trivia.balland2006 FILENAME trivia_dot_balland2006)
+ (NAME trivia.level0 FILENAME trivia_dot_level0)
+ (NAME trivia.level1 FILENAME trivia_dot_level1)
+ (NAME trivia.level2 FILENAME trivia_dot_level2)
+ (NAME trivia.quasiquote FILENAME trivia_dot_quasiquote)
+ (NAME trivia.trivial FILENAME trivia_dot_trivial)
+ (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i))
+ DEPENDENCIES
+ (alexandria closer-mop fare-mop fare-quasiquote fare-quasiquote-extras
+ fare-quasiquote-optima fare-quasiquote-readtable fare-utils hu.dwim.stefil
+ introspect-environment iterate lisp-namespace named-readtables trivia
+ trivia.balland2006 trivia.level0 trivia.level1 trivia.level2
+ trivia.quasiquote trivia.trivial trivial-cltl2 type-i)
+ VERSION 20200925-git SIBLINGS NIL PARASITES (inferior-shell/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix
new file mode 100644
index 000000000000..9a014c416037
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix
@@ -0,0 +1,34 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''more-conditions'';
+ version = ''20180831-git'';
+
+ parasites = [ "more-conditions/test" ];
+
+ description = ''This system provides some generic condition classes in
+ conjunction with support functions and macros.'';
+
+ deps = [ args."alexandria" args."closer-mop" args."fiveam" args."let-plus" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/more-conditions/2018-08-31/more-conditions-20180831-git.tgz'';
+ sha256 = ''0wa989kv3sl977g9szxkx52fdnww6aj2a9i77363f90iq02vj97x'';
+ };
+
+ packageName = "more-conditions";
+
+ asdFilesToKeep = ["more-conditions.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM more-conditions DESCRIPTION
+ This system provides some generic condition classes in
+ conjunction with support functions and macros.
+ SHA256 0wa989kv3sl977g9szxkx52fdnww6aj2a9i77363f90iq02vj97x URL
+ http://beta.quicklisp.org/archive/more-conditions/2018-08-31/more-conditions-20180831-git.tgz
+ MD5 c4797bd3c6c50fba02a6e8164ddafe28 NAME more-conditions FILENAME
+ more-conditions DEPS
+ ((NAME alexandria FILENAME alexandria)
+ (NAME closer-mop FILENAME closer-mop) (NAME fiveam FILENAME fiveam)
+ (NAME let-plus FILENAME let-plus))
+ DEPENDENCIES (alexandria closer-mop fiveam let-plus) VERSION 20180831-git
+ SIBLINGS NIL PARASITES (more-conditions/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix
new file mode 100644
index 000000000000..a9c492795636
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix
@@ -0,0 +1,25 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''net-telent-date'';
+ version = ''net-telent-date_0.42'';
+
+ description = ''System lacks description'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/net-telent-date/2010-10-06/net-telent-date_0.42.tgz'';
+ sha256 = ''06vdlddwi6kx999n1093chwgw0ksbys4j4w9i9zqvw768wxp4li1'';
+ };
+
+ packageName = "net-telent-date";
+
+ asdFilesToKeep = ["net-telent-date.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM net-telent-date DESCRIPTION System lacks description SHA256
+ 06vdlddwi6kx999n1093chwgw0ksbys4j4w9i9zqvw768wxp4li1 URL
+ http://beta.quicklisp.org/archive/net-telent-date/2010-10-06/net-telent-date_0.42.tgz
+ MD5 6fedf40113b2462f7bd273d07950066b NAME net-telent-date FILENAME
+ net-telent-date DEPS NIL DEPENDENCIES NIL VERSION net-telent-date_0.42
+ SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix
new file mode 100644
index 000000000000..5105ec992351
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix
@@ -0,0 +1,30 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''parser-combinators'';
+ version = ''cl-20131111-git'';
+
+ description = ''An implementation of parser combinators for Common Lisp'';
+
+ deps = [ args."alexandria" args."iterate" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz'';
+ sha256 = ''0wg1a7favbwqcxyqcy2zxi4l11qsp4ar9fvddmx960grf2d72lds'';
+ };
+
+ packageName = "parser-combinators";
+
+ asdFilesToKeep = ["parser-combinators.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM parser-combinators DESCRIPTION
+ An implementation of parser combinators for Common Lisp SHA256
+ 0wg1a7favbwqcxyqcy2zxi4l11qsp4ar9fvddmx960grf2d72lds URL
+ http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz
+ MD5 25ad9b1459901738a6394422a41b8fec NAME parser-combinators FILENAME
+ parser-combinators DEPS
+ ((NAME alexandria FILENAME alexandria) (NAME iterate FILENAME iterate))
+ DEPENDENCIES (alexandria iterate) VERSION cl-20131111-git SIBLINGS
+ (parser-combinators-cl-ppcre parser-combinators-debug
+ parser-combinators-tests)
+ PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix
new file mode 100644
index 000000000000..ee6532261c06
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix
@@ -0,0 +1,34 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''parser_dot_common-rules'';
+ version = ''20200715-git'';
+
+ parasites = [ "parser.common-rules/test" ];
+
+ description = ''Provides common parsing rules that are useful in many grammars.'';
+
+ deps = [ args."alexandria" args."anaphora" args."esrap" args."fiveam" args."let-plus" args."split-sequence" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz'';
+ sha256 = ''17nw0shhb8079b26ldwpfxggkzs6ysfqm4s4nr1rfhba9mkvxdxy'';
+ };
+
+ packageName = "parser.common-rules";
+
+ asdFilesToKeep = ["parser.common-rules.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM parser.common-rules DESCRIPTION
+ Provides common parsing rules that are useful in many grammars. SHA256
+ 17nw0shhb8079b26ldwpfxggkzs6ysfqm4s4nr1rfhba9mkvxdxy URL
+ http://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz
+ MD5 6391d962ae6fc13cc57312de013504c5 NAME parser.common-rules FILENAME
+ parser_dot_common-rules DEPS
+ ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
+ (NAME esrap FILENAME esrap) (NAME fiveam FILENAME fiveam)
+ (NAME let-plus FILENAME let-plus)
+ (NAME split-sequence FILENAME split-sequence))
+ DEPENDENCIES (alexandria anaphora esrap fiveam let-plus split-sequence)
+ VERSION 20200715-git SIBLINGS (parser.common-rules.operators) PARASITES
+ (parser.common-rules/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
new file mode 100644
index 000000000000..7dc27566bca4
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
@@ -0,0 +1,48 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''postmodern'';
+ version = ''20201016-git'';
+
+ parasites = [ "postmodern/tests" ];
+
+ description = ''PostgreSQL programming API'';
+
+ deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-postgres_slash_tests" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."fiveam" args."flexi-streams" args."global-vars" args."ironclad" args."md5" args."s-sql" args."s-sql_slash_tests" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."uax-15" args."usocket" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz'';
+ sha256 = ''1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n'';
+ };
+
+ packageName = "postmodern";
+
+ asdFilesToKeep = ["postmodern.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM postmodern DESCRIPTION PostgreSQL programming API SHA256
+ 1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n URL
+ http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz
+ MD5 f61e827d7e7ba023f6fbc7c2667de4c8 NAME postmodern FILENAME postmodern
+ DEPS
+ ((NAME alexandria FILENAME alexandria)
+ (NAME bordeaux-threads FILENAME bordeaux-threads)
+ (NAME cl-base64 FILENAME cl-base64)
+ (NAME cl-postgres FILENAME cl-postgres)
+ (NAME cl-postgres/tests FILENAME cl-postgres_slash_tests)
+ (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unicode FILENAME cl-unicode)
+ (NAME closer-mop FILENAME closer-mop) (NAME fiveam FILENAME fiveam)
+ (NAME flexi-streams FILENAME flexi-streams)
+ (NAME global-vars FILENAME global-vars) (NAME ironclad FILENAME ironclad)
+ (NAME md5 FILENAME md5) (NAME s-sql FILENAME s-sql)
+ (NAME s-sql/tests FILENAME s-sql_slash_tests)
+ (NAME simple-date FILENAME simple-date)
+ (NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue)
+ (NAME split-sequence FILENAME split-sequence)
+ (NAME uax-15 FILENAME uax-15) (NAME usocket FILENAME usocket))
+ DEPENDENCIES
+ (alexandria bordeaux-threads cl-base64 cl-postgres cl-postgres/tests
+ cl-ppcre cl-unicode closer-mop fiveam flexi-streams global-vars ironclad
+ md5 s-sql s-sql/tests simple-date simple-date/postgres-glue split-sequence
+ uax-15 usocket)
+ VERSION 20201016-git SIBLINGS (cl-postgres s-sql simple-date) PARASITES
+ (postmodern/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix
new file mode 100644
index 000000000000..1f896dc4158b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix
@@ -0,0 +1,42 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''s-sql'';
+ version = ''postmodern-20201016-git'';
+
+ parasites = [ "s-sql/tests" ];
+
+ description = ''Lispy DSL for SQL'';
+
+ deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-postgres_slash_tests" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."fiveam" args."global-vars" args."ironclad" args."md5" args."postmodern" args."split-sequence" args."uax-15" args."usocket" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz'';
+ sha256 = ''1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n'';
+ };
+
+ packageName = "s-sql";
+
+ asdFilesToKeep = ["s-sql.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM s-sql DESCRIPTION Lispy DSL for SQL SHA256
+ 1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n URL
+ http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz
+ MD5 f61e827d7e7ba023f6fbc7c2667de4c8 NAME s-sql FILENAME s-sql DEPS
+ ((NAME alexandria FILENAME alexandria)
+ (NAME bordeaux-threads FILENAME bordeaux-threads)
+ (NAME cl-base64 FILENAME cl-base64)
+ (NAME cl-postgres FILENAME cl-postgres)
+ (NAME cl-postgres/tests FILENAME cl-postgres_slash_tests)
+ (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unicode FILENAME cl-unicode)
+ (NAME closer-mop FILENAME closer-mop) (NAME fiveam FILENAME fiveam)
+ (NAME global-vars FILENAME global-vars) (NAME ironclad FILENAME ironclad)
+ (NAME md5 FILENAME md5) (NAME postmodern FILENAME postmodern)
+ (NAME split-sequence FILENAME split-sequence)
+ (NAME uax-15 FILENAME uax-15) (NAME usocket FILENAME usocket))
+ DEPENDENCIES
+ (alexandria bordeaux-threads cl-base64 cl-postgres cl-postgres/tests
+ cl-ppcre cl-unicode closer-mop fiveam global-vars ironclad md5 postmodern
+ split-sequence uax-15 usocket)
+ VERSION postmodern-20201016-git SIBLINGS
+ (cl-postgres postmodern simple-date) PARASITES (s-sql/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix
new file mode 100644
index 000000000000..1f2759cf388e
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix
@@ -0,0 +1,25 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''simple-date-time'';
+ version = ''20160421-git'';
+
+ description = ''date and time library for common lisp'';
+
+ deps = [ args."cl-ppcre" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/simple-date-time/2016-04-21/simple-date-time-20160421-git.tgz'';
+ sha256 = ''1db9n7pspxkqkzz12829a1lp7v4ghrnlb7g3wh04yz6m224d3i4h'';
+ };
+
+ packageName = "simple-date-time";
+
+ asdFilesToKeep = ["simple-date-time.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM simple-date-time DESCRIPTION date and time library for common lisp
+ SHA256 1db9n7pspxkqkzz12829a1lp7v4ghrnlb7g3wh04yz6m224d3i4h URL
+ http://beta.quicklisp.org/archive/simple-date-time/2016-04-21/simple-date-time-20160421-git.tgz
+ MD5 a5b1e4af539646723dafacbc8cf732a0 NAME simple-date-time FILENAME
+ simple-date-time DEPS ((NAME cl-ppcre FILENAME cl-ppcre)) DEPENDENCIES
+ (cl-ppcre) VERSION 20160421-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix
new file mode 100644
index 000000000000..7243d5a17ed0
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix
@@ -0,0 +1,25 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''unix-options'';
+ version = ''20151031-git'';
+
+ description = ''Easy to use command line option parser'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/unix-options/2015-10-31/unix-options-20151031-git.tgz'';
+ sha256 = ''0c9vbvvyx5qwvns87624gzxjcbdkbkcwssg29cxjfv3ci3qwqcd5'';
+ };
+
+ packageName = "unix-options";
+
+ asdFilesToKeep = ["unix-options.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM unix-options DESCRIPTION Easy to use command line option parser
+ SHA256 0c9vbvvyx5qwvns87624gzxjcbdkbkcwssg29cxjfv3ci3qwqcd5 URL
+ http://beta.quicklisp.org/archive/unix-options/2015-10-31/unix-options-20151031-git.tgz
+ MD5 3bbdeafbef3e7a2e94b9756bf173f636 NAME unix-options FILENAME
+ unix-options DEPS NIL DEPENDENCIES NIL VERSION 20151031-git SIBLINGS NIL
+ PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix
new file mode 100644
index 000000000000..b672d0c2ec58
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix
@@ -0,0 +1,30 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''utilities_dot_print-items'';
+ version = ''20190813-git'';
+
+ parasites = [ "utilities.print-items/test" ];
+
+ description = ''A protocol for flexible and composable printing.'';
+
+ deps = [ args."alexandria" args."fiveam" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/utilities.print-items/2019-08-13/utilities.print-items-20190813-git.tgz'';
+ sha256 = ''12l4kzz621qfcg8p5qzyxp4n4hh9wdlpiziykwb4c80g32rdwkc2'';
+ };
+
+ packageName = "utilities.print-items";
+
+ asdFilesToKeep = ["utilities.print-items.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM utilities.print-items DESCRIPTION
+ A protocol for flexible and composable printing. SHA256
+ 12l4kzz621qfcg8p5qzyxp4n4hh9wdlpiziykwb4c80g32rdwkc2 URL
+ http://beta.quicklisp.org/archive/utilities.print-items/2019-08-13/utilities.print-items-20190813-git.tgz
+ MD5 0f26580bb5d3587ed1815f70976b2a0a NAME utilities.print-items FILENAME
+ utilities_dot_print-items DEPS
+ ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam))
+ DEPENDENCIES (alexandria fiveam) VERSION 20190813-git SIBLINGS NIL
+ PARASITES (utilities.print-items/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix
new file mode 100644
index 000000000000..80ff6d9ff768
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix
@@ -0,0 +1,31 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''utilities_dot_print-tree'';
+ version = ''20200325-git'';
+
+ parasites = [ "utilities.print-tree/test" ];
+
+ description = ''This system provides simple facilities for printing tree structures.'';
+
+ deps = [ args."alexandria" args."fiveam" args."uiop" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/utilities.print-tree/2020-03-25/utilities.print-tree-20200325-git.tgz'';
+ sha256 = ''1nam8g2ppzkzpkwwhmil9y68is43ljpvc7hd64zxp4zsaqab5dww'';
+ };
+
+ packageName = "utilities.print-tree";
+
+ asdFilesToKeep = ["utilities.print-tree.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM utilities.print-tree DESCRIPTION
+ This system provides simple facilities for printing tree structures. SHA256
+ 1nam8g2ppzkzpkwwhmil9y68is43ljpvc7hd64zxp4zsaqab5dww URL
+ http://beta.quicklisp.org/archive/utilities.print-tree/2020-03-25/utilities.print-tree-20200325-git.tgz
+ MD5 618bf5b42c415a44a1566f4f96a2c69a NAME utilities.print-tree FILENAME
+ utilities_dot_print-tree DEPS
+ ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam)
+ (NAME uiop FILENAME uiop))
+ DEPENDENCIES (alexandria fiveam uiop) VERSION 20200325-git SIBLINGS NIL
+ PARASITES (utilities.print-tree/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix
new file mode 100644
index 000000000000..43ae799961db
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix
@@ -0,0 +1,29 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''uuid'';
+ version = ''20200715-git'';
+
+ description = ''UUID Generation'';
+
+ deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."trivial-utf-8" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/uuid/2020-07-15/uuid-20200715-git.tgz'';
+ sha256 = ''1ymir6hgax1vbbcgyprnwbsx224ih03a55v10l35xridwyzhzrx0'';
+ };
+
+ packageName = "uuid";
+
+ asdFilesToKeep = ["uuid.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM uuid DESCRIPTION UUID Generation SHA256
+ 1ymir6hgax1vbbcgyprnwbsx224ih03a55v10l35xridwyzhzrx0 URL
+ http://beta.quicklisp.org/archive/uuid/2020-07-15/uuid-20200715-git.tgz MD5
+ e550de5e4e0f8cc9dc92aff0b488a991 NAME uuid FILENAME uuid DEPS
+ ((NAME alexandria FILENAME alexandria)
+ (NAME bordeaux-threads FILENAME bordeaux-threads)
+ (NAME ironclad FILENAME ironclad)
+ (NAME trivial-utf-8 FILENAME trivial-utf-8))
+ DEPENDENCIES (alexandria bordeaux-threads ironclad trivial-utf-8) VERSION
+ 20200715-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix
new file mode 100644
index 000000000000..35854cd6b96c
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix
@@ -0,0 +1,47 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''xml_dot_location'';
+ version = ''20200325-git'';
+
+ parasites = [ "xml.location/test" ];
+
+ description = ''This system provides a convenient interface for
+ manipulating XML data. It is inspired by the xmltio library.'';
+
+ deps = [ args."alexandria" args."anaphora" args."babel" args."cl-ppcre" args."closer-mop" args."closure-common" args."cxml" args."cxml-stp" args."iterate" args."let-plus" args."lift" args."more-conditions" args."parse-number" args."puri" args."split-sequence" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz'';
+ sha256 = ''0wfccj1p1al0w9pc5rhxpsvm3wb2lr5fc4cfjyg751pwsasjikwx'';
+ };
+
+ packageName = "xml.location";
+
+ asdFilesToKeep = ["xml.location.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM xml.location DESCRIPTION
+ This system provides a convenient interface for
+ manipulating XML data. It is inspired by the xmltio library.
+ SHA256 0wfccj1p1al0w9pc5rhxpsvm3wb2lr5fc4cfjyg751pwsasjikwx URL
+ http://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz
+ MD5 90cf4fd2450ba562c7f9657391dacb1d NAME xml.location FILENAME
+ xml_dot_location DEPS
+ ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
+ (NAME babel FILENAME babel) (NAME cl-ppcre FILENAME cl-ppcre)
+ (NAME closer-mop FILENAME closer-mop)
+ (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml)
+ (NAME cxml-stp FILENAME cxml-stp) (NAME iterate FILENAME iterate)
+ (NAME let-plus FILENAME let-plus) (NAME lift FILENAME lift)
+ (NAME more-conditions FILENAME more-conditions)
+ (NAME parse-number FILENAME parse-number) (NAME puri FILENAME puri)
+ (NAME split-sequence FILENAME split-sequence)
+ (NAME trivial-features FILENAME trivial-features)
+ (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+ (NAME xpath FILENAME xpath) (NAME yacc FILENAME yacc))
+ DEPENDENCIES
+ (alexandria anaphora babel cl-ppcre closer-mop closure-common cxml cxml-stp
+ iterate let-plus lift more-conditions parse-number puri split-sequence
+ trivial-features trivial-gray-streams xpath yacc)
+ VERSION 20200325-git SIBLINGS (xml.location-and-local-time) PARASITES
+ (xml.location/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 3a92bd267147..96d5867a3b30 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -185,9 +185,18 @@ $out/lib/common-lisp/query-fs"
parasites = pkgs.lib.filter (x: x!= "buildnode-test") x.parasites;
};
postmodern = x: {
- overrides = y : (x.overrides y) // {
- meta.broken = true; # 2018-04-10
- };
+ asdFilesToKeep = (x.asdFilesToKeep or []) ++ ["postmodern.asd" "simple-date.asd"];
+ parasites = (pkgs.lib.filter (x: x!= "postmodern/tests") x.parasites) ++
+ ["simple-date/postgres-glue"];
+ deps = pkgs.lib.filter
+ (x: x.name != quicklisp-to-nix-packages.simple-date.name)
+ x.deps;
+ };
+ s-sql = x: {
+ parasites = pkgs.lib.filter (x: x!= "s-sql/tests") x.parasites;
+ deps = pkgs.lib.filter
+ (x: x.name != quicklisp-to-nix-packages.postmodern.name)
+ x.deps;
};
split-sequence = x: {
overrides = y: (x.overrides y) // {
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index bec69e3a05d3..52d626888a3a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -1,6 +1,9 @@
-cl-prevalence
3bmd
+access
+acclimation
alexandria
+anaphora
+arnesi
array-utils
asdf-system-connections
babel
@@ -9,119 +12,163 @@ bordeaux-threads
caveman
cffi
cffi-grovel
+chanl
chipz
+chunga
circular-streams
-cl+ssl
+clack
+clack-v1-compat
+cl-annot
cl-ansi-text
cl-async
cl-async-base
cl-async-repl
cl-async-ssl
cl-base64
+cl-cffi-gtk
cl-cli
cl-colors
+cl-containers
cl-cookie
cl-css
cl-csv
cl-dbi
+cl-dot
cl-emb
+cl-fad
cl-fuse
cl-fuse-meta-fs
cl-hooks
-cl-html-parse
cl-html5-parser
+cl-html-parse
+cl-interpol
cl-jpeg
cl-json
cl-l10n
cl-libuv
+cl-locale
cl-mysql
+closer-mop
+closure-common
+closure-html
cl-paths-ttf
cl-pdf
cl-ppcre
cl-ppcre-template
cl-ppcre-unicode
+cl-prevalence
cl-protobufs
+cl-qprint
cl-reexport
+cl-slice
cl-smtp
-cl-syntax-annot
-cl-syntax-anonfun
-cl-syntax-markup
-cl-test-more
-cl-typesetting
-cl-unicode
-cl-unification
-cl-utilities
-cl-vectors
-cl-who
-clack
-clack-v1-compat
-closer-mop
-closure-html
clsql
clsql-postgresql
clsql-postgresql-socket
clsql-sqlite3
clss
+cl+ssl
+cl-store
+cl-syntax
+cl-syntax-annot
+cl-syntax-anonfun
+cl-syntax-markup
+cl-test-more
+cl-typesetting
+clump
+cl-unicode
+cl-unification
+cl-utilities
+cl-vectors
+cl-webkit2
+cl-who
clx
+collectors
command-line-arguments
css-lite
css-selectors
css-selectors-simple-tree
css-selectors-stp
cxml
+cxml-stp
dbd-mysql
dbd-postgres
dbd-sqlite3
dbus
dexador
+djula
documentation-utils
drakma
+enchant
esrap
esrap-peg
external-program
+fare-csv
+fare-mop
+fare-quasiquote
+fare-utils
fast-http
fast-io
fiveam
flexi-streams
form-fiddle
fset
+gettext
http-body
hu.dwim.asdf
+hu.dwim.defclass-star
hunchentoot
idna
ieee-floats
+inferior-shell
iolib
ironclad
iterate
+jonathan
lack
let-plus
lev
lfarm-client
lfarm-server
lfarm-ssl
+lift
lisp-namespace
local-time
log4cl
lparallel
lquery
marshal
+md5
+metabang-bind
+metatilities-base
misc-extensions
mk-string-metrics
+moptilities
+more-conditions
mt19937
+named-readtables
+net-telent-date
nibbles
optima
+osicat
parenscript
+parse-number
+parser-combinators
+parser.common-rules
pcall
plump
+postmodern
proc-parse
prove
-prove
prove-asdf
+puri
query-fs
quri
+rfc2388
salza2
serapeum
simple-date
+simple-date-time
smart-buffer
split-sequence
sqlite
@@ -130,32 +177,31 @@ str
stumpwm
swank
swap-bytes
+symbol-munger
trivia
trivial-backtrace
trivial-clipboard
+trivial-features
+trivial-garbage
+trivial-gray-streams
trivial-indent
+trivial-main-thread
trivial-mimes
+trivial-package-local-nicknames
trivial-types
trivial-utf-8
uffi
+unix-options
unix-opts
usocket
+utilities.print-items
+utilities.print-tree
+uuid
woo
wookie
xembed
xkeyboard
+xml.location
xmls
xsubseq
yason
-chanl
-cl-containers
-moptilities
-osicat
-trivial-package-local-nicknames
-cl-cffi-gtk
-enchant
-trivial-main-thread
-cl-webkit2
-acclimation
-clump
-hu.dwim.defclass-star
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 7fcd2d6a355f..11244ec84a6d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -48,15 +48,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date";
-
-
- "xpath_slash_test" = quicklisp-to-nix-packages."xpath";
-
-
- "cxml_slash_test" = quicklisp-to-nix-packages."cxml";
-
-
"dbi-test" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."dbi-test" or (x: {}))
@@ -74,14 +65,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "unit-test" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."unit-test" or (x: {}))
- (import ./quicklisp-to-nix-output/unit-test.nix {
- inherit fetchurl;
- }));
-
-
"clunit2" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clunit2" or (x: {}))
@@ -90,6 +73,553 @@ let quicklisp-to-nix-packages = rec {
}));
+ "mgl-pax" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."mgl-pax" or (x: {}))
+ (import ./quicklisp-to-nix-output/mgl-pax.nix {
+ inherit fetchurl;
+ "_3bmd" = quicklisp-to-nix-packages."_3bmd";
+ "_3bmd-ext-code-blocks" = quicklisp-to-nix-packages."_3bmd-ext-code-blocks";
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "babel" = quicklisp-to-nix-packages."babel";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+ "colorize" = quicklisp-to-nix-packages."colorize";
+ "esrap" = quicklisp-to-nix-packages."esrap";
+ "html-encode" = quicklisp-to-nix-packages."html-encode";
+ "ironclad" = quicklisp-to-nix-packages."ironclad";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+ "pythonic-string-reader" = quicklisp-to-nix-packages."pythonic-string-reader";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "swank" = quicklisp-to-nix-packages."swank";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ }));
+
+
+ "simple-tasks" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."simple-tasks" or (x: {}))
+ (import ./quicklisp-to-nix-output/simple-tasks.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "array-utils" = quicklisp-to-nix-packages."array-utils";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "dissect" = quicklisp-to-nix-packages."dissect";
+ }));
+
+
+ "cl-change-case" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-change-case" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-change-case.nix {
+ inherit fetchurl;
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "cl-ppcre-unicode" = quicklisp-to-nix-packages."cl-ppcre-unicode";
+ "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
+ "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ }));
+
+
+ "trivial-macroexpand-all" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivial-macroexpand-all" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivial-macroexpand-all.nix {
+ inherit fetchurl;
+ }));
+
+
+ "trivial-file-size" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivial-file-size" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivial-file-size.nix {
+ inherit fetchurl;
+ "fiveam" = quicklisp-to-nix-packages."fiveam";
+ "uiop" = quicklisp-to-nix-packages."uiop";
+ }));
+
+
+ "parse-declarations-1_dot_0" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."parse-declarations-1_dot_0" or (x: {}))
+ (import ./quicklisp-to-nix-output/parse-declarations-1_dot_0.nix {
+ inherit fetchurl;
+ }));
+
+
+ "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date";
+
+
+ "s-sql_slash_tests" = quicklisp-to-nix-packages."s-sql";
+
+
+ "s-sql" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."s-sql" or (x: {}))
+ (import ./quicklisp-to-nix-output/s-sql.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+ "cl-postgres" = quicklisp-to-nix-packages."cl-postgres";
+ "cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres_slash_tests";
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "fiveam" = quicklisp-to-nix-packages."fiveam";
+ "global-vars" = quicklisp-to-nix-packages."global-vars";
+ "ironclad" = quicklisp-to-nix-packages."ironclad";
+ "md5" = quicklisp-to-nix-packages."md5";
+ "postmodern" = quicklisp-to-nix-packages."postmodern";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "uax-15" = quicklisp-to-nix-packages."uax-15";
+ "usocket" = quicklisp-to-nix-packages."usocket";
+ }));
+
+
+ "global-vars" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."global-vars" or (x: {}))
+ (import ./quicklisp-to-nix-output/global-vars.nix {
+ inherit fetchurl;
+ }));
+
+
+ "cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres";
+
+
+ "stefil" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."stefil" or (x: {}))
+ (import ./quicklisp-to-nix-output/stefil.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "iterate" = quicklisp-to-nix-packages."iterate";
+ "metabang-bind" = quicklisp-to-nix-packages."metabang-bind";
+ "swank" = quicklisp-to-nix-packages."swank";
+ }));
+
+
+ "lfarm-common" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."lfarm-common" or (x: {}))
+ (import ./quicklisp-to-nix-output/lfarm-common.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "cl-store" = quicklisp-to-nix-packages."cl-store";
+ "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+ "usocket" = quicklisp-to-nix-packages."usocket";
+ }));
+
+
+ "iolib_dot_grovel" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."iolib_dot_grovel" or (x: {}))
+ (import ./quicklisp-to-nix-output/iolib_dot_grovel.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "babel" = quicklisp-to-nix-packages."babel";
+ "cffi" = quicklisp-to-nix-packages."cffi";
+ "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf";
+ "iolib_dot_base" = quicklisp-to-nix-packages."iolib_dot_base";
+ "iolib_dot_common-lisp" = quicklisp-to-nix-packages."iolib_dot_common-lisp";
+ "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ "uiop" = quicklisp-to-nix-packages."uiop";
+ }));
+
+
+ "iolib_dot_conf" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."iolib_dot_conf" or (x: {}))
+ (import ./quicklisp-to-nix-output/iolib_dot_conf.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf";
+ }));
+
+
+ "iolib_dot_common-lisp" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."iolib_dot_common-lisp" or (x: {}))
+ (import ./quicklisp-to-nix-output/iolib_dot_common-lisp.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf";
+ "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf";
+ }));
+
+
+ "iolib_dot_base" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."iolib_dot_base" or (x: {}))
+ (import ./quicklisp-to-nix-output/iolib_dot_base.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf";
+ "iolib_dot_common-lisp" = quicklisp-to-nix-packages."iolib_dot_common-lisp";
+ "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ }));
+
+
+ "iolib_dot_asdf" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."iolib_dot_asdf" or (x: {}))
+ (import ./quicklisp-to-nix-output/iolib_dot_asdf.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ }));
+
+
+ "type-i" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."type-i" or (x: {}))
+ (import ./quicklisp-to-nix-output/type-i.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "introspect-environment" = quicklisp-to-nix-packages."introspect-environment";
+ "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
+ "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
+ "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
+ "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
+ "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
+ "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
+ }));
+
+
+ "trivial-cltl2" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivial-cltl2" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivial-cltl2.nix {
+ inherit fetchurl;
+ }));
+
+
+ "trivia_dot_trivial" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivia_dot_trivial" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivia_dot_trivial.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
+ "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
+ "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
+ "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
+ "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
+ }));
+
+
+ "trivia_dot_quasiquote" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivia_dot_quasiquote" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivia_dot_quasiquote.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote";
+ "fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable";
+ "fare-utils" = quicklisp-to-nix-packages."fare-utils";
+ "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+ "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
+ "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
+ "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
+ "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
+ "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
+ }));
+
+
+ "trivia_dot_level2" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivia_dot_level2" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivia_dot_level2.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
+ "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
+ "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
+ "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
+ }));
+
+
+ "trivia_dot_level1" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivia_dot_level1" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivia_dot_level1.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
+ }));
+
+
+ "trivia_dot_level0" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivia_dot_level0" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivia_dot_level0.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ }));
+
+
+ "trivia_dot_balland2006" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivia_dot_balland2006" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivia_dot_balland2006.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "introspect-environment" = quicklisp-to-nix-packages."introspect-environment";
+ "iterate" = quicklisp-to-nix-packages."iterate";
+ "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
+ "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
+ "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
+ "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
+ "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
+ "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
+ "type-i" = quicklisp-to-nix-packages."type-i";
+ }));
+
+
+ "introspect-environment" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."introspect-environment" or (x: {}))
+ (import ./quicklisp-to-nix-output/introspect-environment.nix {
+ inherit fetchurl;
+ }));
+
+
+ "fare-quasiquote-readtable" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."fare-quasiquote-readtable" or (x: {}))
+ (import ./quicklisp-to-nix-output/fare-quasiquote-readtable.nix {
+ inherit fetchurl;
+ "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote";
+ "fare-utils" = quicklisp-to-nix-packages."fare-utils";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+ }));
+
+
+ "fare-quasiquote-optima" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."fare-quasiquote-optima" or (x: {}))
+ (import ./quicklisp-to-nix-output/fare-quasiquote-optima.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote";
+ "fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable";
+ "fare-utils" = quicklisp-to-nix-packages."fare-utils";
+ "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+ "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
+ "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
+ "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
+ "trivia_dot_quasiquote" = quicklisp-to-nix-packages."trivia_dot_quasiquote";
+ "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
+ "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
+ }));
+
+
+ "fare-quasiquote-extras" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."fare-quasiquote-extras" or (x: {}))
+ (import ./quicklisp-to-nix-output/fare-quasiquote-extras.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote";
+ "fare-quasiquote-optima" = quicklisp-to-nix-packages."fare-quasiquote-optima";
+ "fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable";
+ "fare-utils" = quicklisp-to-nix-packages."fare-utils";
+ "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+ "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
+ "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
+ "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
+ "trivia_dot_quasiquote" = quicklisp-to-nix-packages."trivia_dot_quasiquote";
+ "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
+ "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
+ }));
+
+
+ "net_dot_didierverna_dot_asdf-flv" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."net_dot_didierverna_dot_asdf-flv" or (x: {}))
+ (import ./quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix {
+ inherit fetchurl;
+ }));
+
+
+ "cl-xmlspam" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-xmlspam" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-xmlspam.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "babel" = quicklisp-to-nix-packages."babel";
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "closure-common" = quicklisp-to-nix-packages."closure-common";
+ "cxml" = quicklisp-to-nix-packages."cxml";
+ "puri" = quicklisp-to-nix-packages."puri";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+ }));
+
+
+ "asdf-package-system" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."asdf-package-system" or (x: {}))
+ (import ./quicklisp-to-nix-output/asdf-package-system.nix {
+ inherit fetchurl;
+ }));
+
+
+ "uax-15" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."uax-15" or (x: {}))
+ (import ./quicklisp-to-nix-output/uax-15.nix {
+ inherit fetchurl;
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "fiveam" = quicklisp-to-nix-packages."fiveam";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "uiop" = quicklisp-to-nix-packages."uiop";
+ }));
+
+
+ "cl-postgres" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-postgres" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-postgres.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "fiveam" = quicklisp-to-nix-packages."fiveam";
+ "ironclad" = quicklisp-to-nix-packages."ironclad";
+ "md5" = quicklisp-to-nix-packages."md5";
+ "simple-date" = quicklisp-to-nix-packages."simple-date";
+ "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date_slash_postgres-glue";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "uax-15" = quicklisp-to-nix-packages."uax-15";
+ "usocket" = quicklisp-to-nix-packages."usocket";
+ }));
+
+
+ "xpath_slash_test" = quicklisp-to-nix-packages."xpath";
+
+
+ "cxml_slash_test" = quicklisp-to-nix-packages."cxml";
+
+
+ "xpath" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."xpath" or (x: {}))
+ (import ./quicklisp-to-nix-output/xpath.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "babel" = quicklisp-to-nix-packages."babel";
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "closure-common" = quicklisp-to-nix-packages."closure-common";
+ "cxml" = quicklisp-to-nix-packages."cxml";
+ "parse-number" = quicklisp-to-nix-packages."parse-number";
+ "puri" = quicklisp-to-nix-packages."puri";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+ "yacc" = quicklisp-to-nix-packages."yacc";
+ }));
+
+
+ "yacc" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."yacc" or (x: {}))
+ (import ./quicklisp-to-nix-output/yacc.nix {
+ inherit fetchurl;
+ }));
+
+
+ "buildnode-xhtml" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."buildnode-xhtml" or (x: {}))
+ (import ./quicklisp-to-nix-output/buildnode-xhtml.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "babel" = quicklisp-to-nix-packages."babel";
+ "buildnode" = quicklisp-to-nix-packages."buildnode";
+ "cl-interpol" = quicklisp-to-nix-packages."cl-interpol";
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "closure-common" = quicklisp-to-nix-packages."closure-common";
+ "closure-html" = quicklisp-to-nix-packages."closure-html";
+ "collectors" = quicklisp-to-nix-packages."collectors";
+ "cxml" = quicklisp-to-nix-packages."cxml";
+ "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ "iterate" = quicklisp-to-nix-packages."iterate";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+ "puri" = quicklisp-to-nix-packages."puri";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "swank" = quicklisp-to-nix-packages."swank";
+ "symbol-munger" = quicklisp-to-nix-packages."symbol-munger";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+ }));
+
+
+ "buildnode" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."buildnode" or (x: {}))
+ (import ./quicklisp-to-nix-output/buildnode.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "babel" = quicklisp-to-nix-packages."babel";
+ "buildnode-xhtml" = quicklisp-to-nix-packages."buildnode-xhtml";
+ "cl-interpol" = quicklisp-to-nix-packages."cl-interpol";
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "closure-common" = quicklisp-to-nix-packages."closure-common";
+ "closure-html" = quicklisp-to-nix-packages."closure-html";
+ "collectors" = quicklisp-to-nix-packages."collectors";
+ "cxml" = quicklisp-to-nix-packages."cxml";
+ "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ "iterate" = quicklisp-to-nix-packages."iterate";
+ "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+ "puri" = quicklisp-to-nix-packages."puri";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "swank" = quicklisp-to-nix-packages."swank";
+ "symbol-munger" = quicklisp-to-nix-packages."symbol-munger";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+ }));
+
+
+ "fiasco" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."fiasco" or (x: {}))
+ (import ./quicklisp-to-nix-output/fiasco.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+ }));
+
+
+ "cl-aa" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-aa" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-aa.nix {
+ inherit fetchurl;
+ }));
+
+
"clump-binary-tree" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clump-binary-tree" or (x: {}))
@@ -108,15 +638,154 @@ let quicklisp-to-nix-packages = rec {
}));
- "simple-tasks" = buildLispPackage
+ "cl-markup" = buildLispPackage
((f: x: (x // (f x)))
- (qlOverrides."simple-tasks" or (x: {}))
- (import ./quicklisp-to-nix-output/simple-tasks.nix {
+ (qlOverrides."cl-markup" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-markup.nix {
+ inherit fetchurl;
+ }));
+
+
+ "cl-anonfun" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-anonfun" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-anonfun.nix {
+ inherit fetchurl;
+ }));
+
+
+ "clsql-uffi" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."clsql-uffi" or (x: {}))
+ (import ./quicklisp-to-nix-output/clsql-uffi.nix {
+ inherit fetchurl;
+ "clsql" = quicklisp-to-nix-packages."clsql";
+ "uffi" = quicklisp-to-nix-packages."uffi";
+ }));
+
+
+ "clunit" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."clunit" or (x: {}))
+ (import ./quicklisp-to-nix-output/clunit.nix {
+ inherit fetchurl;
+ }));
+
+
+ "usocket-server" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."usocket-server" or (x: {}))
+ (import ./quicklisp-to-nix-output/usocket-server.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
- "array-utils" = quicklisp-to-nix-packages."array-utils";
"bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
- "dissect" = quicklisp-to-nix-packages."dissect";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "usocket" = quicklisp-to-nix-packages."usocket";
+ }));
+
+
+ "s-xml" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."s-xml" or (x: {}))
+ (import ./quicklisp-to-nix-output/s-xml.nix {
+ inherit fetchurl;
+ }));
+
+
+ "s-sysdeps" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."s-sysdeps" or (x: {}))
+ (import ./quicklisp-to-nix-output/s-sysdeps.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "usocket" = quicklisp-to-nix-packages."usocket";
+ "usocket-server" = quicklisp-to-nix-packages."usocket-server";
+ }));
+
+
+ "cl-ppcre-test" = quicklisp-to-nix-packages."cl-ppcre";
+
+
+ "zpb-ttf" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."zpb-ttf" or (x: {}))
+ (import ./quicklisp-to-nix-output/zpb-ttf.nix {
+ inherit fetchurl;
+ }));
+
+
+ "cl-paths" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-paths" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-paths.nix {
+ inherit fetchurl;
+ }));
+
+
+ "hu_dot_dwim_dot_stefil" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."hu_dot_dwim_dot_stefil" or (x: {}))
+ (import ./quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ }));
+
+
+ "cl-l10n-cldr" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-l10n-cldr" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-l10n-cldr.nix {
+ inherit fetchurl;
+ }));
+
+
+ "string-case" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."string-case" or (x: {}))
+ (import ./quicklisp-to-nix-output/string-case.nix {
+ inherit fetchurl;
+ }));
+
+
+ "pcall-queue" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."pcall-queue" or (x: {}))
+ (import ./quicklisp-to-nix-output/pcall-queue.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ }));
+
+
+ "unit-test" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."unit-test" or (x: {}))
+ (import ./quicklisp-to-nix-output/unit-test.nix {
+ inherit fetchurl;
+ }));
+
+
+ "dbi" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."dbi" or (x: {}))
+ (import ./quicklisp-to-nix-output/dbi.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "cl-mysql" = quicklisp-to-nix-packages."cl-mysql";
+ "cl-postgres" = quicklisp-to-nix-packages."cl-postgres";
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "dbd-mysql" = quicklisp-to-nix-packages."dbd-mysql";
+ "dbd-postgres" = quicklisp-to-nix-packages."dbd-postgres";
+ "dbd-sqlite3" = quicklisp-to-nix-packages."dbd-sqlite3";
+ "dbi-test" = quicklisp-to-nix-packages."dbi-test";
+ "rove" = quicklisp-to-nix-packages."rove";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "sqlite" = quicklisp-to-nix-packages."sqlite";
+ "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+ "trivial-types" = quicklisp-to-nix-packages."trivial-types";
}));
@@ -243,764 +912,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "metatilities-base" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."metatilities-base" or (x: {}))
- (import ./quicklisp-to-nix-output/metatilities-base.nix {
- inherit fetchurl;
- }));
-
-
- "mgl-pax" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."mgl-pax" or (x: {}))
- (import ./quicklisp-to-nix-output/mgl-pax.nix {
- inherit fetchurl;
- "_3bmd" = quicklisp-to-nix-packages."_3bmd";
- "_3bmd-ext-code-blocks" = quicklisp-to-nix-packages."_3bmd-ext-code-blocks";
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "babel" = quicklisp-to-nix-packages."babel";
- "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
- "cl-fad" = quicklisp-to-nix-packages."cl-fad";
- "colorize" = quicklisp-to-nix-packages."colorize";
- "esrap" = quicklisp-to-nix-packages."esrap";
- "html-encode" = quicklisp-to-nix-packages."html-encode";
- "ironclad" = quicklisp-to-nix-packages."ironclad";
- "named-readtables" = quicklisp-to-nix-packages."named-readtables";
- "pythonic-string-reader" = quicklisp-to-nix-packages."pythonic-string-reader";
- "split-sequence" = quicklisp-to-nix-packages."split-sequence";
- "swank" = quicklisp-to-nix-packages."swank";
- "trivial-features" = quicklisp-to-nix-packages."trivial-features";
- }));
-
-
- "cl-change-case" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."cl-change-case" or (x: {}))
- (import ./quicklisp-to-nix-output/cl-change-case.nix {
- inherit fetchurl;
- "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
- "cl-ppcre-unicode" = quicklisp-to-nix-packages."cl-ppcre-unicode";
- "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
- "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
- }));
-
-
- "type-i" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."type-i" or (x: {}))
- (import ./quicklisp-to-nix-output/type-i.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "closer-mop" = quicklisp-to-nix-packages."closer-mop";
- "introspect-environment" = quicklisp-to-nix-packages."introspect-environment";
- "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
- "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
- "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
- "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
- "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
- "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
- }));
-
-
- "trivial-macroexpand-all" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."trivial-macroexpand-all" or (x: {}))
- (import ./quicklisp-to-nix-output/trivial-macroexpand-all.nix {
- inherit fetchurl;
- }));
-
-
- "trivial-file-size" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."trivial-file-size" or (x: {}))
- (import ./quicklisp-to-nix-output/trivial-file-size.nix {
- inherit fetchurl;
- "fiveam" = quicklisp-to-nix-packages."fiveam";
- "uiop" = quicklisp-to-nix-packages."uiop";
- }));
-
-
- "trivial-cltl2" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."trivial-cltl2" or (x: {}))
- (import ./quicklisp-to-nix-output/trivial-cltl2.nix {
- inherit fetchurl;
- }));
-
-
- "trivia_dot_trivial" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."trivia_dot_trivial" or (x: {}))
- (import ./quicklisp-to-nix-output/trivia_dot_trivial.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "closer-mop" = quicklisp-to-nix-packages."closer-mop";
- "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
- "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
- "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
- "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
- "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
- }));
-
-
- "trivia_dot_quasiquote" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."trivia_dot_quasiquote" or (x: {}))
- (import ./quicklisp-to-nix-output/trivia_dot_quasiquote.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "closer-mop" = quicklisp-to-nix-packages."closer-mop";
- "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote";
- "fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable";
- "fare-utils" = quicklisp-to-nix-packages."fare-utils";
- "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
- "named-readtables" = quicklisp-to-nix-packages."named-readtables";
- "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
- "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
- "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
- "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
- "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
- }));
-
-
- "trivia_dot_level2" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."trivia_dot_level2" or (x: {}))
- (import ./quicklisp-to-nix-output/trivia_dot_level2.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "closer-mop" = quicklisp-to-nix-packages."closer-mop";
- "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
- "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
- "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
- "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
- }));
-
-
- "trivia_dot_level1" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."trivia_dot_level1" or (x: {}))
- (import ./quicklisp-to-nix-output/trivia_dot_level1.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
- }));
-
-
- "trivia_dot_level0" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."trivia_dot_level0" or (x: {}))
- (import ./quicklisp-to-nix-output/trivia_dot_level0.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- }));
-
-
- "trivia_dot_balland2006" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."trivia_dot_balland2006" or (x: {}))
- (import ./quicklisp-to-nix-output/trivia_dot_balland2006.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "closer-mop" = quicklisp-to-nix-packages."closer-mop";
- "introspect-environment" = quicklisp-to-nix-packages."introspect-environment";
- "iterate" = quicklisp-to-nix-packages."iterate";
- "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
- "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
- "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
- "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
- "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
- "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
- "type-i" = quicklisp-to-nix-packages."type-i";
- }));
-
-
- "parse-declarations-1_dot_0" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."parse-declarations-1_dot_0" or (x: {}))
- (import ./quicklisp-to-nix-output/parse-declarations-1_dot_0.nix {
- inherit fetchurl;
- }));
-
-
- "introspect-environment" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."introspect-environment" or (x: {}))
- (import ./quicklisp-to-nix-output/introspect-environment.nix {
- inherit fetchurl;
- }));
-
-
- "global-vars" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."global-vars" or (x: {}))
- (import ./quicklisp-to-nix-output/global-vars.nix {
- inherit fetchurl;
- }));
-
-
- "fare-utils" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."fare-utils" or (x: {}))
- (import ./quicklisp-to-nix-output/fare-utils.nix {
- inherit fetchurl;
- }));
-
-
- "fare-quasiquote-readtable" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."fare-quasiquote-readtable" or (x: {}))
- (import ./quicklisp-to-nix-output/fare-quasiquote-readtable.nix {
- inherit fetchurl;
- "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote";
- "fare-utils" = quicklisp-to-nix-packages."fare-utils";
- "named-readtables" = quicklisp-to-nix-packages."named-readtables";
- }));
-
-
- "fare-quasiquote-optima" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."fare-quasiquote-optima" or (x: {}))
- (import ./quicklisp-to-nix-output/fare-quasiquote-optima.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "closer-mop" = quicklisp-to-nix-packages."closer-mop";
- "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote";
- "fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable";
- "fare-utils" = quicklisp-to-nix-packages."fare-utils";
- "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
- "named-readtables" = quicklisp-to-nix-packages."named-readtables";
- "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
- "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
- "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
- "trivia_dot_quasiquote" = quicklisp-to-nix-packages."trivia_dot_quasiquote";
- "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
- "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
- }));
-
-
- "fare-quasiquote-extras" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."fare-quasiquote-extras" or (x: {}))
- (import ./quicklisp-to-nix-output/fare-quasiquote-extras.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "closer-mop" = quicklisp-to-nix-packages."closer-mop";
- "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote";
- "fare-quasiquote-optima" = quicklisp-to-nix-packages."fare-quasiquote-optima";
- "fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable";
- "fare-utils" = quicklisp-to-nix-packages."fare-utils";
- "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
- "named-readtables" = quicklisp-to-nix-packages."named-readtables";
- "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
- "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
- "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
- "trivia_dot_quasiquote" = quicklisp-to-nix-packages."trivia_dot_quasiquote";
- "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
- "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
- }));
-
-
- "fare-quasiquote" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."fare-quasiquote" or (x: {}))
- (import ./quicklisp-to-nix-output/fare-quasiquote.nix {
- inherit fetchurl;
- "fare-utils" = quicklisp-to-nix-packages."fare-utils";
- }));
-
-
- "stefil" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."stefil" or (x: {}))
- (import ./quicklisp-to-nix-output/stefil.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "iterate" = quicklisp-to-nix-packages."iterate";
- "metabang-bind" = quicklisp-to-nix-packages."metabang-bind";
- "swank" = quicklisp-to-nix-packages."swank";
- }));
-
-
- "lfarm-common" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."lfarm-common" or (x: {}))
- (import ./quicklisp-to-nix-output/lfarm-common.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
- "cl-store" = quicklisp-to-nix-packages."cl-store";
- "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
- "split-sequence" = quicklisp-to-nix-packages."split-sequence";
- "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
- "usocket" = quicklisp-to-nix-packages."usocket";
- }));
-
-
- "cl-store" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."cl-store" or (x: {}))
- (import ./quicklisp-to-nix-output/cl-store.nix {
- inherit fetchurl;
- "rt" = quicklisp-to-nix-packages."rt";
- }));
-
-
- "rt" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."rt" or (x: {}))
- (import ./quicklisp-to-nix-output/rt.nix {
- inherit fetchurl;
- }));
-
-
- "iolib_dot_grovel" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."iolib_dot_grovel" or (x: {}))
- (import ./quicklisp-to-nix-output/iolib_dot_grovel.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "babel" = quicklisp-to-nix-packages."babel";
- "cffi" = quicklisp-to-nix-packages."cffi";
- "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf";
- "iolib_dot_base" = quicklisp-to-nix-packages."iolib_dot_base";
- "iolib_dot_common-lisp" = quicklisp-to-nix-packages."iolib_dot_common-lisp";
- "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf";
- "split-sequence" = quicklisp-to-nix-packages."split-sequence";
- "trivial-features" = quicklisp-to-nix-packages."trivial-features";
- "uiop" = quicklisp-to-nix-packages."uiop";
- }));
-
-
- "iolib_dot_conf" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."iolib_dot_conf" or (x: {}))
- (import ./quicklisp-to-nix-output/iolib_dot_conf.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf";
- }));
-
-
- "iolib_dot_common-lisp" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."iolib_dot_common-lisp" or (x: {}))
- (import ./quicklisp-to-nix-output/iolib_dot_common-lisp.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf";
- "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf";
- }));
-
-
- "iolib_dot_base" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."iolib_dot_base" or (x: {}))
- (import ./quicklisp-to-nix-output/iolib_dot_base.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf";
- "iolib_dot_common-lisp" = quicklisp-to-nix-packages."iolib_dot_common-lisp";
- "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf";
- "split-sequence" = quicklisp-to-nix-packages."split-sequence";
- }));
-
-
- "iolib_dot_asdf" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."iolib_dot_asdf" or (x: {}))
- (import ./quicklisp-to-nix-output/iolib_dot_asdf.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- }));
-
-
- "net_dot_didierverna_dot_asdf-flv" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."net_dot_didierverna_dot_asdf-flv" or (x: {}))
- (import ./quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix {
- inherit fetchurl;
- }));
-
-
- "cl-xmlspam" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."cl-xmlspam" or (x: {}))
- (import ./quicklisp-to-nix-output/cl-xmlspam.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "babel" = quicklisp-to-nix-packages."babel";
- "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
- "closure-common" = quicklisp-to-nix-packages."closure-common";
- "cxml" = quicklisp-to-nix-packages."cxml";
- "puri" = quicklisp-to-nix-packages."puri";
- "trivial-features" = quicklisp-to-nix-packages."trivial-features";
- "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
- }));
-
-
- "asdf-package-system" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."asdf-package-system" or (x: {}))
- (import ./quicklisp-to-nix-output/asdf-package-system.nix {
- inherit fetchurl;
- }));
-
-
- "uax-15" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."uax-15" or (x: {}))
- (import ./quicklisp-to-nix-output/uax-15.nix {
- inherit fetchurl;
- "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
- "fiveam" = quicklisp-to-nix-packages."fiveam";
- "split-sequence" = quicklisp-to-nix-packages."split-sequence";
- "uiop" = quicklisp-to-nix-packages."uiop";
- }));
-
-
- "cl-postgres" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."cl-postgres" or (x: {}))
- (import ./quicklisp-to-nix-output/cl-postgres.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
- "cl-base64" = quicklisp-to-nix-packages."cl-base64";
- "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
- "fiveam" = quicklisp-to-nix-packages."fiveam";
- "ironclad" = quicklisp-to-nix-packages."ironclad";
- "md5" = quicklisp-to-nix-packages."md5";
- "simple-date" = quicklisp-to-nix-packages."simple-date";
- "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date_slash_postgres-glue";
- "split-sequence" = quicklisp-to-nix-packages."split-sequence";
- "uax-15" = quicklisp-to-nix-packages."uax-15";
- "usocket" = quicklisp-to-nix-packages."usocket";
- }));
-
-
- "xpath" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."xpath" or (x: {}))
- (import ./quicklisp-to-nix-output/xpath.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "babel" = quicklisp-to-nix-packages."babel";
- "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
- "closure-common" = quicklisp-to-nix-packages."closure-common";
- "cxml" = quicklisp-to-nix-packages."cxml";
- "parse-number" = quicklisp-to-nix-packages."parse-number";
- "puri" = quicklisp-to-nix-packages."puri";
- "trivial-features" = quicklisp-to-nix-packages."trivial-features";
- "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
- "yacc" = quicklisp-to-nix-packages."yacc";
- }));
-
-
- "cxml-stp" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."cxml-stp" or (x: {}))
- (import ./quicklisp-to-nix-output/cxml-stp.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "babel" = quicklisp-to-nix-packages."babel";
- "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
- "closure-common" = quicklisp-to-nix-packages."closure-common";
- "cxml" = quicklisp-to-nix-packages."cxml";
- "cxml_slash_test" = quicklisp-to-nix-packages."cxml_slash_test";
- "parse-number" = quicklisp-to-nix-packages."parse-number";
- "puri" = quicklisp-to-nix-packages."puri";
- "rt" = quicklisp-to-nix-packages."rt";
- "trivial-features" = quicklisp-to-nix-packages."trivial-features";
- "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
- "xpath" = quicklisp-to-nix-packages."xpath";
- "xpath_slash_test" = quicklisp-to-nix-packages."xpath_slash_test";
- "yacc" = quicklisp-to-nix-packages."yacc";
- }));
-
-
- "yacc" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."yacc" or (x: {}))
- (import ./quicklisp-to-nix-output/yacc.nix {
- inherit fetchurl;
- }));
-
-
- "symbol-munger" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."symbol-munger" or (x: {}))
- (import ./quicklisp-to-nix-output/symbol-munger.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "iterate" = quicklisp-to-nix-packages."iterate";
- }));
-
-
- "collectors" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."collectors" or (x: {}))
- (import ./quicklisp-to-nix-output/collectors.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "closer-mop" = quicklisp-to-nix-packages."closer-mop";
- "iterate" = quicklisp-to-nix-packages."iterate";
- "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2";
- "symbol-munger" = quicklisp-to-nix-packages."symbol-munger";
- }));
-
-
- "buildnode-xhtml" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."buildnode-xhtml" or (x: {}))
- (import ./quicklisp-to-nix-output/buildnode-xhtml.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "babel" = quicklisp-to-nix-packages."babel";
- "buildnode" = quicklisp-to-nix-packages."buildnode";
- "cl-interpol" = quicklisp-to-nix-packages."cl-interpol";
- "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
- "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
- "closer-mop" = quicklisp-to-nix-packages."closer-mop";
- "closure-common" = quicklisp-to-nix-packages."closure-common";
- "closure-html" = quicklisp-to-nix-packages."closure-html";
- "collectors" = quicklisp-to-nix-packages."collectors";
- "cxml" = quicklisp-to-nix-packages."cxml";
- "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
- "iterate" = quicklisp-to-nix-packages."iterate";
- "named-readtables" = quicklisp-to-nix-packages."named-readtables";
- "puri" = quicklisp-to-nix-packages."puri";
- "split-sequence" = quicklisp-to-nix-packages."split-sequence";
- "swank" = quicklisp-to-nix-packages."swank";
- "symbol-munger" = quicklisp-to-nix-packages."symbol-munger";
- "trivial-features" = quicklisp-to-nix-packages."trivial-features";
- "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
- }));
-
-
- "buildnode" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."buildnode" or (x: {}))
- (import ./quicklisp-to-nix-output/buildnode.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "babel" = quicklisp-to-nix-packages."babel";
- "buildnode-xhtml" = quicklisp-to-nix-packages."buildnode-xhtml";
- "cl-interpol" = quicklisp-to-nix-packages."cl-interpol";
- "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
- "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
- "closer-mop" = quicklisp-to-nix-packages."closer-mop";
- "closure-common" = quicklisp-to-nix-packages."closure-common";
- "closure-html" = quicklisp-to-nix-packages."closure-html";
- "collectors" = quicklisp-to-nix-packages."collectors";
- "cxml" = quicklisp-to-nix-packages."cxml";
- "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
- "iterate" = quicklisp-to-nix-packages."iterate";
- "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2";
- "named-readtables" = quicklisp-to-nix-packages."named-readtables";
- "puri" = quicklisp-to-nix-packages."puri";
- "split-sequence" = quicklisp-to-nix-packages."split-sequence";
- "swank" = quicklisp-to-nix-packages."swank";
- "symbol-munger" = quicklisp-to-nix-packages."symbol-munger";
- "trivial-features" = quicklisp-to-nix-packages."trivial-features";
- "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
- }));
-
-
- "fiasco" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."fiasco" or (x: {}))
- (import ./quicklisp-to-nix-output/fiasco.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
- }));
-
-
- "clsql-uffi" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."clsql-uffi" or (x: {}))
- (import ./quicklisp-to-nix-output/clsql-uffi.nix {
- inherit fetchurl;
- "clsql" = quicklisp-to-nix-packages."clsql";
- "uffi" = quicklisp-to-nix-packages."uffi";
- }));
-
-
- "cl-aa" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."cl-aa" or (x: {}))
- (import ./quicklisp-to-nix-output/cl-aa.nix {
- inherit fetchurl;
- }));
-
-
- "cl-markup" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."cl-markup" or (x: {}))
- (import ./quicklisp-to-nix-output/cl-markup.nix {
- inherit fetchurl;
- }));
-
-
- "cl-anonfun" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."cl-anonfun" or (x: {}))
- (import ./quicklisp-to-nix-output/cl-anonfun.nix {
- inherit fetchurl;
- }));
-
-
- "cl-ppcre-test" = quicklisp-to-nix-packages."cl-ppcre";
-
-
- "zpb-ttf" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."zpb-ttf" or (x: {}))
- (import ./quicklisp-to-nix-output/zpb-ttf.nix {
- inherit fetchurl;
- }));
-
-
- "cl-paths" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."cl-paths" or (x: {}))
- (import ./quicklisp-to-nix-output/cl-paths.nix {
- inherit fetchurl;
- }));
-
-
- "puri" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."puri" or (x: {}))
- (import ./quicklisp-to-nix-output/puri.nix {
- inherit fetchurl;
- "ptester" = quicklisp-to-nix-packages."ptester";
- }));
-
-
- "parse-number" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."parse-number" or (x: {}))
- (import ./quicklisp-to-nix-output/parse-number.nix {
- inherit fetchurl;
- }));
-
-
- "metabang-bind" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."metabang-bind" or (x: {}))
- (import ./quicklisp-to-nix-output/metabang-bind.nix {
- inherit fetchurl;
- }));
-
-
- "hu_dot_dwim_dot_stefil" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."hu_dot_dwim_dot_stefil" or (x: {}))
- (import ./quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- }));
-
-
- "closure-common" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."closure-common" or (x: {}))
- (import ./quicklisp-to-nix-output/closure-common.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "babel" = quicklisp-to-nix-packages."babel";
- "trivial-features" = quicklisp-to-nix-packages."trivial-features";
- "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
- }));
-
-
- "cl-l10n-cldr" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."cl-l10n-cldr" or (x: {}))
- (import ./quicklisp-to-nix-output/cl-l10n-cldr.nix {
- inherit fetchurl;
- }));
-
-
- "string-case" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."string-case" or (x: {}))
- (import ./quicklisp-to-nix-output/string-case.nix {
- inherit fetchurl;
- }));
-
-
- "pcall-queue" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."pcall-queue" or (x: {}))
- (import ./quicklisp-to-nix-output/pcall-queue.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
- }));
-
-
- "dbi" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."dbi" or (x: {}))
- (import ./quicklisp-to-nix-output/dbi.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
- "cl-mysql" = quicklisp-to-nix-packages."cl-mysql";
- "cl-postgres" = quicklisp-to-nix-packages."cl-postgres";
- "closer-mop" = quicklisp-to-nix-packages."closer-mop";
- "dbd-mysql" = quicklisp-to-nix-packages."dbd-mysql";
- "dbd-postgres" = quicklisp-to-nix-packages."dbd-postgres";
- "dbd-sqlite3" = quicklisp-to-nix-packages."dbd-sqlite3";
- "dbi-test" = quicklisp-to-nix-packages."dbi-test";
- "rove" = quicklisp-to-nix-packages."rove";
- "split-sequence" = quicklisp-to-nix-packages."split-sequence";
- "sqlite" = quicklisp-to-nix-packages."sqlite";
- "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
- "trivial-types" = quicklisp-to-nix-packages."trivial-types";
- }));
-
-
- "lisp-unit2" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."lisp-unit2" or (x: {}))
- (import ./quicklisp-to-nix-output/lisp-unit2.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "cl-interpol" = quicklisp-to-nix-packages."cl-interpol";
- "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
- "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
- "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
- "iterate" = quicklisp-to-nix-packages."iterate";
- "named-readtables" = quicklisp-to-nix-packages."named-readtables";
- "symbol-munger" = quicklisp-to-nix-packages."symbol-munger";
- }));
-
-
- "cl-interpol" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."cl-interpol" or (x: {}))
- (import ./quicklisp-to-nix-output/cl-interpol.nix {
- inherit fetchurl;
- "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
- "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
- "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
- "named-readtables" = quicklisp-to-nix-packages."named-readtables";
- }));
-
-
- "lift" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."lift" or (x: {}))
- (import ./quicklisp-to-nix-output/lift.nix {
- inherit fetchurl;
- }));
-
-
"ptester" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."ptester" or (x: {}))
@@ -1029,23 +940,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "trivial-gray-streams" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."trivial-gray-streams" or (x: {}))
- (import ./quicklisp-to-nix-output/trivial-gray-streams.nix {
- inherit fetchurl;
- }));
-
-
- "trivial-garbage" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."trivial-garbage" or (x: {}))
- (import ./quicklisp-to-nix-output/trivial-garbage.nix {
- inherit fetchurl;
- "rt" = quicklisp-to-nix-packages."rt";
- }));
-
-
"rove" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."rove" or (x: {}))
@@ -1057,22 +951,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "rfc2388" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."rfc2388" or (x: {}))
- (import ./quicklisp-to-nix-output/rfc2388.nix {
- inherit fetchurl;
- }));
-
-
- "named-readtables" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."named-readtables" or (x: {}))
- (import ./quicklisp-to-nix-output/named-readtables.nix {
- inherit fetchurl;
- }));
-
-
"myway" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."myway" or (x: {}))
@@ -1089,14 +967,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "md5" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."md5" or (x: {}))
- (import ./quicklisp-to-nix-output/md5.nix {
- inherit fetchurl;
- }));
-
-
"map-set" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."map-set" or (x: {}))
@@ -1133,30 +1003,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "jonathan" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."jonathan" or (x: {}))
- (import ./quicklisp-to-nix-output/jonathan.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "babel" = quicklisp-to-nix-packages."babel";
- "cffi" = quicklisp-to-nix-packages."cffi";
- "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
- "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
- "cl-annot" = quicklisp-to-nix-packages."cl-annot";
- "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
- "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
- "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
- "fast-io" = quicklisp-to-nix-packages."fast-io";
- "named-readtables" = quicklisp-to-nix-packages."named-readtables";
- "proc-parse" = quicklisp-to-nix-packages."proc-parse";
- "static-vectors" = quicklisp-to-nix-packages."static-vectors";
- "trivial-features" = quicklisp-to-nix-packages."trivial-features";
- "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
- "trivial-types" = quicklisp-to-nix-packages."trivial-types";
- }));
-
-
"do-urlencode" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."do-urlencode" or (x: {}))
@@ -1272,16 +1118,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "cl-syntax" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."cl-syntax" or (x: {}))
- (import ./quicklisp-to-nix-output/cl-syntax.nix {
- inherit fetchurl;
- "named-readtables" = quicklisp-to-nix-packages."named-readtables";
- "trivial-types" = quicklisp-to-nix-packages."trivial-types";
- }));
-
-
"cl-project" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-project" or (x: {}))
@@ -1301,18 +1137,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "cl-fad" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."cl-fad" or (x: {}))
- (import ./quicklisp-to-nix-output/cl-fad.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
- "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
- "unit-test" = quicklisp-to-nix-packages."unit-test";
- }));
-
-
"cl-colors2" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-colors2" or (x: {}))
@@ -1324,24 +1148,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "cl-annot" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."cl-annot" or (x: {}))
- (import ./quicklisp-to-nix-output/cl-annot.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- }));
-
-
- "chunga" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."chunga" or (x: {}))
- (import ./quicklisp-to-nix-output/chunga.nix {
- inherit fetchurl;
- "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
- }));
-
-
"cffi-toolchain" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cffi-toolchain" or (x: {}))
@@ -1354,15 +1160,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "anaphora" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."anaphora" or (x: {}))
- (import ./quicklisp-to-nix-output/anaphora.nix {
- inherit fetchurl;
- "rt" = quicklisp-to-nix-packages."rt";
- }));
-
-
"vom" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."vom" or (x: {}))
@@ -1371,199 +1168,27 @@ let quicklisp-to-nix-packages = rec {
}));
- "trivial-features" = buildLispPackage
+ "rt" = buildLispPackage
((f: x: (x // (f x)))
- (qlOverrides."trivial-features" or (x: {}))
- (import ./quicklisp-to-nix-output/trivial-features.nix {
+ (qlOverrides."rt" or (x: {}))
+ (import ./quicklisp-to-nix-output/rt.nix {
inherit fetchurl;
}));
- "usocket-server" = buildLispPackage
+ "lisp-unit2" = buildLispPackage
((f: x: (x // (f x)))
- (qlOverrides."usocket-server" or (x: {}))
- (import ./quicklisp-to-nix-output/usocket-server.nix {
+ (qlOverrides."lisp-unit2" or (x: {}))
+ (import ./quicklisp-to-nix-output/lisp-unit2.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
- "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
- "split-sequence" = quicklisp-to-nix-packages."split-sequence";
- "usocket" = quicklisp-to-nix-packages."usocket";
- }));
-
-
- "s-xml" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."s-xml" or (x: {}))
- (import ./quicklisp-to-nix-output/s-xml.nix {
- inherit fetchurl;
- }));
-
-
- "s-sysdeps" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."s-sysdeps" or (x: {}))
- (import ./quicklisp-to-nix-output/s-sysdeps.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
- "split-sequence" = quicklisp-to-nix-packages."split-sequence";
- "usocket" = quicklisp-to-nix-packages."usocket";
- "usocket-server" = quicklisp-to-nix-packages."usocket-server";
- }));
-
-
- "hu_dot_dwim_dot_defclass-star" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."hu_dot_dwim_dot_defclass-star" or (x: {}))
- (import ./quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix {
- inherit fetchurl;
- "hu_dot_dwim_dot_asdf" = quicklisp-to-nix-packages."hu_dot_dwim_dot_asdf";
- }));
-
-
- "clump" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."clump" or (x: {}))
- (import ./quicklisp-to-nix-output/clump.nix {
- inherit fetchurl;
- "acclimation" = quicklisp-to-nix-packages."acclimation";
- "clump-2-3-tree" = quicklisp-to-nix-packages."clump-2-3-tree";
- "clump-binary-tree" = quicklisp-to-nix-packages."clump-binary-tree";
- }));
-
-
- "acclimation" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."acclimation" or (x: {}))
- (import ./quicklisp-to-nix-output/acclimation.nix {
- inherit fetchurl;
- }));
-
-
- "cl-webkit2" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."cl-webkit2" or (x: {}))
- (import ./quicklisp-to-nix-output/cl-webkit2.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "babel" = quicklisp-to-nix-packages."babel";
- "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
- "cffi" = quicklisp-to-nix-packages."cffi";
- "cl-cffi-gtk" = quicklisp-to-nix-packages."cl-cffi-gtk";
- "cl-cffi-gtk-cairo" = quicklisp-to-nix-packages."cl-cffi-gtk-cairo";
- "cl-cffi-gtk-gdk" = quicklisp-to-nix-packages."cl-cffi-gtk-gdk";
- "cl-cffi-gtk-gdk-pixbuf" = quicklisp-to-nix-packages."cl-cffi-gtk-gdk-pixbuf";
- "cl-cffi-gtk-gio" = quicklisp-to-nix-packages."cl-cffi-gtk-gio";
- "cl-cffi-gtk-glib" = quicklisp-to-nix-packages."cl-cffi-gtk-glib";
- "cl-cffi-gtk-gobject" = quicklisp-to-nix-packages."cl-cffi-gtk-gobject";
- "cl-cffi-gtk-pango" = quicklisp-to-nix-packages."cl-cffi-gtk-pango";
- "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "cl-interpol" = quicklisp-to-nix-packages."cl-interpol";
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
+ "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"iterate" = quicklisp-to-nix-packages."iterate";
- "trivial-features" = quicklisp-to-nix-packages."trivial-features";
- "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
- }));
-
-
- "trivial-main-thread" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."trivial-main-thread" or (x: {}))
- (import ./quicklisp-to-nix-output/trivial-main-thread.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "array-utils" = quicklisp-to-nix-packages."array-utils";
- "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
- "dissect" = quicklisp-to-nix-packages."dissect";
- "simple-tasks" = quicklisp-to-nix-packages."simple-tasks";
- "trivial-features" = quicklisp-to-nix-packages."trivial-features";
- }));
-
-
- "enchant" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."enchant" or (x: {}))
- (import ./quicklisp-to-nix-output/enchant.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "babel" = quicklisp-to-nix-packages."babel";
- "cffi" = quicklisp-to-nix-packages."cffi";
- "trivial-features" = quicklisp-to-nix-packages."trivial-features";
- }));
-
-
- "cl-cffi-gtk" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."cl-cffi-gtk" or (x: {}))
- (import ./quicklisp-to-nix-output/cl-cffi-gtk.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "babel" = quicklisp-to-nix-packages."babel";
- "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
- "cffi" = quicklisp-to-nix-packages."cffi";
- "cl-cffi-gtk-cairo" = quicklisp-to-nix-packages."cl-cffi-gtk-cairo";
- "cl-cffi-gtk-gdk" = quicklisp-to-nix-packages."cl-cffi-gtk-gdk";
- "cl-cffi-gtk-gdk-pixbuf" = quicklisp-to-nix-packages."cl-cffi-gtk-gdk-pixbuf";
- "cl-cffi-gtk-gio" = quicklisp-to-nix-packages."cl-cffi-gtk-gio";
- "cl-cffi-gtk-glib" = quicklisp-to-nix-packages."cl-cffi-gtk-glib";
- "cl-cffi-gtk-gobject" = quicklisp-to-nix-packages."cl-cffi-gtk-gobject";
- "cl-cffi-gtk-pango" = quicklisp-to-nix-packages."cl-cffi-gtk-pango";
- "closer-mop" = quicklisp-to-nix-packages."closer-mop";
- "iterate" = quicklisp-to-nix-packages."iterate";
- "trivial-features" = quicklisp-to-nix-packages."trivial-features";
- "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
- }));
-
-
- "trivial-package-local-nicknames" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."trivial-package-local-nicknames" or (x: {}))
- (import ./quicklisp-to-nix-output/trivial-package-local-nicknames.nix {
- inherit fetchurl;
- }));
-
-
- "osicat" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."osicat" or (x: {}))
- (import ./quicklisp-to-nix-output/osicat.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "babel" = quicklisp-to-nix-packages."babel";
- "cffi" = quicklisp-to-nix-packages."cffi";
- "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
- "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
- "rt" = quicklisp-to-nix-packages."rt";
- "trivial-features" = quicklisp-to-nix-packages."trivial-features";
- }));
-
-
- "moptilities" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."moptilities" or (x: {}))
- (import ./quicklisp-to-nix-output/moptilities.nix {
- inherit fetchurl;
- "closer-mop" = quicklisp-to-nix-packages."closer-mop";
- }));
-
-
- "cl-containers" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."cl-containers" or (x: {}))
- (import ./quicklisp-to-nix-output/cl-containers.nix {
- inherit fetchurl;
- "asdf-system-connections" = quicklisp-to-nix-packages."asdf-system-connections";
- "metatilities-base" = quicklisp-to-nix-packages."metatilities-base";
- "moptilities" = quicklisp-to-nix-packages."moptilities";
- }));
-
-
- "chanl" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."chanl" or (x: {}))
- (import ./quicklisp-to-nix-output/chanl.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
- "fiveam" = quicklisp-to-nix-packages."fiveam";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+ "symbol-munger" = quicklisp-to-nix-packages."symbol-munger";
}));
@@ -1594,6 +1219,33 @@ let quicklisp-to-nix-packages = rec {
}));
+ "xml_dot_location" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."xml_dot_location" or (x: {}))
+ (import ./quicklisp-to-nix-output/xml_dot_location.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "anaphora" = quicklisp-to-nix-packages."anaphora";
+ "babel" = quicklisp-to-nix-packages."babel";
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "closure-common" = quicklisp-to-nix-packages."closure-common";
+ "cxml" = quicklisp-to-nix-packages."cxml";
+ "cxml-stp" = quicklisp-to-nix-packages."cxml-stp";
+ "iterate" = quicklisp-to-nix-packages."iterate";
+ "let-plus" = quicklisp-to-nix-packages."let-plus";
+ "lift" = quicklisp-to-nix-packages."lift";
+ "more-conditions" = quicklisp-to-nix-packages."more-conditions";
+ "parse-number" = quicklisp-to-nix-packages."parse-number";
+ "puri" = quicklisp-to-nix-packages."puri";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+ "xpath" = quicklisp-to-nix-packages."xpath";
+ "yacc" = quicklisp-to-nix-packages."yacc";
+ }));
+
+
"xkeyboard" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."xkeyboard" or (x: {}))
@@ -1680,6 +1332,39 @@ let quicklisp-to-nix-packages = rec {
}));
+ "uuid" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."uuid" or (x: {}))
+ (import ./quicklisp-to-nix-output/uuid.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "ironclad" = quicklisp-to-nix-packages."ironclad";
+ "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8";
+ }));
+
+
+ "utilities_dot_print-tree" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."utilities_dot_print-tree" or (x: {}))
+ (import ./quicklisp-to-nix-output/utilities_dot_print-tree.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "fiveam" = quicklisp-to-nix-packages."fiveam";
+ "uiop" = quicklisp-to-nix-packages."uiop";
+ }));
+
+
+ "utilities_dot_print-items" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."utilities_dot_print-items" or (x: {}))
+ (import ./quicklisp-to-nix-output/utilities_dot_print-items.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "fiveam" = quicklisp-to-nix-packages."fiveam";
+ }));
+
+
"usocket" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."usocket" or (x: {}))
@@ -1697,6 +1382,14 @@ let quicklisp-to-nix-packages = rec {
}));
+ "unix-options" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."unix-options" or (x: {}))
+ (import ./quicklisp-to-nix-output/unix-options.nix {
+ inherit fetchurl;
+ }));
+
+
"uffi" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."uffi" or (x: {}))
@@ -1722,6 +1415,14 @@ let quicklisp-to-nix-packages = rec {
}));
+ "trivial-package-local-nicknames" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivial-package-local-nicknames" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivial-package-local-nicknames.nix {
+ inherit fetchurl;
+ }));
+
+
"trivial-mimes" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."trivial-mimes" or (x: {}))
@@ -1730,6 +1431,20 @@ let quicklisp-to-nix-packages = rec {
}));
+ "trivial-main-thread" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivial-main-thread" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivial-main-thread.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "array-utils" = quicklisp-to-nix-packages."array-utils";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "dissect" = quicklisp-to-nix-packages."dissect";
+ "simple-tasks" = quicklisp-to-nix-packages."simple-tasks";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ }));
+
+
"trivial-indent" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."trivial-indent" or (x: {}))
@@ -1738,6 +1453,31 @@ let quicklisp-to-nix-packages = rec {
}));
+ "trivial-gray-streams" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivial-gray-streams" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivial-gray-streams.nix {
+ inherit fetchurl;
+ }));
+
+
+ "trivial-garbage" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivial-garbage" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivial-garbage.nix {
+ inherit fetchurl;
+ "rt" = quicklisp-to-nix-packages."rt";
+ }));
+
+
+ "trivial-features" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivial-features" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivial-features.nix {
+ inherit fetchurl;
+ }));
+
+
"trivial-clipboard" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."trivial-clipboard" or (x: {}))
@@ -1775,6 +1515,16 @@ let quicklisp-to-nix-packages = rec {
}));
+ "symbol-munger" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."symbol-munger" or (x: {}))
+ (import ./quicklisp-to-nix-output/symbol-munger.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "iterate" = quicklisp-to-nix-packages."iterate";
+ }));
+
+
"swap-bytes" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."swap-bytes" or (x: {}))
@@ -1866,6 +1616,15 @@ let quicklisp-to-nix-packages = rec {
}));
+ "simple-date-time" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."simple-date-time" or (x: {}))
+ (import ./quicklisp-to-nix-output/simple-date-time.nix {
+ inherit fetchurl;
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ }));
+
+
"simple-date" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."simple-date" or (x: {}))
@@ -1921,6 +1680,14 @@ let quicklisp-to-nix-packages = rec {
}));
+ "rfc2388" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."rfc2388" or (x: {}))
+ (import ./quicklisp-to-nix-output/rfc2388.nix {
+ inherit fetchurl;
+ }));
+
+
"quri" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."quri" or (x: {}))
@@ -1959,6 +1726,15 @@ let quicklisp-to-nix-packages = rec {
}));
+ "puri" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."puri" or (x: {}))
+ (import ./quicklisp-to-nix-output/puri.nix {
+ inherit fetchurl;
+ "ptester" = quicklisp-to-nix-packages."ptester";
+ }));
+
+
"prove-asdf" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."prove-asdf" or (x: {}))
@@ -1994,6 +1770,34 @@ let quicklisp-to-nix-packages = rec {
}));
+ "postmodern" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."postmodern" or (x: {}))
+ (import ./quicklisp-to-nix-output/postmodern.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+ "cl-postgres" = quicklisp-to-nix-packages."cl-postgres";
+ "cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres_slash_tests";
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "fiveam" = quicklisp-to-nix-packages."fiveam";
+ "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ "global-vars" = quicklisp-to-nix-packages."global-vars";
+ "ironclad" = quicklisp-to-nix-packages."ironclad";
+ "md5" = quicklisp-to-nix-packages."md5";
+ "s-sql" = quicklisp-to-nix-packages."s-sql";
+ "s-sql_slash_tests" = quicklisp-to-nix-packages."s-sql_slash_tests";
+ "simple-date" = quicklisp-to-nix-packages."simple-date";
+ "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date_slash_postgres-glue";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "uax-15" = quicklisp-to-nix-packages."uax-15";
+ "usocket" = quicklisp-to-nix-packages."usocket";
+ }));
+
+
"plump" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."plump" or (x: {}))
@@ -2017,6 +1821,38 @@ let quicklisp-to-nix-packages = rec {
}));
+ "parser_dot_common-rules" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."parser_dot_common-rules" or (x: {}))
+ (import ./quicklisp-to-nix-output/parser_dot_common-rules.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "anaphora" = quicklisp-to-nix-packages."anaphora";
+ "esrap" = quicklisp-to-nix-packages."esrap";
+ "fiveam" = quicklisp-to-nix-packages."fiveam";
+ "let-plus" = quicklisp-to-nix-packages."let-plus";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ }));
+
+
+ "parser-combinators" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."parser-combinators" or (x: {}))
+ (import ./quicklisp-to-nix-output/parser-combinators.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "iterate" = quicklisp-to-nix-packages."iterate";
+ }));
+
+
+ "parse-number" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."parse-number" or (x: {}))
+ (import ./quicklisp-to-nix-output/parse-number.nix {
+ inherit fetchurl;
+ }));
+
+
"parenscript" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."parenscript" or (x: {}))
@@ -2028,6 +1864,21 @@ let quicklisp-to-nix-packages = rec {
}));
+ "osicat" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."osicat" or (x: {}))
+ (import ./quicklisp-to-nix-output/osicat.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "babel" = quicklisp-to-nix-packages."babel";
+ "cffi" = quicklisp-to-nix-packages."cffi";
+ "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+ "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
+ "rt" = quicklisp-to-nix-packages."rt";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ }));
+
+
"optima" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."optima" or (x: {}))
@@ -2047,6 +1898,22 @@ let quicklisp-to-nix-packages = rec {
}));
+ "net-telent-date" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."net-telent-date" or (x: {}))
+ (import ./quicklisp-to-nix-output/net-telent-date.nix {
+ inherit fetchurl;
+ }));
+
+
+ "named-readtables" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."named-readtables" or (x: {}))
+ (import ./quicklisp-to-nix-output/named-readtables.nix {
+ inherit fetchurl;
+ }));
+
+
"mt19937" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."mt19937" or (x: {}))
@@ -2055,6 +1922,27 @@ let quicklisp-to-nix-packages = rec {
}));
+ "more-conditions" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."more-conditions" or (x: {}))
+ (import ./quicklisp-to-nix-output/more-conditions.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "fiveam" = quicklisp-to-nix-packages."fiveam";
+ "let-plus" = quicklisp-to-nix-packages."let-plus";
+ }));
+
+
+ "moptilities" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."moptilities" or (x: {}))
+ (import ./quicklisp-to-nix-output/moptilities.nix {
+ inherit fetchurl;
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ }));
+
+
"mk-string-metrics" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."mk-string-metrics" or (x: {}))
@@ -2071,6 +1959,30 @@ let quicklisp-to-nix-packages = rec {
}));
+ "metatilities-base" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."metatilities-base" or (x: {}))
+ (import ./quicklisp-to-nix-output/metatilities-base.nix {
+ inherit fetchurl;
+ }));
+
+
+ "metabang-bind" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."metabang-bind" or (x: {}))
+ (import ./quicklisp-to-nix-output/metabang-bind.nix {
+ inherit fetchurl;
+ }));
+
+
+ "md5" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."md5" or (x: {}))
+ (import ./quicklisp-to-nix-output/md5.nix {
+ inherit fetchurl;
+ }));
+
+
"marshal" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."marshal" or (x: {}))
@@ -2133,6 +2045,14 @@ let quicklisp-to-nix-packages = rec {
}));
+ "lift" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."lift" or (x: {}))
+ (import ./quicklisp-to-nix-output/lift.nix {
+ inherit fetchurl;
+ }));
+
+
"lfarm-ssl" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."lfarm-ssl" or (x: {}))
@@ -2223,6 +2143,30 @@ let quicklisp-to-nix-packages = rec {
}));
+ "jonathan" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."jonathan" or (x: {}))
+ (import ./quicklisp-to-nix-output/jonathan.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "babel" = quicklisp-to-nix-packages."babel";
+ "cffi" = quicklisp-to-nix-packages."cffi";
+ "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+ "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
+ "cl-annot" = quicklisp-to-nix-packages."cl-annot";
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+ "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+ "fast-io" = quicklisp-to-nix-packages."fast-io";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+ "proc-parse" = quicklisp-to-nix-packages."proc-parse";
+ "static-vectors" = quicklisp-to-nix-packages."static-vectors";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+ "trivial-types" = quicklisp-to-nix-packages."trivial-types";
+ }));
+
+
"iterate" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."iterate" or (x: {}))
@@ -2263,6 +2207,36 @@ let quicklisp-to-nix-packages = rec {
}));
+ "inferior-shell" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."inferior-shell" or (x: {}))
+ (import ./quicklisp-to-nix-output/inferior-shell.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "fare-mop" = quicklisp-to-nix-packages."fare-mop";
+ "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote";
+ "fare-quasiquote-extras" = quicklisp-to-nix-packages."fare-quasiquote-extras";
+ "fare-quasiquote-optima" = quicklisp-to-nix-packages."fare-quasiquote-optima";
+ "fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable";
+ "fare-utils" = quicklisp-to-nix-packages."fare-utils";
+ "hu_dot_dwim_dot_stefil" = quicklisp-to-nix-packages."hu_dot_dwim_dot_stefil";
+ "introspect-environment" = quicklisp-to-nix-packages."introspect-environment";
+ "iterate" = quicklisp-to-nix-packages."iterate";
+ "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+ "trivia" = quicklisp-to-nix-packages."trivia";
+ "trivia_dot_balland2006" = quicklisp-to-nix-packages."trivia_dot_balland2006";
+ "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
+ "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
+ "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
+ "trivia_dot_quasiquote" = quicklisp-to-nix-packages."trivia_dot_quasiquote";
+ "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
+ "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
+ "type-i" = quicklisp-to-nix-packages."type-i";
+ }));
+
+
"ieee-floats" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."ieee-floats" or (x: {}))
@@ -2309,6 +2283,15 @@ let quicklisp-to-nix-packages = rec {
}));
+ "hu_dot_dwim_dot_defclass-star" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."hu_dot_dwim_dot_defclass-star" or (x: {}))
+ (import ./quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix {
+ inherit fetchurl;
+ "hu_dot_dwim_dot_asdf" = quicklisp-to-nix-packages."hu_dot_dwim_dot_asdf";
+ }));
+
+
"hu_dot_dwim_dot_asdf" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."hu_dot_dwim_dot_asdf" or (x: {}))
@@ -2350,6 +2333,18 @@ let quicklisp-to-nix-packages = rec {
}));
+ "gettext" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."gettext" or (x: {}))
+ (import ./quicklisp-to-nix-output/gettext.nix {
+ inherit fetchurl;
+ "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+ "yacc" = quicklisp-to-nix-packages."yacc";
+ }));
+
+
"fset" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."fset" or (x: {}))
@@ -2424,6 +2419,41 @@ let quicklisp-to-nix-packages = rec {
}));
+ "fare-utils" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."fare-utils" or (x: {}))
+ (import ./quicklisp-to-nix-output/fare-utils.nix {
+ inherit fetchurl;
+ }));
+
+
+ "fare-quasiquote" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."fare-quasiquote" or (x: {}))
+ (import ./quicklisp-to-nix-output/fare-quasiquote.nix {
+ inherit fetchurl;
+ "fare-utils" = quicklisp-to-nix-packages."fare-utils";
+ }));
+
+
+ "fare-mop" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."fare-mop" or (x: {}))
+ (import ./quicklisp-to-nix-output/fare-mop.nix {
+ inherit fetchurl;
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "fare-utils" = quicklisp-to-nix-packages."fare-utils";
+ }));
+
+
+ "fare-csv" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."fare-csv" or (x: {}))
+ (import ./quicklisp-to-nix-output/fare-csv.nix {
+ inherit fetchurl;
+ }));
+
+
"external-program" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."external-program" or (x: {}))
@@ -2456,6 +2486,18 @@ let quicklisp-to-nix-packages = rec {
}));
+ "enchant" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."enchant" or (x: {}))
+ (import ./quicklisp-to-nix-output/enchant.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "babel" = quicklisp-to-nix-packages."babel";
+ "cffi" = quicklisp-to-nix-packages."cffi";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ }));
+
+
"drakma" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."drakma" or (x: {}))
@@ -2489,6 +2531,43 @@ let quicklisp-to-nix-packages = rec {
}));
+ "djula" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."djula" or (x: {}))
+ (import ./quicklisp-to-nix-output/djula.nix {
+ inherit fetchurl;
+ "access" = quicklisp-to-nix-packages."access";
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "anaphora" = quicklisp-to-nix-packages."anaphora";
+ "arnesi" = quicklisp-to-nix-packages."arnesi";
+ "babel" = quicklisp-to-nix-packages."babel";
+ "cl-annot" = quicklisp-to-nix-packages."cl-annot";
+ "cl-interpol" = quicklisp-to-nix-packages."cl-interpol";
+ "cl-locale" = quicklisp-to-nix-packages."cl-locale";
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "cl-slice" = quicklisp-to-nix-packages."cl-slice";
+ "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+ "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+ "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "collectors" = quicklisp-to-nix-packages."collectors";
+ "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ "gettext" = quicklisp-to-nix-packages."gettext";
+ "iterate" = quicklisp-to-nix-packages."iterate";
+ "let-plus" = quicklisp-to-nix-packages."let-plus";
+ "local-time" = quicklisp-to-nix-packages."local-time";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+ "parser-combinators" = quicklisp-to-nix-packages."parser-combinators";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "symbol-munger" = quicklisp-to-nix-packages."symbol-munger";
+ "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+ "trivial-types" = quicklisp-to-nix-packages."trivial-types";
+ "yacc" = quicklisp-to-nix-packages."yacc";
+ }));
+
+
"dexador" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."dexador" or (x: {}))
@@ -2600,6 +2679,28 @@ let quicklisp-to-nix-packages = rec {
}));
+ "cxml-stp" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cxml-stp" or (x: {}))
+ (import ./quicklisp-to-nix-output/cxml-stp.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "babel" = quicklisp-to-nix-packages."babel";
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "closure-common" = quicklisp-to-nix-packages."closure-common";
+ "cxml" = quicklisp-to-nix-packages."cxml";
+ "cxml_slash_test" = quicklisp-to-nix-packages."cxml_slash_test";
+ "parse-number" = quicklisp-to-nix-packages."parse-number";
+ "puri" = quicklisp-to-nix-packages."puri";
+ "rt" = quicklisp-to-nix-packages."rt";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+ "xpath" = quicklisp-to-nix-packages."xpath";
+ "xpath_slash_test" = quicklisp-to-nix-packages."xpath_slash_test";
+ "yacc" = quicklisp-to-nix-packages."yacc";
+ }));
+
+
"cxml" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cxml" or (x: {}))
@@ -2726,6 +2827,19 @@ let quicklisp-to-nix-packages = rec {
}));
+ "collectors" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."collectors" or (x: {}))
+ (import ./quicklisp-to-nix-output/collectors.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "iterate" = quicklisp-to-nix-packages."iterate";
+ "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2";
+ "symbol-munger" = quicklisp-to-nix-packages."symbol-munger";
+ }));
+
+
"clx" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clx" or (x: {}))
@@ -2735,162 +2849,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "clss" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."clss" or (x: {}))
- (import ./quicklisp-to-nix-output/clss.nix {
- inherit fetchurl;
- "array-utils" = quicklisp-to-nix-packages."array-utils";
- "documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
- "plump" = quicklisp-to-nix-packages."plump";
- "trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
- }));
-
-
- "clsql-sqlite3" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."clsql-sqlite3" or (x: {}))
- (import ./quicklisp-to-nix-output/clsql-sqlite3.nix {
- inherit fetchurl;
- "clsql" = quicklisp-to-nix-packages."clsql";
- "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi";
- "uffi" = quicklisp-to-nix-packages."uffi";
- }));
-
-
- "clsql-postgresql-socket" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."clsql-postgresql-socket" or (x: {}))
- (import ./quicklisp-to-nix-output/clsql-postgresql-socket.nix {
- inherit fetchurl;
- "clsql" = quicklisp-to-nix-packages."clsql";
- "md5" = quicklisp-to-nix-packages."md5";
- "uffi" = quicklisp-to-nix-packages."uffi";
- }));
-
-
- "clsql-postgresql" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."clsql-postgresql" or (x: {}))
- (import ./quicklisp-to-nix-output/clsql-postgresql.nix {
- inherit fetchurl;
- "clsql" = quicklisp-to-nix-packages."clsql";
- "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi";
- "uffi" = quicklisp-to-nix-packages."uffi";
- }));
-
-
- "clsql" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."clsql" or (x: {}))
- (import ./quicklisp-to-nix-output/clsql.nix {
- inherit fetchurl;
- "uffi" = quicklisp-to-nix-packages."uffi";
- }));
-
-
- "closure-html" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."closure-html" or (x: {}))
- (import ./quicklisp-to-nix-output/closure-html.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "babel" = quicklisp-to-nix-packages."babel";
- "closure-common" = quicklisp-to-nix-packages."closure-common";
- "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
- "trivial-features" = quicklisp-to-nix-packages."trivial-features";
- "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
- }));
-
-
- "closer-mop" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."closer-mop" or (x: {}))
- (import ./quicklisp-to-nix-output/closer-mop.nix {
- inherit fetchurl;
- }));
-
-
- "clack-v1-compat" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."clack-v1-compat" or (x: {}))
- (import ./quicklisp-to-nix-output/clack-v1-compat.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "babel" = quicklisp-to-nix-packages."babel";
- "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
- "cffi" = quicklisp-to-nix-packages."cffi";
- "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
- "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
- "chipz" = quicklisp-to-nix-packages."chipz";
- "chunga" = quicklisp-to-nix-packages."chunga";
- "circular-streams" = quicklisp-to-nix-packages."circular-streams";
- "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl";
- "cl-annot" = quicklisp-to-nix-packages."cl-annot";
- "cl-base64" = quicklisp-to-nix-packages."cl-base64";
- "cl-cookie" = quicklisp-to-nix-packages."cl-cookie";
- "cl-fad" = quicklisp-to-nix-packages."cl-fad";
- "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
- "cl-reexport" = quicklisp-to-nix-packages."cl-reexport";
- "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
- "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
- "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
- "clack" = quicklisp-to-nix-packages."clack";
- "clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot";
- "clack-socket" = quicklisp-to-nix-packages."clack-socket";
- "clack-test" = quicklisp-to-nix-packages."clack-test";
- "dexador" = quicklisp-to-nix-packages."dexador";
- "dissect" = quicklisp-to-nix-packages."dissect";
- "fast-http" = quicklisp-to-nix-packages."fast-http";
- "fast-io" = quicklisp-to-nix-packages."fast-io";
- "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
- "http-body" = quicklisp-to-nix-packages."http-body";
- "hunchentoot" = quicklisp-to-nix-packages."hunchentoot";
- "ironclad" = quicklisp-to-nix-packages."ironclad";
- "jonathan" = quicklisp-to-nix-packages."jonathan";
- "lack" = quicklisp-to-nix-packages."lack";
- "lack-component" = quicklisp-to-nix-packages."lack-component";
- "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
- "lack-util" = quicklisp-to-nix-packages."lack-util";
- "local-time" = quicklisp-to-nix-packages."local-time";
- "marshal" = quicklisp-to-nix-packages."marshal";
- "md5" = quicklisp-to-nix-packages."md5";
- "named-readtables" = quicklisp-to-nix-packages."named-readtables";
- "proc-parse" = quicklisp-to-nix-packages."proc-parse";
- "quri" = quicklisp-to-nix-packages."quri";
- "rfc2388" = quicklisp-to-nix-packages."rfc2388";
- "rove" = quicklisp-to-nix-packages."rove";
- "smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
- "split-sequence" = quicklisp-to-nix-packages."split-sequence";
- "static-vectors" = quicklisp-to-nix-packages."static-vectors";
- "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
- "trivial-features" = quicklisp-to-nix-packages."trivial-features";
- "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
- "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
- "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes";
- "trivial-types" = quicklisp-to-nix-packages."trivial-types";
- "uiop" = quicklisp-to-nix-packages."uiop";
- "usocket" = quicklisp-to-nix-packages."usocket";
- "xsubseq" = quicklisp-to-nix-packages."xsubseq";
- }));
-
-
- "clack" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."clack" or (x: {}))
- (import ./quicklisp-to-nix-output/clack.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
- "ironclad" = quicklisp-to-nix-packages."ironclad";
- "lack" = quicklisp-to-nix-packages."lack";
- "lack-component" = quicklisp-to-nix-packages."lack-component";
- "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
- "lack-util" = quicklisp-to-nix-packages."lack-util";
- "uiop" = quicklisp-to-nix-packages."uiop";
- }));
-
-
"cl-who" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-who" or (x: {}))
@@ -2900,6 +2858,30 @@ let quicklisp-to-nix-packages = rec {
}));
+ "cl-webkit2" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-webkit2" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-webkit2.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "babel" = quicklisp-to-nix-packages."babel";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "cffi" = quicklisp-to-nix-packages."cffi";
+ "cl-cffi-gtk" = quicklisp-to-nix-packages."cl-cffi-gtk";
+ "cl-cffi-gtk-cairo" = quicklisp-to-nix-packages."cl-cffi-gtk-cairo";
+ "cl-cffi-gtk-gdk" = quicklisp-to-nix-packages."cl-cffi-gtk-gdk";
+ "cl-cffi-gtk-gdk-pixbuf" = quicklisp-to-nix-packages."cl-cffi-gtk-gdk-pixbuf";
+ "cl-cffi-gtk-gio" = quicklisp-to-nix-packages."cl-cffi-gtk-gio";
+ "cl-cffi-gtk-glib" = quicklisp-to-nix-packages."cl-cffi-gtk-glib";
+ "cl-cffi-gtk-gobject" = quicklisp-to-nix-packages."cl-cffi-gtk-gobject";
+ "cl-cffi-gtk-pango" = quicklisp-to-nix-packages."cl-cffi-gtk-pango";
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "iterate" = quicklisp-to-nix-packages."iterate";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+ }));
+
+
"cl-vectors" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-vectors" or (x: {}))
@@ -2936,6 +2918,17 @@ let quicklisp-to-nix-packages = rec {
}));
+ "clump" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."clump" or (x: {}))
+ (import ./quicklisp-to-nix-output/clump.nix {
+ inherit fetchurl;
+ "acclimation" = quicklisp-to-nix-packages."acclimation";
+ "clump-2-3-tree" = quicklisp-to-nix-packages."clump-2-3-tree";
+ "clump-binary-tree" = quicklisp-to-nix-packages."clump-binary-tree";
+ }));
+
+
"cl-typesetting" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-typesetting" or (x: {}))
@@ -3000,6 +2993,96 @@ let quicklisp-to-nix-packages = rec {
}));
+ "cl-syntax" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-syntax" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-syntax.nix {
+ inherit fetchurl;
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+ "trivial-types" = quicklisp-to-nix-packages."trivial-types";
+ }));
+
+
+ "cl-store" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-store" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-store.nix {
+ inherit fetchurl;
+ "rt" = quicklisp-to-nix-packages."rt";
+ }));
+
+
+ "cl_plus_ssl" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl_plus_ssl" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl_plus_ssl.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "babel" = quicklisp-to-nix-packages."babel";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "cffi" = quicklisp-to-nix-packages."cffi";
+ "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+ "uiop" = quicklisp-to-nix-packages."uiop";
+ }));
+
+
+ "clss" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."clss" or (x: {}))
+ (import ./quicklisp-to-nix-output/clss.nix {
+ inherit fetchurl;
+ "array-utils" = quicklisp-to-nix-packages."array-utils";
+ "documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
+ "plump" = quicklisp-to-nix-packages."plump";
+ "trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
+ }));
+
+
+ "clsql-sqlite3" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."clsql-sqlite3" or (x: {}))
+ (import ./quicklisp-to-nix-output/clsql-sqlite3.nix {
+ inherit fetchurl;
+ "clsql" = quicklisp-to-nix-packages."clsql";
+ "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi";
+ "uffi" = quicklisp-to-nix-packages."uffi";
+ }));
+
+
+ "clsql-postgresql-socket" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."clsql-postgresql-socket" or (x: {}))
+ (import ./quicklisp-to-nix-output/clsql-postgresql-socket.nix {
+ inherit fetchurl;
+ "clsql" = quicklisp-to-nix-packages."clsql";
+ "md5" = quicklisp-to-nix-packages."md5";
+ "uffi" = quicklisp-to-nix-packages."uffi";
+ }));
+
+
+ "clsql-postgresql" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."clsql-postgresql" or (x: {}))
+ (import ./quicklisp-to-nix-output/clsql-postgresql.nix {
+ inherit fetchurl;
+ "clsql" = quicklisp-to-nix-packages."clsql";
+ "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi";
+ "uffi" = quicklisp-to-nix-packages."uffi";
+ }));
+
+
+ "clsql" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."clsql" or (x: {}))
+ (import ./quicklisp-to-nix-output/clsql.nix {
+ inherit fetchurl;
+ "uffi" = quicklisp-to-nix-packages."uffi";
+ }));
+
+
"cl-smtp" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-smtp" or (x: {}))
@@ -3020,6 +3103,18 @@ let quicklisp-to-nix-packages = rec {
}));
+ "cl-slice" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-slice" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-slice.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "anaphora" = quicklisp-to-nix-packages."anaphora";
+ "clunit" = quicklisp-to-nix-packages."clunit";
+ "let-plus" = quicklisp-to-nix-packages."let-plus";
+ }));
+
+
"cl-reexport" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-reexport" or (x: {}))
@@ -3029,6 +3124,16 @@ let quicklisp-to-nix-packages = rec {
}));
+ "cl-qprint" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-qprint" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-qprint.nix {
+ inherit fetchurl;
+ "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+ }));
+
+
"cl-protobufs" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-protobufs" or (x: {}))
@@ -3042,6 +3147,21 @@ let quicklisp-to-nix-packages = rec {
}));
+ "cl-prevalence" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-prevalence" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-prevalence.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "s-sysdeps" = quicklisp-to-nix-packages."s-sysdeps";
+ "s-xml" = quicklisp-to-nix-packages."s-xml";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "usocket" = quicklisp-to-nix-packages."usocket";
+ "usocket-server" = quicklisp-to-nix-packages."usocket-server";
+ }));
+
+
"cl-ppcre-unicode" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-ppcre-unicode" or (x: {}))
@@ -3094,6 +3214,40 @@ let quicklisp-to-nix-packages = rec {
}));
+ "closure-html" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."closure-html" or (x: {}))
+ (import ./quicklisp-to-nix-output/closure-html.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "babel" = quicklisp-to-nix-packages."babel";
+ "closure-common" = quicklisp-to-nix-packages."closure-common";
+ "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+ }));
+
+
+ "closure-common" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."closure-common" or (x: {}))
+ (import ./quicklisp-to-nix-output/closure-common.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "babel" = quicklisp-to-nix-packages."babel";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+ }));
+
+
+ "closer-mop" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."closer-mop" or (x: {}))
+ (import ./quicklisp-to-nix-output/closer-mop.nix {
+ inherit fetchurl;
+ }));
+
+
"cl-mysql" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-mysql" or (x: {}))
@@ -3106,6 +3260,26 @@ let quicklisp-to-nix-packages = rec {
}));
+ "cl-locale" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-locale" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-locale.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "anaphora" = quicklisp-to-nix-packages."anaphora";
+ "arnesi" = quicklisp-to-nix-packages."arnesi";
+ "cl-annot" = quicklisp-to-nix-packages."cl-annot";
+ "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+ "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "collectors" = quicklisp-to-nix-packages."collectors";
+ "iterate" = quicklisp-to-nix-packages."iterate";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+ "symbol-munger" = quicklisp-to-nix-packages."symbol-munger";
+ "trivial-types" = quicklisp-to-nix-packages."trivial-types";
+ }));
+
+
"cl-libuv" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-libuv" or (x: {}))
@@ -3163,6 +3337,26 @@ let quicklisp-to-nix-packages = rec {
}));
+ "cl-interpol" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-interpol" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-interpol.nix {
+ inherit fetchurl;
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
+ "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+ }));
+
+
+ "cl-html-parse" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-html-parse" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-html-parse.nix {
+ inherit fetchurl;
+ }));
+
+
"cl-html5-parser" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-html5-parser" or (x: {}))
@@ -3175,14 +3369,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "cl-html-parse" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."cl-html-parse" or (x: {}))
- (import ./quicklisp-to-nix-output/cl-html-parse.nix {
- inherit fetchurl;
- }));
-
-
"cl-hooks" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-hooks" or (x: {}))
@@ -3238,6 +3424,18 @@ let quicklisp-to-nix-packages = rec {
}));
+ "cl-fad" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-fad" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-fad.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "unit-test" = quicklisp-to-nix-packages."unit-test";
+ }));
+
+
"cl-emb" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-emb" or (x: {}))
@@ -3247,6 +3445,15 @@ let quicklisp-to-nix-packages = rec {
}));
+ "cl-dot" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-dot" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-dot.nix {
+ inherit fetchurl;
+ "uiop" = quicklisp-to-nix-packages."uiop";
+ }));
+
+
"cl-dbi" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-dbi" or (x: {}))
@@ -3301,6 +3508,17 @@ let quicklisp-to-nix-packages = rec {
}));
+ "cl-containers" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-containers" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-containers.nix {
+ inherit fetchurl;
+ "asdf-system-connections" = quicklisp-to-nix-packages."asdf-system-connections";
+ "metatilities-base" = quicklisp-to-nix-packages."metatilities-base";
+ "moptilities" = quicklisp-to-nix-packages."moptilities";
+ }));
+
+
"cl-colors" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-colors" or (x: {}))
@@ -3322,6 +3540,29 @@ let quicklisp-to-nix-packages = rec {
}));
+ "cl-cffi-gtk" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-cffi-gtk" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-cffi-gtk.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "babel" = quicklisp-to-nix-packages."babel";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "cffi" = quicklisp-to-nix-packages."cffi";
+ "cl-cffi-gtk-cairo" = quicklisp-to-nix-packages."cl-cffi-gtk-cairo";
+ "cl-cffi-gtk-gdk" = quicklisp-to-nix-packages."cl-cffi-gtk-gdk";
+ "cl-cffi-gtk-gdk-pixbuf" = quicklisp-to-nix-packages."cl-cffi-gtk-gdk-pixbuf";
+ "cl-cffi-gtk-gio" = quicklisp-to-nix-packages."cl-cffi-gtk-gio";
+ "cl-cffi-gtk-glib" = quicklisp-to-nix-packages."cl-cffi-gtk-glib";
+ "cl-cffi-gtk-gobject" = quicklisp-to-nix-packages."cl-cffi-gtk-gobject";
+ "cl-cffi-gtk-pango" = quicklisp-to-nix-packages."cl-cffi-gtk-pango";
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "iterate" = quicklisp-to-nix-packages."iterate";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+ }));
+
+
"cl-base64" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-base64" or (x: {}))
@@ -3416,19 +3657,91 @@ let quicklisp-to-nix-packages = rec {
}));
- "cl_plus_ssl" = buildLispPackage
+ "cl-annot" = buildLispPackage
((f: x: (x // (f x)))
- (qlOverrides."cl_plus_ssl" or (x: {}))
- (import ./quicklisp-to-nix-output/cl_plus_ssl.nix {
+ (qlOverrides."cl-annot" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-annot.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ }));
+
+
+ "clack-v1-compat" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."clack-v1-compat" or (x: {}))
+ (import ./quicklisp-to-nix-output/clack-v1-compat.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"babel" = quicklisp-to-nix-packages."babel";
"bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
"cffi" = quicklisp-to-nix-packages."cffi";
+ "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+ "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
+ "chipz" = quicklisp-to-nix-packages."chipz";
+ "chunga" = quicklisp-to-nix-packages."chunga";
+ "circular-streams" = quicklisp-to-nix-packages."circular-streams";
+ "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl";
+ "cl-annot" = quicklisp-to-nix-packages."cl-annot";
+ "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+ "cl-cookie" = quicklisp-to-nix-packages."cl-cookie";
+ "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "cl-reexport" = quicklisp-to-nix-packages."cl-reexport";
+ "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+ "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+ "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
+ "clack" = quicklisp-to-nix-packages."clack";
+ "clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot";
+ "clack-socket" = quicklisp-to-nix-packages."clack-socket";
+ "clack-test" = quicklisp-to-nix-packages."clack-test";
+ "dexador" = quicklisp-to-nix-packages."dexador";
+ "dissect" = quicklisp-to-nix-packages."dissect";
+ "fast-http" = quicklisp-to-nix-packages."fast-http";
+ "fast-io" = quicklisp-to-nix-packages."fast-io";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ "http-body" = quicklisp-to-nix-packages."http-body";
+ "hunchentoot" = quicklisp-to-nix-packages."hunchentoot";
+ "ironclad" = quicklisp-to-nix-packages."ironclad";
+ "jonathan" = quicklisp-to-nix-packages."jonathan";
+ "lack" = quicklisp-to-nix-packages."lack";
+ "lack-component" = quicklisp-to-nix-packages."lack-component";
+ "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
+ "lack-util" = quicklisp-to-nix-packages."lack-util";
+ "local-time" = quicklisp-to-nix-packages."local-time";
+ "marshal" = quicklisp-to-nix-packages."marshal";
+ "md5" = quicklisp-to-nix-packages."md5";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+ "proc-parse" = quicklisp-to-nix-packages."proc-parse";
+ "quri" = quicklisp-to-nix-packages."quri";
+ "rfc2388" = quicklisp-to-nix-packages."rfc2388";
+ "rove" = quicklisp-to-nix-packages."rove";
+ "smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "static-vectors" = quicklisp-to-nix-packages."static-vectors";
+ "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
"trivial-features" = quicklisp-to-nix-packages."trivial-features";
"trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
"trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+ "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes";
+ "trivial-types" = quicklisp-to-nix-packages."trivial-types";
+ "uiop" = quicklisp-to-nix-packages."uiop";
+ "usocket" = quicklisp-to-nix-packages."usocket";
+ "xsubseq" = quicklisp-to-nix-packages."xsubseq";
+ }));
+
+
+ "clack" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."clack" or (x: {}))
+ (import ./quicklisp-to-nix-output/clack.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "ironclad" = quicklisp-to-nix-packages."ironclad";
+ "lack" = quicklisp-to-nix-packages."lack";
+ "lack-component" = quicklisp-to-nix-packages."lack-component";
+ "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
+ "lack-util" = quicklisp-to-nix-packages."lack-util";
"uiop" = quicklisp-to-nix-packages."uiop";
}));
@@ -3450,6 +3763,15 @@ let quicklisp-to-nix-packages = rec {
}));
+ "chunga" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."chunga" or (x: {}))
+ (import ./quicklisp-to-nix-output/chunga.nix {
+ inherit fetchurl;
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+ }));
+
+
"chipz" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."chipz" or (x: {}))
@@ -3458,6 +3780,17 @@ let quicklisp-to-nix-packages = rec {
}));
+ "chanl" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."chanl" or (x: {}))
+ (import ./quicklisp-to-nix-output/chanl.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "fiveam" = quicklisp-to-nix-packages."fiveam";
+ }));
+
+
"cffi-grovel" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cffi-grovel" or (x: {}))
@@ -3605,6 +3938,30 @@ let quicklisp-to-nix-packages = rec {
}));
+ "arnesi" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."arnesi" or (x: {}))
+ (import ./quicklisp-to-nix-output/arnesi.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "collectors" = quicklisp-to-nix-packages."collectors";
+ "iterate" = quicklisp-to-nix-packages."iterate";
+ "swank" = quicklisp-to-nix-packages."swank";
+ "symbol-munger" = quicklisp-to-nix-packages."symbol-munger";
+ }));
+
+
+ "anaphora" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."anaphora" or (x: {}))
+ (import ./quicklisp-to-nix-output/anaphora.nix {
+ inherit fetchurl;
+ "rt" = quicklisp-to-nix-packages."rt";
+ }));
+
+
"alexandria" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."alexandria" or (x: {}))
@@ -3613,6 +3970,32 @@ let quicklisp-to-nix-packages = rec {
}));
+ "acclimation" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."acclimation" or (x: {}))
+ (import ./quicklisp-to-nix-output/acclimation.nix {
+ inherit fetchurl;
+ }));
+
+
+ "access" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."access" or (x: {}))
+ (import ./quicklisp-to-nix-output/access.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "anaphora" = quicklisp-to-nix-packages."anaphora";
+ "cl-interpol" = quicklisp-to-nix-packages."cl-interpol";
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ "iterate" = quicklisp-to-nix-packages."iterate";
+ "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+ }));
+
+
"_3bmd" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."_3bmd" or (x: {}))
@@ -3624,21 +4007,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "cl-prevalence" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."cl-prevalence" or (x: {}))
- (import ./quicklisp-to-nix-output/cl-prevalence.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
- "s-sysdeps" = quicklisp-to-nix-packages."s-sysdeps";
- "s-xml" = quicklisp-to-nix-packages."s-xml";
- "split-sequence" = quicklisp-to-nix-packages."split-sequence";
- "usocket" = quicklisp-to-nix-packages."usocket";
- "usocket-server" = quicklisp-to-nix-packages."usocket-server";
- }));
-
-
};
in
quicklisp-to-nix-packages
From ea0d8882424909705c85e514fb8ed4316a56ed8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Sat, 24 Oct 2020 14:23:12 +0200
Subject: [PATCH 188/590] vimv: init at unstable-2019-10-31
---
pkgs/tools/misc/vimv/default.nix | 24 ++++++++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 ++
2 files changed, 26 insertions(+)
create mode 100644 pkgs/tools/misc/vimv/default.nix
diff --git a/pkgs/tools/misc/vimv/default.nix b/pkgs/tools/misc/vimv/default.nix
new file mode 100644
index 000000000000..023d3384ed68
--- /dev/null
+++ b/pkgs/tools/misc/vimv/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, bash, fetchFromGitHub }:
+stdenv.mkDerivation {
+ pname = "vimv";
+ version = "unstable-2019-10-31";
+ src = fetchFromGitHub {
+ owner = "thameera";
+ repo = "vimv";
+ rev = "4152496c1946f68a13c648fb7e583ef23dac4eb8";
+ sha256 = "1fsrfx2gs6bqx7wk7pgcji2i2x4alqpsi66aif4kqvnpqfhcfzjd";
+ };
+ phases = [ "installPhase" ];
+ installPhase = ''
+ install -d $out/bin
+ install $src/vimv $out/bin/vimv
+ patchShebangs $out/bin/vimv
+ '';
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/thameera/vimv";
+ description = "Batch-rename files using Vim";
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.kmein ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26f04573ddef..29590617fc3d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23823,6 +23823,8 @@ in
vimacs = callPackage ../applications/editors/vim/vimacs.nix { };
+ vimv = callPackage ../tools/misc/vimv/default.nix { };
+
qpdfview = libsForQt514.callPackage ../applications/misc/qpdfview {};
qtile = callPackage ../applications/window-managers/qtile {
From d2a28d3b38ece08992a892c8d4b1dcb45bc2588a Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Thu, 22 Oct 2020 01:26:51 +0300
Subject: [PATCH 189/590] xournalpp: 1.0.18 -> 1.0.19
---
pkgs/applications/graphics/xournalpp/default.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix
index ba396bfd92c5..da453b426786 100644
--- a/pkgs/applications/graphics/xournalpp/default.nix
+++ b/pkgs/applications/graphics/xournalpp/default.nix
@@ -22,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "xournalpp";
- version = "1.0.18";
+ version = "1.0.19";
src = fetchFromGitHub {
owner = "xournalpp";
repo = pname;
rev = version;
- sha256 = "0a9ygbmd4dwgck3k8wsrm2grynqa0adb12wwspzmzvpisbadffjy";
+ sha256 = "05nx4cmrka6hwdn7r91yy4h46qpa9k7iy9dkgaq3hrkh9z3fxlkq";
};
nativeBuildInputs = [ cmake gettext pkgconfig wrapGAppsHook ];
@@ -54,8 +54,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Xournal++ is a handwriting Notetaking software with PDF annotation support";
- homepage = "https://github.com/xournalpp/xournalpp";
- license = licenses.gpl2;
+ homepage = "https://xournalpp.github.io/";
+ license = licenses.gpl2Plus;
maintainers = with maintainers; [ andrew-d sikmir ];
platforms = platforms.linux;
};
From b1b7551cb05a29f6898b42242673eb2e2c37203c Mon Sep 17 00:00:00 2001
From: Frank Lanitz <frank@frank.uvena.de>
Date: Sun, 25 Oct 2020 19:13:51 +0100
Subject: [PATCH 190/590] geany: 1.36.0 -> 1.37.0
---
pkgs/applications/editors/geany/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index d3cc36244193..d56e5acc71bf 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "geany";
- version = "1.36";
+ version = "1.37";
outputs = [ "out" "dev" "doc" "man" ];
src = fetchurl {
url = "https://download.geany.org/${pname}-${version}.tar.bz2";
- sha256 = "0gnm17cr4rf3pmkf0axz4a0fxwnvp55ji0q0lzy88yqbshyxv14i";
+ sha256 = "dde52584823b769c56704c27dbedddb7a6bbaf4eacb9587d10bbc387816e3d51";
};
nativeBuildInputs = [
From 04100cd281b774fbfa4954bec7b6ee9b3ed62acb Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Fri, 23 Oct 2020 23:09:18 +0200
Subject: [PATCH 191/590] nixos/tests: restructure test driver so that QEMU is
actually overriden
Previously you would be able to override only the QEMU package to be
used in the test runner. Frankly that doesn't help a lot if you are
trying to get a graphical session. The graphical session requires the
option in the NixOS module system to bet set to the correct QEMU
package.
In this commit I moved most of the test node configuration and
transformations into the `mkDriver` function (previously called
`driver`). The motivation was to be able to create a `driver` instance
with a given QEMU package that will be used consistently througout the
test expression.
---
nixos/lib/testing-python.nix | 79 ++++++++++++++++++++++--------------
1 file changed, 48 insertions(+), 31 deletions(-)
diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix
index 302c7f78bf8e..b7d64d688775 100644
--- a/nixos/lib/testing-python.nix
+++ b/nixos/lib/testing-python.nix
@@ -9,7 +9,6 @@
# Modules to add to each VM
, extraConfigurations ? [] }:
-with import ./build-vms.nix { inherit system pkgs minimal specialArgs extraConfigurations; };
with pkgs;
rec {
@@ -51,9 +50,6 @@ rec {
'';
};
- testDriver = mkTestDriver qemu_test;
- testDriverInteractive = mkTestDriver qemu_kvm;
-
# Run an automated test suite in the given virtual network.
# `driver' is the script that runs the network.
runTests = driver:
@@ -88,25 +84,7 @@ rec {
maxTestNameLen = 50;
testNameLen = builtins.stringLength name;
- testDriverName = with builtins;
- if testNameLen > maxTestNameLen then
- abort ("The name of the test '${name}' must not be longer than ${toString maxTestNameLen} " +
- "it's currently ${toString testNameLen} characters long.")
- else
- "nixos-test-driver-${name}";
- nodes = buildVirtualNetwork (
- t.nodes or (if t ? machine then { machine = t.machine; } else { }));
-
- testScript' =
- # Call the test script with the computed nodes.
- if lib.isFunction testScript
- then testScript { inherit nodes; }
- else testScript;
-
- vlans = map (m: m.config.virtualisation.vlans) (lib.attrValues nodes);
-
- vms = map (m: m.config.system.build.vm) (lib.attrValues nodes);
ocrProg = tesseract4.override { enableLanguages = [ "eng" ]; };
@@ -115,8 +93,38 @@ rec {
# Generate convenience wrappers for running the test driver
# interactively with the specified network, and for starting the
# VMs from the command line.
- driver = testDriver:
- let
+ mkDriver = qemu_pkg:
+ let
+ build-vms = import ./build-vms.nix {
+ inherit system pkgs minimal specialArgs;
+ extraConfigurations = extraConfigurations ++ (pkgs.lib.optional (qemu_pkg != null)
+ {
+ virtualisation.qemu.package = qemu_pkg;
+ }
+ );
+ };
+
+ # FIXME: get this pkg from the module system
+ testDriver = mkTestDriver (if qemu_pkg == null then pkgs.qemu_test else qemu_pkg);
+
+ nodes = build-vms.buildVirtualNetwork (
+ t.nodes or (if t ? machine then { machine = t.machine; } else { }));
+ vlans = map (m: m.config.virtualisation.vlans) (lib.attrValues nodes);
+ vms = map (m: m.config.system.build.vm) (lib.attrValues nodes);
+
+ testScript' =
+ # Call the test script with the computed nodes.
+ if lib.isFunction testScript
+ then testScript { inherit nodes; }
+ else testScript;
+
+ testDriverName = with builtins;
+ if testNameLen > maxTestNameLen then
+ abort ("The name of the test '${name}' must not be longer than ${toString maxTestNameLen} " +
+ "it's currently ${toString testNameLen} characters long.")
+ else
+ "nixos-test-driver-${name}";
+
warn = if skipLint then lib.warn "Linting is disabled!" else lib.id;
in
warn (runCommand testDriverName
@@ -124,6 +132,9 @@ rec {
testScript = testScript';
preferLocalBuild = true;
testName = name;
+ passthru = {
+ inherit nodes;
+ };
}
''
mkdir -p $out/bin
@@ -154,9 +165,12 @@ rec {
meta = (drv.meta or {}) // t.meta;
};
- test = passMeta (runTests (driver testDriver));
+ driver = mkDriver null;
+ driverInteractive = mkDriver pkgs.qemu;
- nodeNames = builtins.attrNames nodes;
+ test = passMeta (runTests driver);
+
+ nodeNames = builtins.attrNames driver.nodes;
invalidNodeNames = lib.filter
(node: builtins.match "^[A-z_]([A-z0-9_]+)?$" node == null) nodeNames;
@@ -170,10 +184,9 @@ rec {
Please stick to alphanumeric chars and underscores as separation.
''
else
- test // {
- inherit nodes test;
- driver = driver testDriver;
- driverInteractive = driver testDriverInteractive;
+ test // {
+ inherit test driver driverInteractive;
+ inherit (test) nodes;
};
runInMachine =
@@ -184,7 +197,11 @@ rec {
, ... # ???
}:
let
- vm = buildVM { }
+ build-vms = import ./build-vms.nix {
+ inherit system pkgs minimal specialArgs extraConfigurations;
+ };
+
+ vm = build-vms.buildVM { }
[ machine
{ key = "run-in-machine";
networking.hostName = "client";
From 61b09f552c1b66befe83b114510c686ea98ffd0a Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Fri, 23 Oct 2020 23:13:38 +0200
Subject: [PATCH 192/590] nixos/tests: format the testing-python.nix file more
consistenly
---
nixos/lib/testing-python.nix | 202 ++++++++++++++++++-----------------
1 file changed, 105 insertions(+), 97 deletions(-)
diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix
index b7d64d688775..2a2a14bab7a2 100644
--- a/nixos/lib/testing-python.nix
+++ b/nixos/lib/testing-python.nix
@@ -3,11 +3,12 @@
# Use a minimal kernel?
, minimal ? false
# Ignored
-, config ? {}
+, config ? { }
# !!! See comment about args in lib/modules.nix
-, specialArgs ? {}
+, specialArgs ? { }
# Modules to add to each VM
-, extraConfigurations ? [] }:
+, extraConfigurations ? [ ]
+}:
with pkgs;
@@ -16,39 +17,41 @@ rec {
inherit pkgs;
- mkTestDriver = let
- testDriverScript = ./test-driver/test-driver.py;
- in qemu_pkg: stdenv.mkDerivation {
- name = "nixos-test-driver";
+ mkTestDriver =
+ let
+ testDriverScript = ./test-driver/test-driver.py;
+ in
+ qemu_pkg: stdenv.mkDerivation {
+ name = "nixos-test-driver";
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ (python3.withPackages (p: [ p.ptpython ])) ];
- checkInputs = with python3Packages; [ pylint black mypy ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ (python3.withPackages (p: [ p.ptpython ])) ];
+ checkInputs = with python3Packages; [ pylint black mypy ];
- dontUnpack = true;
+ dontUnpack = true;
- preferLocalBuild = true;
+ preferLocalBuild = true;
- doCheck = true;
- checkPhase = ''
- mypy --disallow-untyped-defs \
- --no-implicit-optional \
- --ignore-missing-imports ${testDriverScript}
- pylint --errors-only ${testDriverScript}
- black --check --diff ${testDriverScript}
- '';
-
- installPhase =
- ''
- mkdir -p $out/bin
- cp ${testDriverScript} $out/bin/nixos-test-driver
- chmod u+x $out/bin/nixos-test-driver
- # TODO: copy user script part into this file (append)
-
- wrapProgram $out/bin/nixos-test-driver \
- --prefix PATH : "${lib.makeBinPath [ qemu_pkg vde2 netpbm coreutils ]}" \
+ doCheck = true;
+ checkPhase = ''
+ mypy --disallow-untyped-defs \
+ --no-implicit-optional \
+ --ignore-missing-imports ${testDriverScript}
+ pylint --errors-only ${testDriverScript}
+ black --check --diff ${testDriverScript}
'';
- };
+
+ installPhase =
+ ''
+ mkdir -p $out/bin
+ cp ${testDriverScript} $out/bin/nixos-test-driver
+ chmod u+x $out/bin/nixos-test-driver
+ # TODO: copy user script part into this file (append)
+
+ wrapProgram $out/bin/nixos-test-driver \
+ --prefix PATH : "${lib.makeBinPath [ qemu_pkg vde2 netpbm coreutils ]}" \
+ '';
+ };
# Run an automated test suite in the given virtual network.
# `driver' is the script that runs the network.
@@ -71,11 +74,10 @@ rec {
{ testScript
, enableOCR ? false
, name ? "unnamed"
- # Skip linting (mainly intended for faster dev cycles)
+ # Skip linting (mainly intended for faster dev cycles)
, skipLint ? false
, ...
} @ t:
-
let
# A standard store path to the vm monitor is built like this:
# /tmp/nix-build-vm-test-run-$name.drv-0/vm-state-machine/monitor
@@ -94,7 +96,7 @@ rec {
# interactively with the specified network, and for starting the
# VMs from the command line.
mkDriver = qemu_pkg:
- let
+ let
build-vms = import ./build-vms.nix {
inherit system pkgs minimal specialArgs;
extraConfigurations = extraConfigurations ++ (pkgs.lib.optional (qemu_pkg != null)
@@ -108,7 +110,8 @@ rec {
testDriver = mkTestDriver (if qemu_pkg == null then pkgs.qemu_test else qemu_pkg);
nodes = build-vms.buildVirtualNetwork (
- t.nodes or (if t ? machine then { machine = t.machine; } else { }));
+ t.nodes or (if t ? machine then { machine = t.machine; } else { })
+ );
vlans = map (m: m.config.virtualisation.vlans) (lib.attrValues nodes);
vms = map (m: m.config.system.build.vm) (lib.attrValues nodes);
@@ -120,49 +123,51 @@ rec {
testDriverName = with builtins;
if testNameLen > maxTestNameLen then
- abort ("The name of the test '${name}' must not be longer than ${toString maxTestNameLen} " +
- "it's currently ${toString testNameLen} characters long.")
+ abort
+ ("The name of the test '${name}' must not be longer than ${toString maxTestNameLen} " +
+ "it's currently ${toString testNameLen} characters long.")
else
"nixos-test-driver-${name}";
warn = if skipLint then lib.warn "Linting is disabled!" else lib.id;
in
warn (runCommand testDriverName
- { buildInputs = [ makeWrapper];
- testScript = testScript';
- preferLocalBuild = true;
- testName = name;
- passthru = {
- inherit nodes;
- };
- }
- ''
- mkdir -p $out/bin
+ {
+ buildInputs = [ makeWrapper ];
+ testScript = testScript';
+ preferLocalBuild = true;
+ testName = name;
+ passthru = {
+ inherit nodes;
+ };
+ }
+ ''
+ mkdir -p $out/bin
- echo -n "$testScript" > $out/test-script
- ${lib.optionalString (!skipLint) ''
- ${python3Packages.black}/bin/black --check --diff $out/test-script
- ''}
+ echo -n "$testScript" > $out/test-script
+ ${lib.optionalString (!skipLint) ''
+ ${python3Packages.black}/bin/black --check --diff $out/test-script
+ ''}
- ln -s ${testDriver}/bin/nixos-test-driver $out/bin/
- vms=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done))
- wrapProgram $out/bin/nixos-test-driver \
- --add-flags "''${vms[*]}" \
- ${lib.optionalString enableOCR
- "--prefix PATH : '${ocrProg}/bin:${imagemagick_tiff}/bin'"} \
- --run "export testScript=\"\$(${coreutils}/bin/cat $out/test-script)\"" \
- --set VLANS '${toString vlans}'
- ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms
- wrapProgram $out/bin/nixos-run-vms \
- --add-flags "''${vms[*]}" \
- ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \
- --set tests 'start_all(); join_all();' \
- --set VLANS '${toString vlans}' \
- ${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"}
- ''); # "
+ ln -s ${testDriver}/bin/nixos-test-driver $out/bin/
+ vms=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done))
+ wrapProgram $out/bin/nixos-test-driver \
+ --add-flags "''${vms[*]}" \
+ ${lib.optionalString enableOCR
+ "--prefix PATH : '${ocrProg}/bin:${imagemagick_tiff}/bin'"} \
+ --run "export testScript=\"\$(${coreutils}/bin/cat $out/test-script)\"" \
+ --set VLANS '${toString vlans}'
+ ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms
+ wrapProgram $out/bin/nixos-run-vms \
+ --add-flags "''${vms[*]}" \
+ ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \
+ --set tests 'start_all(); join_all();' \
+ --set VLANS '${toString vlans}' \
+ ${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"}
+ ''); # "
passMeta = drv: drv // lib.optionalAttrs (t ? meta) {
- meta = (drv.meta or {}) // t.meta;
+ meta = (drv.meta or { }) // t.meta;
};
driver = mkDriver null;
@@ -172,22 +177,23 @@ rec {
nodeNames = builtins.attrNames driver.nodes;
invalidNodeNames = lib.filter
- (node: builtins.match "^[A-z_]([A-z0-9_]+)?$" node == null) nodeNames;
+ (node: builtins.match "^[A-z_]([A-z0-9_]+)?$" node == null)
+ nodeNames;
in
- if lib.length invalidNodeNames > 0 then
- throw ''
- Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})!
- All machines are referenced as python variables in the testing framework which will break the
- script when special characters are used.
+ if lib.length invalidNodeNames > 0 then
+ throw ''
+ Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})!
+ All machines are referenced as python variables in the testing framework which will break the
+ script when special characters are used.
- Please stick to alphanumeric chars and underscores as separation.
- ''
- else
+ Please stick to alphanumeric chars and underscores as separation.
+ ''
+ else
test // {
- inherit test driver driverInteractive;
- inherit (test) nodes;
- };
+ inherit test driver driverInteractive;
+ inherit (test) nodes;
+ };
runInMachine =
{ drv
@@ -202,8 +208,10 @@ rec {
};
vm = build-vms.buildVM { }
- [ machine
- { key = "run-in-machine";
+ [
+ machine
+ {
+ key = "run-in-machine";
networking.hostName = "client";
nix.readOnlyStore = false;
virtualisation.writableStore = false;
@@ -250,16 +258,16 @@ rec {
''; # */
in
- lib.overrideDerivation drv (attrs: {
- requiredSystemFeatures = [ "kvm" ];
- builder = "${bash}/bin/sh";
- args = ["-e" vmRunCommand];
- origArgs = attrs.args;
- origBuilder = attrs.builder;
- });
+ lib.overrideDerivation drv (attrs: {
+ requiredSystemFeatures = [ "kvm" ];
+ builder = "${bash}/bin/sh";
+ args = [ "-e" vmRunCommand ];
+ origArgs = attrs.args;
+ origBuilder = attrs.builder;
+ });
- runInMachineWithX = { require ? [], ... } @ args:
+ runInMachineWithX = { require ? [ ], ... } @ args:
let
client =
{ ... }:
@@ -275,13 +283,13 @@ rec {
services.xserver.windowManager.icewm.enable = true;
};
in
- runInMachine ({
- machine = client;
- preBuild =
- ''
- client.wait_for_x()
- '';
- } // args);
+ runInMachine ({
+ machine = client;
+ preBuild =
+ ''
+ client.wait_for_x()
+ '';
+ } // args);
simpleTest = as: (makeTest as).test;
From fa25d84d1330ee66e9df41d4e5dd8e85d8b506a0 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sat, 24 Oct 2020 21:28:38 +0200
Subject: [PATCH 193/590] nixos/tests: fix testDriver reference in runInMachine
function
In a previous commit I broke this as there is no longer one testDriver
but only a function to generate one based on some QEMU inputs.
---
nixos/lib/testing-python.nix | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix
index 2a2a14bab7a2..d78193c26000 100644
--- a/nixos/lib/testing-python.nix
+++ b/nixos/lib/testing-python.nix
@@ -200,6 +200,7 @@ rec {
, machine
, preBuild ? ""
, postBuild ? ""
+ , qemu ? pkgs.qemu_test
, ... # ???
}:
let
@@ -254,7 +255,7 @@ rec {
unset xchg
export tests='${testScript}'
- ${testDriver}/bin/nixos-test-driver ${vm.config.system.build.vm}/bin/run-*-vm
+ ${mkTestDriver qemu}/bin/nixos-test-driver ${vm.config.system.build.vm}/bin/run-*-vm
''; # */
in
From 73635b859d75a0789623969adef9e46cc4b34e23 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sat, 24 Oct 2020 22:17:32 +0200
Subject: [PATCH 194/590] nixos/tests: fix runInMachine
In 5500dc8 we introduced the --keep-vm-state flag and defaulted to that
flag not being set. This lead to the `runInMachine` tests not longer
working and that going unnoticed for quite some time now.
---
nixos/lib/testing-python.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix
index d78193c26000..8dad4d535162 100644
--- a/nixos/lib/testing-python.nix
+++ b/nixos/lib/testing-python.nix
@@ -255,7 +255,7 @@ rec {
unset xchg
export tests='${testScript}'
- ${mkTestDriver qemu}/bin/nixos-test-driver ${vm.config.system.build.vm}/bin/run-*-vm
+ ${mkTestDriver qemu}/bin/nixos-test-driver --keep-vm-state ${vm.config.system.build.vm}/bin/run-*-vm
''; # */
in
From d4fb7daafdc694d01befebe7d941bfd729568ccb Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sun, 25 Oct 2020 00:59:59 +0200
Subject: [PATCH 195/590] nixos-build-vms: use the driverInteractive attribute
instead
This reverts commit aab534b894c60e69199aba4cc57b8b3f8fd1a8c2 & uses the
driverInteractive attribute for the test driver instead.
This has the same effect but removes the extra module in the
nixos-build-vms code.
---
.../installer/tools/nixos-build-vms/build-vms.nix | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix b/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
index 199e5f9206b1..e49ceba24245 100644
--- a/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
+++ b/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
@@ -6,12 +6,7 @@
let
nodes = builtins.mapAttrs (vm: module: {
_file = "${networkExpr}@node-${vm}";
- imports = [
- module
- ({ pkgs, ... }: {
- virtualisation.qemu.package = pkgs.qemu;
- })
- ];
+ imports = [ module ];
}) (import networkExpr);
in
@@ -20,4 +15,4 @@ with import ../../../../lib/testing-python.nix {
pkgs = import ../../../../.. { inherit system config; };
};
-(makeTest { inherit nodes; testScript = ""; }).driver
+(makeTest { inherit nodes; testScript = ""; }).driverInteractive
From f646364f4fc72dfa1487a5cccf1aeea3a6cac086 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 19:31:34 +0000
Subject: [PATCH 196/590] libxls: 1.6.0 -> 1.6.1
---
pkgs/development/libraries/libxls/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix
index 192e732b5c0c..00300899589a 100644
--- a/pkgs/development/libraries/libxls/default.nix
+++ b/pkgs/development/libraries/libxls/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libxls";
- version = "1.6.0";
+ version = "1.6.1";
src = fetchurl {
url = "https://github.com/libxls/libxls/releases/download/v${version}/libxls-${version}.tar.gz";
- sha256 = "1m3acryv0l4zkj0w3h8vf23rfklschqcbaf484qms2lrx8gakvws";
+ sha256 = "1y7wk55blk16hmvf9dz5ci84hlhv6pw6mnr1mfnibfw3gsxmzhyv";
};
nativeBuildInputs = [ unzip ];
From 835ba5b069433facbe40661160d56b34dc012212 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 19:38:14 +0000
Subject: [PATCH 197/590] liquibase: 4.0.0 -> 4.1.1
---
pkgs/development/tools/database/liquibase/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix
index 75ccca43a690..93698e8d8e97 100644
--- a/pkgs/development/tools/database/liquibase/default.nix
+++ b/pkgs/development/tools/database/liquibase/default.nix
@@ -10,11 +10,11 @@ in
stdenv.mkDerivation rec {
pname = "liquibase";
- version = "4.0.0";
+ version = "4.1.1";
src = fetchurl {
url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz";
- sha256 = "06wpvqyv7w749l3ndvzg1p774rv1apbmbpwbdlad57pih4nqa7mm";
+ sha256 = "0gq3y2cgqb1dky5baqjydwmnaimczvsfg8dqc55c7aqcgy7hp3pg";
};
buildInputs = [ jre makeWrapper ];
From a37ff262d4ffa81b830b9193c22705ec7cb46453 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 19:45:44 +0000
Subject: [PATCH 198/590] livepeer: 0.5.10 -> 0.5.11
---
pkgs/servers/livepeer/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix
index 60122d6b451d..5430c7ddf068 100644
--- a/pkgs/servers/livepeer/default.nix
+++ b/pkgs/servers/livepeer/default.nix
@@ -4,16 +4,16 @@
buildGoModule rec {
pname = "livepeer";
- version = "0.5.10";
+ version = "0.5.11";
runVend = true;
- vendorSha256 = "0i5977skw4b209zvdvgvzfnhqb574067mmfk2gf9y590lgnr86f7";
+ vendorSha256 = "13cgwpf3v4vlvb0mgdxsdybpghx1cp3fzkdwmq8b193a8dcl8s63";
src = fetchFromGitHub {
owner = "livepeer";
repo = "go-livepeer";
rev = "v${version}";
- sha256 = "0qccvnk2yyly7ha9lkcpd6zj5n9xnhdjkl3nllb9xziidsq6p65h";
+ sha256 = "12vbnl74z6jk77bnws8a5z5n7bnhkbb4ngzxfir5l3g9zrpsc5p3";
};
# livepeer_cli has a vendoring problem
From 1b8842e7577eda308b4833279deefdc28f7fa4ce Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 19:55:08 +0000
Subject: [PATCH 199/590] lucky-cli: 0.23.1 -> 0.24.0
---
pkgs/development/web/lucky-cli/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/web/lucky-cli/default.nix b/pkgs/development/web/lucky-cli/default.nix
index 8add66bf998a..ffa6fba778a2 100644
--- a/pkgs/development/web/lucky-cli/default.nix
+++ b/pkgs/development/web/lucky-cli/default.nix
@@ -2,13 +2,13 @@
crystal.buildCrystalPackage rec {
pname = "lucky-cli";
- version = "0.23.1";
+ version = "0.24.0";
src = fetchFromGitHub {
owner = "luckyframework";
repo = "lucky_cli";
rev = "v${version}";
- sha256 = "0xj7mcmz1rxv3ff530q8c5y1y7hccsmr8azk9nhmrk1q355vnxfw";
+ sha256 = "1z1ns6lx5v6nd5s78brpx7jarc9aldca5yrqjrdb14iyw0jlxig4";
};
# the integration tests will try to clone a remote repos
From 03206f88e57f9cc712f617fbdd1104d5794a2047 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 20:04:47 +0000
Subject: [PATCH 200/590] lynis: 3.0.0 -> 3.0.1
---
pkgs/tools/security/lynis/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix
index d7f42479d0b4..9bbbc455b9b3 100644
--- a/pkgs/tools/security/lynis/default.nix
+++ b/pkgs/tools/security/lynis/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lynis";
- version = "3.0.0";
+ version = "3.0.1";
src = fetchFromGitHub {
owner = "CISOfy";
repo = pname;
rev = version;
- sha256 = "05p8h2ww4jcc6lgxrm796cbvlfmw26rxq5fmw0xxavbpadiw752j";
+ sha256 = "0lsb455rimr1cjxqcgy819xjxf1faas8wlx2x0pxhn5yha9w9sfs";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];
From afdd017def7d0f8b673aae38c60c3c621f9d3fa1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 20:31:23 +0000
Subject: [PATCH 201/590] matcha-gtk-theme: 2020-10-05 -> 2020-10-23
---
pkgs/data/themes/matcha/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
index bc0776695501..7ed6acb2800e 100644
--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "matcha-gtk-theme";
- version = "2020-10-05";
+ version = "2020-10-23";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
- sha256 = "0pkgpipffwxphn16p6r911mbhqhjyk60svirxzm2phlhxl0ddwpj";
+ sha256 = "125wcvr457lbs8zxp8r18q7gzagp0wbg518iynzmbax8gsjds8w3";
};
buildInputs = [ gdk-pixbuf librsvg ];
From 5ac9edb1217252929b929382ae543c7a9f147d66 Mon Sep 17 00:00:00 2001
From: Frank Doepper <github@woffs.de>
Date: Sun, 25 Oct 2020 21:28:56 +0100
Subject: [PATCH 202/590] btrfs-progs: 5.7 -> 5.9
---
pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index 8ff72421a598..3358d1c02776 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "btrfs-progs";
- version = "5.7";
+ version = "5.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
- sha256 = "0p6ycbr8sw5bq3mj84gh9rvh5sk8sjr2l9hb9dhm4j41ij5h8bsw";
+ sha256 = "14d7hz07kfczfgmy1ixkgccjn393gpkjn7givz5kwxddcnk5i4xq";
};
nativeBuildInputs = [
From eace2d684898d8a3ffe55218c4cbce5e5c00275d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 20:44:45 +0000
Subject: [PATCH 203/590] mdbook: 0.4.3 -> 0.4.4
---
pkgs/tools/text/mdbook/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix
index 0a5eae904736..8e0350177425 100644
--- a/pkgs/tools/text/mdbook/default.nix
+++ b/pkgs/tools/text/mdbook/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "mdbook";
- version = "0.4.3";
+ version = "0.4.4";
src = fetchFromGitHub {
owner = "rust-lang-nursery";
repo = "mdBook";
rev = "v${version}";
- sha256 = "1566jabmvafv6aiw5nvb6y2zcnxc7pbb9dl3s4vi6mx21kqp68ag";
+ sha256 = "0nqr5a27i91m71fhpycf60q54qplc920y1fmk9hav3pbb9wcc5dl";
};
- cargoSha256 = "0sa1h3qzdhgk2h3wrc0kg0ajq6zbkvn1ry4672gfn3j9gpgvy2bb";
+ cargoSha256 = "1p72iwl9ca7a92nf6wyjjbn0qns0xxb4xrbz2r2nmd83cxs0fplg";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
From dab7064970d546e622414e4ff05be57927be17f4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 21:18:39 +0000
Subject: [PATCH 204/590] minikube: 1.14.0 -> 1.14.1
---
pkgs/applications/networking/cluster/minikube/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index ff6e152a5ff2..299c1fb523c5 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -11,9 +11,9 @@
buildGoModule rec {
pname = "minikube";
- version = "1.14.0";
+ version = "1.14.1";
- vendorSha256 = "03imagmsfj9rv5g2sybpdx9y7vdwag3mrsjibgsbq3jhf7r1ib3g";
+ vendorSha256 = "057mlmja3mygfdf0cp0bcm0chq7s30bjcs5hqacwl6c79ivrjf89";
doCheck = false;
@@ -21,7 +21,7 @@ buildGoModule rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
- sha256 = "1nwpgfgw3vg8zy3mvjja13vdj12mys4crdm8cfimv9g3ka08dqpx";
+ sha256 = "000i30qsjx1h2x6b8vb5piq9lhjrz5hj9wza7gxsrzsf2z9rhryg";
};
nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ];
From cf36a4fea87f6f4bb61d748fdaee50a1d614b277 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Sun, 25 Oct 2020 22:47:18 +0100
Subject: [PATCH 205/590] maintainers scripts: Fix shebang
Fixes:
error: syntax error, unexpected $undefined, at (string):1:94
---
maintainers/scripts/hydra-eval-failures.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py
index 0f738c5427bd..b7518b128574 100755
--- a/maintainers/scripts/hydra-eval-failures.py
+++ b/maintainers/scripts/hydra-eval-failures.py
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
-#!nix-shell -i python3 -p 'python3.withPackages(ps: with ps; [ requests pyquery click ])'
+#!nix-shell -i python3 -p "python3.withPackages(ps: with ps; [ requests pyquery click ])"
# To use, just execute this script with --help to display help.
From 317462428a5e5e87ce75f60f182c9a97b0dcc06f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 21:59:26 +0000
Subject: [PATCH 206/590] mlkit: 4.5.0 -> 4.5.1
---
pkgs/development/compilers/mlkit/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/compilers/mlkit/default.nix b/pkgs/development/compilers/mlkit/default.nix
index 6fa581452507..ecb3362e77a1 100644
--- a/pkgs/development/compilers/mlkit/default.nix
+++ b/pkgs/development/compilers/mlkit/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "mlkit";
- version = "4.5.0";
+ version = "4.5.1";
src = fetchFromGitHub {
owner = "melsman";
repo = "mlkit";
rev = "v${version}";
- sha256 = "0fc0y40qphn02857fv2dvhwzzsvgixzchx9i6i0x80xfv7z68fbh";
+ sha256 = "1zigigp168737vjrw5vijgyw4k1bgz4sr7j3rwlibw52snsh4y1c";
};
nativeBuildInputs = [ autoreconfHook mlton ];
From b42b8c1396b1c5ede01a4f1cec4a851a5ca867b4 Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Sun, 25 Oct 2020 23:13:15 +0100
Subject: [PATCH 207/590] kops_1_18: 1.18.1 -> 1.18.2 (#101692)
---
pkgs/applications/networking/cluster/kops/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index baf10e273fb7..a81c33a84bb1 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -64,8 +64,8 @@ rec {
};
kops_1_18 = mkKops rec {
- version = "1.18.1";
- sha256 = "0jw23vmq2v9czxyansggq4fapz1bcaclmxpw6na4dsn8zcssz320";
+ version = "1.18.2";
+ sha256 = "17na83j6sfhk69w9ssvicc0xd1904z952ad3zzbpha50lcy6nlhp";
rev = "v${version}";
};
}
From 5e42102f1376bb9c548a429fbdca4bb15b9b6104 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 22:17:56 +0000
Subject: [PATCH 208/590] moosefs: 3.0.114 -> 3.0.115
---
pkgs/tools/filesystems/moosefs/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix
index df3dd661d75e..2be21cea3a57 100644
--- a/pkgs/tools/filesystems/moosefs/default.nix
+++ b/pkgs/tools/filesystems/moosefs/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "moosefs";
- version = "3.0.114";
+ version = "3.0.115";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "0bilrzzlg599xy21cm7r0xb2sanngr74j3z03xgybcm10kl97i7j";
+ sha256 = "0dap9dqwwx8adma6arxg015riqc86cmjv2m44hk0kz7s24h79ipq";
};
nativeBuildInputs = [ pkgconfig makeWrapper ];
From 6ad02be2f119ed358993914269737845e0f6b501 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 22:33:09 +0000
Subject: [PATCH 209/590] mpd-mpris: 0.2.4 -> 0.3.0
---
pkgs/tools/audio/mpd-mpris/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/audio/mpd-mpris/default.nix b/pkgs/tools/audio/mpd-mpris/default.nix
index 79387d9ad1f9..c66a12dadd3a 100644
--- a/pkgs/tools/audio/mpd-mpris/default.nix
+++ b/pkgs/tools/audio/mpd-mpris/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "mpd-mpris";
- version = "0.2.4";
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "natsukagami";
repo = pname;
rev = "v${version}";
- sha256 = "1cr5j2z2ynj1hwkjzi5amcg59vmgazsci41v6vpsj119g7psjmzm";
+ sha256 = "1kzjbv04b2garb99l64wdq8yksnm4pbhkgyzh89j5j3gb9k55zal";
};
- vendorSha256 = "108yjymp64iqx1b2wqjbkmbm2w199wq46g7hrmqhcziv6f4aqljp";
+ vendorSha256 = "1ggrqwd3h602rav1dc3amsf4wxsq8mdq4ijkdsg759sqhpzl6rqs";
doCheck = false;
From 3825e74193a6494996dd7f7cfb17f9942f0f2b86 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 25 Oct 2020 20:38:25 +0100
Subject: [PATCH 210/590] treewide: drop gnome2.pango alias
---
pkgs/applications/blockchains/exodus/default.nix | 4 ++--
pkgs/applications/misc/polar-bookshelf/default.nix | 8 ++++----
.../networking/mailreaders/inboxer/default.nix | 4 ++--
pkgs/applications/video/lightworks/default.nix | 4 ++--
pkgs/applications/video/streamlink-twitch-gui/bin.nix | 4 ++--
pkgs/development/compilers/zulu/8.nix | 6 +++---
pkgs/development/compilers/zulu/default.nix | 6 +++---
pkgs/development/web/insomnia/default.nix | 4 ++--
pkgs/games/minecraft/default.nix | 4 ++--
pkgs/misc/lightspark/default.nix | 4 ++--
pkgs/tools/misc/mongodb-compass/default.nix | 10 +++++-----
pkgs/tools/misc/sweep-visualizer/default.nix | 4 ++--
12 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix
index af49bb9121f6..0c0b6a243010 100644
--- a/pkgs/applications/blockchains/exodus/default.nix
+++ b/pkgs/applications/blockchains/exodus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, gnome2,
+{ stdenv, lib, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, pango,
atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, utillinux, alsaLib, dbus, at-spi2-atk,
cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }:
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
nss
nspr
gtk3-x11
- gnome2.pango
+ pango
atk
cairo
gdk-pixbuf
diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix
index 496340e0d753..cd309797aa32 100644
--- a/pkgs/applications/misc/polar-bookshelf/default.nix
+++ b/pkgs/applications/misc/polar-bookshelf/default.nix
@@ -1,11 +1,11 @@
{ stdenv, lib, makeWrapper, fetchurl
, dpkg, wrapGAppsHook, autoPatchelfHook
-, gtk3, cairo, gnome2, atk, gdk-pixbuf, glib
+, gtk3, cairo, pango, atk, gdk-pixbuf, glib
, at-spi2-atk, dbus, libX11, libxcb, libXi
, libXcursor, libXdamage, libXrandr, libXcomposite
, libXext, libXfixes, libXrender, libXtst, libXScrnSaver
, nss, nspr, alsaLib, cups, fontconfig, expat
-, libudev0-shim, glibc, curl, openssl, libnghttp2, gnome3 }:
+, libudev0-shim, glibc, curl, openssl, libnghttp2, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
@@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- gnome3.gsettings_desktop_schemas
+ gsettings-desktop-schemas
glib
gtk3
cairo
- gnome2.pango
+ pango
atk
gdk-pixbuf
at-spi2-atk
diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix
index 189ac1e6aaed..a11e57636993 100644
--- a/pkgs/applications/networking/mailreaders/inboxer/default.nix
+++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, binutils, patchelf, makeWrapper
-, expat, xorg, gdk-pixbuf, glib, gnome2, cairo, atk, freetype
+, expat, xorg, gdk-pixbuf, glib, gnome2, cairo, atk, freetype, pango
, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, udev }:
stdenv.mkDerivation rec {
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
xorg.libxcb
gdk-pixbuf
glib
- gnome2.pango
+ pango
gnome2.GConf
expat
stdenv.cc.cc.lib
diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix
index da413915e37e..97e5e67aaec1 100644
--- a/pkgs/applications/video/lightworks/default.nix
+++ b/pkgs/applications/video/lightworks/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv
-, gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU
+, gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, pango, libGLU
, nvidia_cg_toolkit, zlib, openssl, portaudio
}:
let
@@ -10,7 +10,7 @@ let
cairo
libjpeg_original
glib
- gnome2.pango
+ pango
libGLU
nvidia_cg_toolkit
zlib
diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix
index 251f495b7e15..1c955a36f34a 100644
--- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix
+++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix
@@ -1,6 +1,6 @@
{ autoPatchelfHook, fetchurl, lib, makeDesktopItem, makeWrapper, stdenv, wrapGAppsHook
, at-spi2-core, atk, alsaLib, cairo, cups, dbus, expat, gcc-unwrapped
-, gdk-pixbuf, glib, gnome2, gtk3-x11, libudev0-shim, libuuid, nss, nspr, xorg
+, gdk-pixbuf, glib, pango, gtk3-x11, libudev0-shim, libuuid, nss, nspr, xorg
, streamlink }:
let
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
gcc-unwrapped
gdk-pixbuf
glib
- gnome2.pango
+ pango
gtk3-x11
nss
nspr
diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix
index 8df1c05d8b82..bea32475f9a8 100644
--- a/pkgs/development/compilers/zulu/8.nix
+++ b/pkgs/development/compilers/zulu/8.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath
, zulu, glib, libxml2, libav_0_8, ffmpeg_3, libxslt, libGL, alsaLib
-, fontconfig, freetype, gnome2, cairo, gdk-pixbuf, atk, xorg
+, fontconfig, freetype, pango, gtk2, cairo, gdk-pixbuf, atk, xorg
, swingSupport ? true }:
let
@@ -16,8 +16,8 @@ let
libraries = [
stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL
- xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango
- gnome2.gtk cairo gdk-pixbuf atk
+ xorg.libXxf86vm alsaLib fontconfig freetype pango
+ gtk2 cairo gdk-pixbuf atk
] ++ (lib.optionals swingSupport (with xorg; [
xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp
xorg.libXt xorg.libXrender stdenv.cc.cc
diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix
index 151a9e5f1d2a..73e7bd7d338a 100644
--- a/pkgs/development/compilers/zulu/default.nix
+++ b/pkgs/development/compilers/zulu/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath
, zulu, glib, libxml2, libav_0_8, ffmpeg_3, libxslt, libGL, alsaLib
-, fontconfig, freetype, gnome2, cairo, gdk-pixbuf, atk, xorg, zlib
+, fontconfig, freetype, pango, gtk2, cairo, gdk-pixbuf, atk, xorg, zlib
, swingSupport ? true }:
let
@@ -16,8 +16,8 @@ let
libraries = [
stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL
- xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango
- gnome2.gtk cairo gdk-pixbuf atk zlib
+ xorg.libXxf86vm alsaLib fontconfig freetype pango
+ gtk2 cairo gdk-pixbuf atk zlib
] ++ (lib.optionals swingSupport (with xorg; [
xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp
xorg.libXt xorg.libXrender stdenv.cc.cc
diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix
index d877aa5331d5..0640e0993413 100644
--- a/pkgs/development/web/insomnia/default.nix
+++ b/pkgs/development/web/insomnia/default.nix
@@ -1,5 +1,5 @@
{ stdenv, makeWrapper, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat
-, fontconfig, freetype, gdk-pixbuf, glib, gnome2, nspr, nss, gtk3, gtk2
+, fontconfig, freetype, gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3, gtk2
, at-spi2-atk, gsettings-desktop-schemas, gobject-introspection, wrapGAppsHook
, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nghttp2
@@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
gdk-pixbuf
glib
gnome2.GConf
- gnome2.pango
+ pango
gtk2
gtk3
gsettings-desktop-schemas
diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
index 8052b11fb6fe..60f89bea0e8f 100644
--- a/pkgs/games/minecraft/default.nix
+++ b/pkgs/games/minecraft/default.nix
@@ -10,7 +10,7 @@
, nss
, nspr
, fontconfig
-, gnome2
+, pango
, cairo
, expat
, alsaLib
@@ -59,7 +59,7 @@ let
freetype
gdk-pixbuf
glib
- gnome2.pango
+ pango
gtk3-x11
gtk2-x11
nspr
diff --git a/pkgs/misc/lightspark/default.nix b/pkgs/misc/lightspark/default.nix
index 833d8a82990e..86177892f431 100644
--- a/pkgs/misc/lightspark/default.nix
+++ b/pkgs/misc/lightspark/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, curl, zlib, ffmpeg_3, glew, pcre
-, rtmpdump, cairo, boost, SDL2, SDL2_mixer, libjpeg, gnome2, lzma, nasm
+, rtmpdump, cairo, boost, SDL2, SDL2_mixer, libjpeg, pango, lzma, nasm
, llvm, glibmm
}:
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [
curl zlib ffmpeg_3 glew pcre rtmpdump cairo boost SDL2 SDL2_mixer libjpeg
- gnome2.pango lzma nasm llvm glibmm
+ pango lzma nasm llvm glibmm
];
enableParallelBuilding = true;
diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix
index ec6be6eba28b..93fca738dc40 100644
--- a/pkgs/tools/misc/mongodb-compass/default.nix
+++ b/pkgs/tools/misc/mongodb-compass/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, dpkg
, alsaLib, at-spi2-atk, at-spi2-core, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
-, gnome2, gnome3, libnotify, libsecret, libuuid, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }:
+, gnome2, gdk-pixbuf, gtk3, pango, libnotify, libsecret, libuuid, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }:
let
version = "1.22.1";
@@ -19,9 +19,9 @@ let
freetype
glib
gnome2.GConf
- gnome2.gdk_pixbuf
- gnome3.gtk
- gnome2.pango
+ gdk-pixbuf
+ gtk3
+ pango
libnotify
libsecret
libuuid
@@ -60,7 +60,7 @@ in stdenv.mkDerivation {
inherit src;
- buildInputs = [ dpkg wrapGAppsHook gnome3.gtk ];
+ buildInputs = [ dpkg wrapGAppsHook gtk3 ];
dontUnpack = true;
buildCommand = ''
diff --git a/pkgs/tools/misc/sweep-visualizer/default.nix b/pkgs/tools/misc/sweep-visualizer/default.nix
index 21e6f49df1f5..fdd3c5f628d0 100644
--- a/pkgs/tools/misc/sweep-visualizer/default.nix
+++ b/pkgs/tools/misc/sweep-visualizer/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, makeWrapper, fetchurl,
alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib,
- gnome2, gtk2-x11, nspr, nss,
+ gnome2, pango, gtk2-x11, nspr, nss,
libX11, libxcb, libXcomposite, libXcursor, libXdamage, libXext, libXfixes,
libXi, libXrandr, libXrender, libXScrnSaver, libXtst,
libudev0-shim
@@ -33,7 +33,7 @@
preFixup = let
libPath = lib.makeLibraryPath [
alsaLib atk cairo cups.lib dbus.lib expat fontconfig.lib freetype
- gdk-pixbuf glib gnome2.GConf gnome2.pango gtk2-x11 nspr nss stdenv.cc.cc.lib
+ gdk-pixbuf glib gnome2.GConf pango gtk2-x11 nspr nss stdenv.cc.cc.lib
libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes
libXi libXrandr libXrender libXScrnSaver libXtst
];
From e2b73e55d4492dda50f1100ae3852ba335f54555 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 22:52:34 +0000
Subject: [PATCH 211/590] ncspot: 0.2.2 -> 0.2.3
---
pkgs/applications/audio/ncspot/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix
index 2fcbf82107d6..0f65438737be 100644
--- a/pkgs/applications/audio/ncspot/default.nix
+++ b/pkgs/applications/audio/ncspot/default.nix
@@ -14,16 +14,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "ncspot";
- version = "0.2.2";
+ version = "0.2.3";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "v${version}";
- sha256 = "1i17pidw2hylijwfn96f2bnswfxxwdln2ydsq8b1q4hfzfbxlfk2";
+ sha256 = "08lxdd6biypxmzfc34cbrpsp9ajb157my4vc51ra5237b7jmy6vk";
};
- cargoSha256 = "1cpy4wrj9dz2crva4p18f8hzym73x4m2mcfds4ppri4ir7qg29dr";
+ cargoSha256 = "110mqm1md8x7vjw3hsy4yz8nj38h6mwrr357awchq52inxj3jmbk";
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
From 2633358ec79544d466dbbe189c9b9fc575f2aad0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 23:03:46 +0000
Subject: [PATCH 212/590] netdata: 1.25.0 -> 1.26.0
---
pkgs/tools/system/netdata/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index f1bb1f9d62d0..8192dfe6c14d 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -15,14 +15,14 @@ with stdenv.lib;
let
go-d-plugin = callPackage ./go.d.plugin.nix {};
in stdenv.mkDerivation rec {
- version = "1.25.0";
+ version = "1.26.0";
pname = "netdata";
src = fetchFromGitHub {
owner = "netdata";
repo = "netdata";
rev = "v${version}";
- sha256 = "0wsgs0slqmj9q5prwlx7d4692lc4c42g0sv35r33vlxnfdwimfh5";
+ sha256 = "0pvl1y1qscwp1chrbmk43xf9ddjxgfm0hcslbdbljjis7ng4gacg";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
From c3097f46c46a97cafac061035c5f2c12e0ebc8e8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 23:26:07 +0000
Subject: [PATCH 213/590] nwg-launchers: 0.3.3 -> 0.4.0
---
pkgs/applications/misc/nwg-launchers/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/misc/nwg-launchers/default.nix b/pkgs/applications/misc/nwg-launchers/default.nix
index fc8cf3ee02e1..d14d4d43e83f 100644
--- a/pkgs/applications/misc/nwg-launchers/default.nix
+++ b/pkgs/applications/misc/nwg-launchers/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "nwg-launchers";
- version = "0.3.3";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = pname;
rev = "v${version}";
- sha256 = "1p1bwsn7l4vp7y183735pgsfbh7dssdfn0wjzacl4s87arjdcgvb";
+ sha256 = "0r0wj4w3jj3l56z1lx6ypkzz4fsgx4vzqbvs95661l8q362pndzw";
};
nativeBuildInputs = [
From d8b38de1e10f7a09480766da9d8f3b6d2e55f7ec Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Sun, 25 Oct 2020 16:31:19 -0700
Subject: [PATCH 214/590] goaccess: fix build on darwin
---
pkgs/tools/misc/goaccess/default.nix | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix
index 1906c9d56656..d14ef9d526ad 100644
--- a/pkgs/tools/misc/goaccess/default.nix
+++ b/pkgs/tools/misc/goaccess/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, ncurses, glib, libmaxminddb }:
+{ stdenv, fetchurl, pkgconfig, ncurses, glib, libmaxminddb, fetchpatch }:
stdenv.mkDerivation rec {
version = "1.4";
@@ -9,6 +9,13 @@ stdenv.mkDerivation rec {
sha256 = "1gkpjg39f3afdwm9128jqjsfap07p8s027czzlnxfmi5hpzvkyz8";
};
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/allinurl/goaccess/commit/514618cdd69453497fbf67913ccb37a0a0b07391.patch";
+ sha256 = "11lp7mabfl6ibgzsd9nw10k2xvcm0hrimrwidl06r8dqn2jzjxf6";
+ })
+ ];
+
configureFlags = [
"--enable-geoip=mmdb"
"--enable-utf8"
From 1f89f78553c2669f4ad9a9aa58ebdb52272b532f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 23:40:03 +0000
Subject: [PATCH 215/590] obs-studio: 26.0.0 -> 26.0.2
---
pkgs/applications/video/obs-studio/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index c8d70c72fbac..0d0fce279bbd 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -39,13 +39,13 @@ let
in mkDerivation rec {
pname = "obs-studio";
- version = "26.0.0";
+ version = "26.0.2";
src = fetchFromGitHub {
owner = "obsproject";
repo = "obs-studio";
rev = version;
- sha256 = "09y57b3c88szl3wyx3cxq8jrm3pfnyg2n25hxl1ynkq3rgaavdq2";
+ sha256 = "1d502f80whh686mvq0yn6zpa5nvmnlzxwp5sjz43vpbbvhpbrdqj";
};
nativeBuildInputs = [ addOpenGLRunpath cmake pkgconfig ];
From b73dd85c9329251948dca78a533635f3a5362942 Mon Sep 17 00:00:00 2001
From: symphorien <symphorien@users.noreply.github.com>
Date: Sun, 25 Oct 2020 23:43:52 +0000
Subject: [PATCH 216/590] vimPlugins.LanguageClientNeovim: 0.1.158 -> 0.1.160
(#101688)
https://github.com/autozimu/LanguageClient-neovim/blob/0.1.160/CHANGELOG.md
---
pkgs/misc/vim-plugins/overrides.nix | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 98c52a5a0af8..88e535da5b03 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -60,18 +60,19 @@ self: super: {
};
LanguageClient-neovim = let
- version = "0.1.158";
+ version = "0.1.160";
LanguageClient-neovim-src = fetchFromGitHub {
owner = "autozimu";
repo = "LanguageClient-neovim";
rev = version;
- sha256 = "14xggdgp5qw4yj4gdsgr8s2nxm098m88q8rx6fzd2j20njv308ki";
+ sha256 = "143cifahav1pfmpx3j1ihx433jrwxf6z27s0wxndgjkd2plkks58";
};
LanguageClient-neovim-bin = rustPlatform.buildRustPackage {
- name = "LanguageClient-neovim-bin";
+ pname = "LanguageClient-neovim-bin";
+ inherit version;
src = LanguageClient-neovim-src;
- cargoSha256 = "0nin1gydf6q4mmxljm2xbd1jfl3wpzx3pvlqwspahblv9j2bf5ck";
+ cargoSha256 = "0mf94j85awdcqa6cyb89bipny9xg13ldkznjf002fq747f55my2a";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
# FIXME: Use impure version of CoreFoundation because of missing symbols.
From cf74b2f737207c66582d769aa268ecb0109f7228 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 23:49:23 +0000
Subject: [PATCH 217/590] obsidian: 0.9.1 -> 0.9.4
---
pkgs/applications/misc/obsidian/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix
index 4e53657a7474..0f929439e4ff 100644
--- a/pkgs/applications/misc/obsidian/default.nix
+++ b/pkgs/applications/misc/obsidian/default.nix
@@ -30,12 +30,12 @@ let
in stdenv.mkDerivation rec {
pname = "obsidian";
- version = "0.9.1";
+ version = "0.9.4";
src = fetchurl {
url =
"https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz";
- sha256 = "1skilcqfawvvyj9dnacsmlls55cqq6a4hzz9is165cwkyab185c5";
+ sha256 = "0qahgm9gf4sap28wy7cxbf41h8zldplbwxnv8shyajbkxn108g5p";
};
nativeBuildInputs = [ makeWrapper graphicsmagick ];
From 02d7ce09a71dd1a69f16ef528cab072eed63157b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 26 Oct 2020 00:12:23 +0000
Subject: [PATCH 218/590] oneDNN: 1.6.3 -> 1.6.4
---
pkgs/development/libraries/oneDNN/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix
index ad311daf1db1..b780b9f4e39b 100644
--- a/pkgs/development/libraries/oneDNN/default.nix
+++ b/pkgs/development/libraries/oneDNN/default.nix
@@ -5,13 +5,13 @@
# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
stdenv.mkDerivation rec {
pname = "oneDNN";
- version = "1.6.3";
+ version = "1.6.4";
src = fetchFromGitHub {
owner = "oneapi-src";
repo = "oneDNN";
rev = "v${version}";
- sha256 = "1cskqpa14jjgw409wbxw03kpm9a1g6lmmc2fs2916if6xd70xdj3";
+ sha256 = "0y4lpx24k08wydv4aprfn2icg6ixk0iprk8pmbvyaa6gyab70vjy";
};
outputs = [ "out" "dev" "doc" ];
From 250757970bb77a0215565cb7c440cee929c22054 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 26 Oct 2020 00:37:51 +0000
Subject: [PATCH 219/590] openhantek6022: 3.1.2 -> 3.1.3
---
.../science/electronics/openhantek6022/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/science/electronics/openhantek6022/default.nix b/pkgs/applications/science/electronics/openhantek6022/default.nix
index ad8fa3c7a7ae..acdac346fd3b 100644
--- a/pkgs/applications/science/electronics/openhantek6022/default.nix
+++ b/pkgs/applications/science/electronics/openhantek6022/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "openhantek6022";
- version = "3.1.2";
+ version = "3.1.3";
src = fetchFromGitHub {
owner = "OpenHantek";
repo = "OpenHantek6022";
rev = version;
- sha256 = "104j7d3i5y6jd20c2z3l10sr6sgdy8iki3g9mlwhddnr8x6nzc03";
+ sha256 = "1n4l8ks5808d99zj1vj0ck0v1lb9s7iv3ahww7ximbf9iha39pbm";
};
nativeBuildInputs = [ cmake makeWrapper ];
From 37236c2a230d8fae16309bdca1836ec4f021644d Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 22 Oct 2020 23:39:40 -0700
Subject: [PATCH 220/590] nixos/doc/rl-20.09: normalize highlights, reorder
entries
---
nixos/doc/manual/release-notes/rl-2009.xml | 717 +++++++++++++++++----
1 file changed, 575 insertions(+), 142 deletions(-)
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 782227de06f4..89bdd12adf80 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -3,8 +3,11 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-release-20.09">
- <title>Release 20.09 (“Nightingale”, 2020.09/??)</title>
+ <title>Release 20.09 (“Nightingale”, 2020.10/26)</title>
+ <para>
+ Support is planned until the end of April 2021, handing over to 21.03.
+ </para>
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -13,88 +16,606 @@
<title>Highlights</title>
<para>
- In addition to numerous new and upgraded packages, this release has the
+ In addition to 7349 new, 14442 updated, and 8181 removed packages, this release has the
following highlights:
</para>
<itemizedlist>
<listitem>
<para>
- Support is planned until the end of April 2021, handing over to 21.03.
+ Core version changes:
</para>
- </listitem>
- <listitem>
- <para>GNOME desktop environment was upgraded to 3.36, see its <link xlink:href="https://help.gnome.org/misc/release-notes/3.36/">release notes</link>.</para>
- </listitem>
- <listitem>
- <para>
- The Cinnamon desktop environment (v4.6) has been added. <varname>services.xserver.desktopManager.cinnamon.enable = true;</varname> to try it out!
- Remember that, with any new feature it's possible you could run into issues, so please send all support requests to <link xlink:href="https://github.com/NixOS/nixpkgs/issues">github.com/NixOS/nixpkgs</link> to notify the maintainers.
- </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ gcc: 9.2.0 -> 9.3.0
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ glibc: 2.30 -> 2.31
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ linux: still defaults to 5.4.x, all supported kernels available
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ mesa: 19.3.5 -> 20.1.7
+ </para>
+ </listitem>
+ </itemizedlist>
</listitem>
<listitem>
<para>
- Quickly configure a complete, private, self-hosted video
- conferencing solution with the new Jitsi Meet module.
+ Desktop Enironments:
</para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ plasma5: 5.17.5 -> 5.18.5
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ kdeApplications: 19.12.3 -> 20.08.1
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ gnome3: 3.34 -> 3.36, see its <link xlink:href="https://help.gnome.org/misc/release-notes/3.36/">release notes</link>.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ cinnamon: added at 4.6
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ NixOS now distributes an official <link xlink:href="https://nixos.org/download.html#nixos-iso">GNOME ISO</link>.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>
+ Programming Languages and Frameworks:
+ </para>
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ Agda ecosystem was heavily reworked (see more details below).
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ PHP now defaults to PHP 7.4, updated from 7.3.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ PHP 7.2 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 20.09 release.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Python 3 now defaults to Python 3.8 instead of 3.7.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Python 3.5 has reached its upstream EOL at the end of September 2020: it
+ has been removed from the list of available packages.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>
+ Databases and Service Monitoring:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ MariaDB has been updated to 10.4, MariaDB Galera to 26.4. Please read the related upgrade instructions under <link linkend="sec-release-20.09-incompatibilities">backwards incompatibilities</link> before upgrading.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Zabbix now defaults to 5.0, updated from 4.4. Please read related sections under <link linkend="sec-release-20.09-incompatibilities">backwards compatibilities</link> before upgrading.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>
+ Major module changes:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Quickly configure a complete, private, self-hosted video
+ conferencing solution with the new Jitsi Meet module.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Two new options, <link linkend="opt-services.openssh.authorizedKeysCommand">authorizedKeysCommand</link>
+ and <link linkend="opt-services.openssh.authorizedKeysCommandUser">authorizedKeysCommandUser</link>, have
+ been added to the <literal>openssh</literal> module. If you have <literal>AuthorizedKeysCommand</literal>
+ in your <link linkend="opt-services.openssh.extraConfig">services.openssh.extraConfig</link> you should
+ make use of these new options instead.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ There is a new module for Podman(<varname>virtualisation.podman</varname>), a drop-in replacement for the Docker command line.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ The new <varname>virtualisation.containers</varname> module manages configuration shared by the CRI-O and Podman modules.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Declarative Docker containers are renamed from <varname>docker-containers</varname> to <varname>virtualisation.oci-containers.containers</varname>.
+ This is to make it possible to use <literal>podman</literal> instead of <literal>docker</literal>.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ The new option <link linkend="opt-documentation.man.generateCaches">documentation.man.generateCaches</link>
+ has been added to automatically generate the <literal>man-db</literal> caches, which are needed by utilities
+ like <command>whatis</command> and <command>apropos</command>. The caches are generated during the build of
+ the NixOS configuration: since this can be expensive when a large number of packages are installed, the
+ feature is disabled by default.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <varname>services.postfix.sslCACert</varname> was replaced by <varname>services.postfix.tlsTrustedAuthorities</varname> which now defaults to system certificate authorities.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ The various documented workarounds to use steam have been converted to a module. <varname>programs.steam.enable</varname> enables steam, controller support and the workarounds.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Support for built-in LCDs in various pieces of Logitech hardware (keyboards and USB speakers). <varname>hardware.logitech.lcd.enable</varname> enables support for all hardware supported by the g15daemon project.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ The GRUB module gained support for basic password protection, which
+ allows to restrict non-default entries in the boot menu to one or more
+ users. The users and passwords are defined via the option
+ <option>boot.loader.grub.users</option>.
+ Note: Password support is only avaiable in GRUB version 2.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>
+ NixOS module changes:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ The NixOS module system now supports freeform modules as a mix between <literal>types.attrsOf</literal> and <literal>types.submodule</literal>. These allow you to explicitly declare a subset of options while still permitting definitions without an associated option. See <xref linkend='sec-freeform-modules'/> for how to use them.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Following its deprecation in 20.03, the Perl NixOS test driver has been removed.
+ All remaining tests have been ported to the Python test framework.
+ Code outside nixpkgs using <filename>make-test.nix</filename> or
+ <filename>testing.nix</filename> needs to be ported to
+ <filename>make-test-python.nix</filename> and
+ <filename>testing-python.nix</filename> respectively.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Subordinate GID and UID mappings are now set up automatically for all normal users.
+ This will make container tools like Podman work as non-root users out of the box.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ </itemizedlist>
+ </section>
+
+ <section xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ version="5.0"
+ xml:id="sec-release-20.09-new-services">
+ <title>New Services</title>
+
+ <para>
+ In addition to 1119 new, 118 updated, and 476 removed options; 61 new modules were added since the last release:
+ </para>
+
+ <itemizedlist>
+ <listitem>
+ <para>
+ Hardware:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <xref linkend="opt-hardware.system76.firmware-daemon.enable" /> adds easy support of system76 firmware.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-hardware.uinput.enable" /> loads uinput kernel module.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-hardware.video.hidpi.enable" /> enable good defaults for HiDPI displays.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-hardware.wooting.enable" /> support for Wooting keyboards.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-hardware.xpadneo.enable" /> xpadneo driver for Xbox One wireless controllers.
+ </para>
+ </listitem>
+ </itemizedlist>
</listitem>
<listitem>
<para>
- <package>maxx</package> package removed along with <varname>services.xserver.desktopManager.maxx</varname> module.
- Please migrate to <package>cdesktopenv</package> and <varname>services.xserver.desktopManager.cde</varname> module.
+ Programs:
</para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <xref linkend="opt-programs.hamster.enable" /> enable hamster time tracking.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-programs.steam.enable" /> adds easy enablement of steam and related system configuration.
+ </para>
+ </listitem>
+ </itemizedlist>
</listitem>
<listitem>
<para>
- We now distribute a GNOME ISO.
+ Security:
</para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <xref linkend="opt-security.doas.enable" /> alternative to sudo, allows non-root users to execute commands as root.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-security.tpm2.enable" /> add Trusted Platform Module 2 support.
+ </para>
+ </listitem>
+ </itemizedlist>
</listitem>
<listitem>
<para>
- PHP now defaults to PHP 7.4, updated from 7.3.
+ System:
</para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <xref linkend="opt-boot.initrd.network.openvpn.enable" /> Start an OpenVPN client during initrd boot.
+ </para>
+ </listitem>
+ </itemizedlist>
</listitem>
<listitem>
<para>
- PHP 7.2 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 20.09 release.
+ Virtualization:
</para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <xref linkend="opt-boot.enableContainers" /> Use nixos-containers.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-virtualisation.oci-containers.containers" /> Run OCI (Docker) containers.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-virtualisation.podman.enable" /> Daemonless container engine.
+ </para>
+ </listitem>
+ </itemizedlist>
</listitem>
+
<listitem>
<para>
- Python 3 now defaults to Python 3.8 instead of 3.7.
- </para>
- </listitem>
- <listitem>
- <para>
- Python 3.5 has reached its upstream EOL at the end of September 2020: it
- has been removed from the list of available packages.
- </para>
- </listitem>
- <listitem>
- <para>
- Two new options, <link linkend="opt-services.openssh.authorizedKeysCommand">authorizedKeysCommand</link>
- and <link linkend="opt-services.openssh.authorizedKeysCommandUser">authorizedKeysCommandUser</link>, have
- been added to the <literal>openssh</literal> module. If you have <literal>AuthorizedKeysCommand</literal>
- in your <link linkend="opt-services.openssh.extraConfig">services.openssh.extraConfig</link> you should
- make use of these new options instead.
- </para>
- </listitem>
- <listitem>
- <para>
- There is a new module for Podman(<varname>virtualisation.podman</varname>), a drop-in replacement for the Docker command line.
- </para>
- </listitem>
- <listitem>
- <para>
- The new <varname>virtualisation.containers</varname> module manages configuration shared by the CRI-O and Podman modules.
- </para>
- </listitem>
- <listitem>
- <para>
- Declarative Docker containers are renamed from <varname>docker-containers</varname> to <varname>virtualisation.oci-containers.containers</varname>.
- This is to make it possible to use <literal>podman</literal> instead of <literal>docker</literal>.
+ Services:
</para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.ankisyncd.enable" /> Anki sync server.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.bazarr.enable" /> subtitle manager for Sonarr and Radarr.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.biboumi.enable" /> Biboumi XMPP gateway to IRC.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.blockbook-frontend" /> Blockbook-frontend, a service for the Trezor wallet.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.cage.enable" /> Wayland cage service.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.convos.enable" /> IRC daemon, which can be accessed throught the browser.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.engelsystem.enable" /> Tool for coordinating helpers and shifts on large events.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.espanso.enable" /> text-expander written in rust.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.foldingathome.enable" /> Folding@home client.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.foldingathome.enable" /> Folding@home client.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.gerrit.enable" /> Web-based team code collaboration tool.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.go-neb.enable" /> Matrix bot.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.hardware.xow.enable" /> xow as a systemd service.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.hercules-ci-agent.enable" /> Hercules CI build agent.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.jicofo.enable" /> Jitsi Conference Focus, component of Jitsi Meet.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.jirafeau.enable" /> a web file repository.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.jitsi-meet.enable" /> secure, simple and scalable video conferences.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.jitsi-videobridge.enable" /> Jitsi Videobridge, a WebRTC compatible router.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.jupyterhub.enable" /> Jupyterhub development server.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.k3s.enable" /> lightweight kubernetes distribution.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.magic-wormhole-mailbox-server.enable" /> Magic Wormhole Mailbox Server.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.malcontent.enable" /> parental control support.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.matrix-appservice-discord.enable" /> Matrix and Discord bridge.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.mautrix-telegram.enable" /> Matrix-Telegram puppeting/relaybot bridge.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.mirakurun.enable" /> Japanese DTV Tuner Server Service.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.molly-brown.enable" /> Molly-Brown Gemini server.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.mullvad-vpn.enable" /> Mullvad VPN daemon.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.ncdns.enable" /> Namecoin to DNS bridge.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.nextdns.enable" /> NextDNS to DoH Proxy service.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.nix-store-gcs-proxy" /> Enable a Google storage bucket to be used as a nix store.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.onedrive.enable" /> OneDrive sync service.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.pinnwand.enable" /> Pastebin-like service.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.pixiecore.enable" /> manage network booting of machines.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.privacyidea.enable" /> Privacy authentication server.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.quorum.enable" /> Quorum blockchain daemon.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.robustirc-bridge.enable" /> RobustIRC bridge.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.rss-bridge.enable" /> generate RSS and Atom feeds.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.rtorrent.enable" /> rTorrent service.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.smartdns.enable" /> SmartDNS DNS server.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.sogo.enable" /> SOGo groupware.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.teeworlds.enable" /> Teeworlds game server.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.torque.mom.enable" /> torque computing node.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.torque.server.enable" /> enable torque server.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.tuptime.enable" /> a total uptime service.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.urserver.enable" /> X11 remote server.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.wasabibackend.enable" /> Wasabi backend service.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.yubikey-agent.enable" /> Yubikey agent.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.zigbee2mqtt.enable" /> Zigbee to MQTT bridge.
+ </para>
+ </listitem>
+ </itemizedlist>
</listitem>
+
+ </itemizedlist>
+
+ </section>
+
+ <section xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ version="5.0"
+ xml:id="sec-release-20.09-incompatibilities">
+ <title>Backward Incompatibilities</title>
+
+ <para>
+ When upgrading from a previous release, please be aware of the following
+ incompatible changes:
+ </para>
+
+ <itemizedlist>
<listitem>
<para>
MariaDB has been updated to 10.4, MariaDB Galera to 26.4.
@@ -144,36 +665,7 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION;
from the default of <literal>mysql</literal> to a different user please change <literal>'mysql'@'localhost'</literal> to the corresponding user instead.
</para>
</listitem>
- <listitem>
- <para>
- The new option <link linkend="opt-documentation.man.generateCaches">documentation.man.generateCaches</link>
- has been added to automatically generate the <literal>man-db</literal> caches, which are needed by utilities
- like <command>whatis</command> and <command>apropos</command>. The caches are generated during the build of
- the NixOS configuration: since this can be expensive when a large number of packages are installed, the
- feature is disabled by default.
- </para>
- </listitem>
- <listitem>
- <para>
- <varname>services.postfix.sslCACert</varname> was replaced by <varname>services.postfix.tlsTrustedAuthorities</varname> which now defaults to system certificate authorities.
- </para>
- </listitem>
- <listitem>
- <para>
- Subordinate GID and UID mappings are now set up automatically for all normal users.
- This will make container tools like Podman work as non-root users out of the box.
- </para>
- </listitem>
- <listitem>
- <para>
- The various documented workarounds to use steam have been converted to a module. <varname>programs.steam.enable</varname> enables steam, controller support and the workarounds.
- </para>
- </listitem>
- <listitem>
- <para>
- Support for built-in LCDs in various pieces of Logitech hardware (keyboards and USB speakers). <varname>hardware.logitech.lcd.enable</varname> enables support for all hardware supported by the g15daemon project.
- </para>
- </listitem>
+
<listitem>
<para>
Zabbix now defaults to 5.0, updated from 4.4. Please carefully read through
@@ -208,72 +700,13 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION;
</programlisting>
</para>
</listitem>
- <listitem>
- <para>
- The NixOS module system now supports freeform modules as a mix between <literal>types.attrsOf</literal> and <literal>types.submodule</literal>. These allow you to explicitly declare a subset of options while still permitting definitions without an associated option. See <xref linkend='sec-freeform-modules'/> for how to use them.
- </para>
- </listitem>
- <listitem>
- <para>
- The GRUB module gained support for basic password protection, which
- allows to restrict non-default entries in the boot menu to one or more
- users. The users and passwords are defined via the option
- <option>boot.loader.grub.users</option>.
- Note: Password support is only avaiable in GRUB version 2.
- </para>
- </listitem>
- <listitem>
- <para>
- Following its deprecation in 20.03, the Perl NixOS test driver has been removed.
- All remaining tests have been ported to the Python test framework.
- Code outside nixpkgs using <filename>make-test.nix</filename> or
- <filename>testing.nix</filename> needs to be ported to
- <filename>make-test-python.nix</filename> and
- <filename>testing-python.nix</filename> respectively.
- </para>
- </listitem>
- </itemizedlist>
- </section>
- <section xmlns="http://docbook.org/ns/docbook"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- version="5.0"
- xml:id="sec-release-20.09-new-services">
- <title>New Services</title>
-
- <para>
- The following new services were added since the last release:
- </para>
-
- <itemizedlist>
<listitem>
<para>
- There is a new <xref linkend="opt-security.doas.enable"/> module that provides <command>doas</command>, a lighter alternative to <command>sudo</command> with many of the same features.
- </para>
- </listitem>
- <listitem>
- <para>
- <link xlink:href="https://hercules-ci.com">Hercules CI</link> Agent is a specialized build agent for projects built with Nix. See the <link xlink:href="https://nixos.org/nixos/options.html#services.hercules-ci-agent">options</link> and <link xlink:href="https://docs.hercules-ci.com/hercules-ci/getting-started/#deploy-agent">setup</link>.
+ <package>maxx</package> package removed along with <varname>services.xserver.desktopManager.maxx</varname> module.
+ Please migrate to <package>cdesktopenv</package> and <varname>services.xserver.desktopManager.cde</varname> module.
</para>
</listitem>
- </itemizedlist>
-
- </section>
-
- <section xmlns="http://docbook.org/ns/docbook"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- version="5.0"
- xml:id="sec-release-20.09-incompatibilities">
- <title>Backward Incompatibilities</title>
-
- <para>
- When upgrading from a previous release, please be aware of the following
- incompatible changes:
- </para>
-
- <itemizedlist>
<listitem>
<para>
The <link linkend="opt-services.matrix-synapse.enable">matrix-synapse</link> module no longer includes optional dependencies by default, they have to be added through the <link linkend="opt-services.matrix-synapse.plugins">plugins</link> option.
From 1007e8140a30ad20b7770689ab1801ce510b6a55 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 26 Oct 2020 00:47:50 +0000
Subject: [PATCH 221/590] openlibm: 0.7.1 -> 0.7.2
---
pkgs/development/libraries/science/math/openlibm/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix
index 560f39e4e99a..3553833443f7 100644
--- a/pkgs/development/libraries/science/math/openlibm/default.nix
+++ b/pkgs/development/libraries/science/math/openlibm/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "openlibm";
- version = "0.7.1";
+ version = "0.7.2";
src = fetchurl {
url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz";
- sha256 = "0yg8sfibr38hpb4s5ri7i0ivp96c7khdwhlxngjiymvl3jvm5cnl";
+ sha256 = "09fl7ij0p0js2sydjvmm9k4d0c83iwpb2sad9d9hin8sjdfyp4vp";
};
makeFlags = [ "prefix=$(out)" ];
From d26ac92618d0b53145be4370a354809b96c64bde Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 26 Oct 2020 01:23:54 +0000
Subject: [PATCH 222/590] opentx: 2.3.9 -> 2.3.10
---
pkgs/applications/misc/opentx/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix
index a117ecc06a9c..6bdcd0da1fca 100644
--- a/pkgs/applications/misc/opentx/default.nix
+++ b/pkgs/applications/misc/opentx/default.nix
@@ -6,13 +6,13 @@
mkDerivation rec {
pname = "opentx";
- version = "2.3.9";
+ version = "2.3.10";
src = fetchFromGitHub {
owner = "opentx";
repo = "opentx";
rev = "release/${version}";
- sha256 = "0kh3jdy1pgvns8lrncf61ayaq0hmsv41j8xv4r4rf17zyvjl0qph";
+ sha256 = "1pp3k1802gl1rji98clv17wj0619dliq821mpi4446lk22q692yq";
};
enableParallelBuilding = true;
From 5ef636ef93195952d7b457e331b55c7f571494f0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 26 Oct 2020 01:39:23 +0000
Subject: [PATCH 223/590] opustags: 1.3.0 -> 1.4.0
---
pkgs/applications/audio/opustags/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/audio/opustags/default.nix b/pkgs/applications/audio/opustags/default.nix
index eb056c720d1f..8e5546aec8b6 100644
--- a/pkgs/applications/audio/opustags/default.nix
+++ b/pkgs/applications/audio/opustags/default.nix
@@ -1,13 +1,13 @@
{ stdenv, lib, cmake, pkgconfig, libogg, fetchFromGitHub, libiconv }:
stdenv.mkDerivation rec {
pname = "opustags";
- version = "1.3.0";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "fmang";
repo = "opustags";
rev = version;
- sha256 = "09z0cdg20algaj2yyhfz3hxh1biwjjvzx1pc2vdc64n8lkswqsc1";
+ sha256 = "1y0czl72paawy342ff9ickaamkih43k59yfcdw7bnddypyfa7nbg";
};
buildInputs = [ libogg ];
From 846266d9af5fa0435693f30bca36f80ad1f6d8ad Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Wed, 14 Oct 2020 22:05:19 -0300
Subject: [PATCH 224/590] corectrl: init at 1.1.1
---
pkgs/applications/misc/corectrl/default.nix | 74 +++++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 +
2 files changed, 76 insertions(+)
create mode 100644 pkgs/applications/misc/corectrl/default.nix
diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix
new file mode 100644
index 000000000000..cee390d064d0
--- /dev/null
+++ b/pkgs/applications/misc/corectrl/default.nix
@@ -0,0 +1,74 @@
+{ stdenv
+, fetchFromGitLab
+, extra-cmake-modules
+, botan2
+, karchive
+, kauth
+, libdrm
+, mesa-demos
+, procps
+, utillinux
+, vulkan-tools
+, qtbase
+, qtcharts
+, qtquickcontrols2
+, qtsvg
+, qttools
+, qtxmlpatterns
+, wrapQtAppsHook
+} :
+
+stdenv.mkDerivation rec{
+ pname = "corectrl";
+ version = "1.1.1";
+
+ src = fetchFromGitLab {
+ owner = "corectrl";
+ repo = "corectrl";
+ rev = "v${version}";
+ sha256 = "sha256-YQDrxPqCa3OzNKd3UiAffqqvOrgbXmDFJGjYPetolyY=";
+ };
+
+ nativeBuildInputs = [
+ extra-cmake-modules
+ wrapQtAppsHook
+ ];
+ buildInputs = [
+ botan2
+ karchive
+ kauth
+ libdrm
+ mesa-demos
+ procps
+ utillinux
+ vulkan-tools
+ qtbase
+ qtcharts
+ qtquickcontrols2
+ qtsvg
+ qttools
+ qtxmlpatterns
+ ];
+
+ runtimeDeps = [ mesa-demos vulkan-tools ];
+ binPath = stdenv.lib.makeBinPath runtimeDeps;
+
+ dontWrapQtApps = true;
+
+ postInstall = ''
+ wrapQtApp $out/bin/corectrl --prefix PATH ":" ${binPath}
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://gitlab.com/corectrl/corectrl/";
+ description = "Control your computer hardware via application profiles";
+ longDescription = ''
+ CoreCtrl is a Free and Open Source GNU/Linux application that allows you
+ to control with ease your computer hardware using application profiles. It
+ aims to be flexible, comfortable and accessible to regular users.
+ '';
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ };
+}
+# TODO: report upstream that libdrm is not detected at configure time
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9efc75240c02..2b9d58495293 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20126,6 +20126,8 @@ in
copyq = libsForQt514.callPackage ../applications/misc/copyq { };
+ corectrl = libsForQt5.callPackage ../applications/misc/corectrl { };
+
coriander = callPackage ../applications/video/coriander {
inherit (gnome2) libgnomeui GConf;
};
From 327cca2ab328d7d062ffaa9d6460c8da1da3ddde Mon Sep 17 00:00:00 2001
From: Klemens Nanni <klemens@posteo.de>
Date: Mon, 26 Oct 2020 03:22:19 +0100
Subject: [PATCH 225/590] binwalk: Install SquashFS tooling
Otherwise extraction fails for what I consider a common type of data;
note how both packages are required as binwalk uses `sasquatch` as
well as `unsquashfs`.
---
pkgs/development/python-modules/binwalk/default.nix | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix
index 0970cc18249e..c6fbbc13c43d 100644
--- a/pkgs/development/python-modules/binwalk/default.nix
+++ b/pkgs/development/python-modules/binwalk/default.nix
@@ -11,6 +11,8 @@
, cabextract
, cramfsprogs
, cramfsswap
+, sasquatch
+, squashfsTools
, lzma
, matplotlib
, nose
@@ -32,7 +34,7 @@ buildPythonPackage {
sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc";
};
- propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract cramfsswap cramfsprogs lzma pycrypto ]
+ propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract cramfsswap cramfsprogs sasquatch squashfsTools lzma pycrypto ]
++ stdenv.lib.optionals visualizationSupport [ matplotlib pyqtgraph ];
# setup.py only installs version.py during install, not test
From 0c969f35bbae488e39d2185af14bf7a52d816076 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 26 Oct 2020 02:39:19 +0000
Subject: [PATCH 226/590] ostree: 2020.5 -> 2020.7
---
pkgs/tools/misc/ostree/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix
index fd1bfc7f8c79..56262d8171ee 100644
--- a/pkgs/tools/misc/ostree/default.nix
+++ b/pkgs/tools/misc/ostree/default.nix
@@ -39,13 +39,13 @@ let
]));
in stdenv.mkDerivation rec {
pname = "ostree";
- version = "2020.5";
+ version = "2020.7";
outputs = [ "out" "dev" "man" "installedTests" ];
src = fetchurl {
url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
- sha256 = "1k92177hjalbdpmg45ymwwrni68vh9rs5x9zvy5fzl9lng12fgpb";
+ sha256 = "0clriq2ypz1fycd6mpjyrhzid44svzpzw0amnank593h69b216ax";
};
patches = [
From 3216b8571373b368a0ce809e2976fad8bffd0b90 Mon Sep 17 00:00:00 2001
From: Klemens Nanni <klemens@posteo.de>
Date: Mon, 26 Oct 2020 03:22:17 +0100
Subject: [PATCH 227/590] nixos/system-path: Add mkpasswd(1)
Generating password hashes, e.g. when adding new users to the system
configuration, should work out-of-the-box and offline.
---
nixos/doc/manual/configuration/user-mgmt.xml | 2 +-
nixos/modules/config/system-path.nix | 1 +
nixos/modules/config/users-groups.nix | 3 +--
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml
index cbec83814c9a..e83e7b75ef54 100644
--- a/nixos/doc/manual/configuration/user-mgmt.xml
+++ b/nixos/doc/manual/configuration/user-mgmt.xml
@@ -38,7 +38,7 @@
assigned by setting the user's
<link linkend="opt-users.users._name_.hashedPassword">hashedPassword</link>
option. A hashed password can be generated using <command>mkpasswd -m
- sha-512</command> after installing the <literal>mkpasswd</literal> package.
+ sha-512</command>.
</para>
<para>
A user ID (uid) is assigned automatically. You can also specify a uid
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index c46937f80081..c65fa1a684f8 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -33,6 +33,7 @@ let
pkgs.ncurses
pkgs.netcat
config.programs.ssh.package
+ pkgs.mkpasswd
pkgs.procps
pkgs.su
pkgs.time
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 5264d5b56fa5..72285fe631da 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -35,8 +35,7 @@ let
'';
hashedPasswordDescription = ''
- To generate a hashed password install the <literal>mkpasswd</literal>
- package and run <literal>mkpasswd -m sha-512</literal>.
+ To generate a hashed password run <literal>mkpasswd -m sha-512</literal>.
If set to an empty string (<literal>""</literal>), this user will
be able to log in without being asked for a password (but not via remote
From f6136d06ffed9e21879ddd7bd156275de011c447 Mon Sep 17 00:00:00 2001
From: Ivan Tham <pickfire@riseup.net>
Date: Mon, 26 Oct 2020 10:45:22 +0800
Subject: [PATCH 228/590] fontdir: add ttc to font regex
.ttc fonts are used by noto-fonts-cjk
---
nixos/modules/config/fonts/fontdir.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nixos/modules/config/fonts/fontdir.nix b/nixos/modules/config/fonts/fontdir.nix
index 264d73ebafa5..c4bd3a077d33 100644
--- a/nixos/modules/config/fonts/fontdir.nix
+++ b/nixos/modules/config/fonts/fontdir.nix
@@ -8,7 +8,7 @@ let
x11Fonts = pkgs.runCommand "X11-fonts" { preferLocalBuild = true; } ''
mkdir -p "$out/share/X11/fonts"
- font_regexp='.*\.\(ttf\|otf\|pcf\|pfa\|pfb\|bdf\)\(\.gz\)?'
+ font_regexp='.*\.\(ttf\|ttc\|otf\|pcf\|pfa\|pfb\|bdf\)\(\.gz\)?'
find ${toString config.fonts.fonts} -regex "$font_regexp" \
-exec ln -sf -t "$out/share/X11/fonts" '{}' \;
cd "$out/share/X11/fonts"
From 0b8a6e787cb4fd45731781d78ac0f4a21f4e9543 Mon Sep 17 00:00:00 2001
From: Klemens Nanni <klemens@posteo.de>
Date: Mon, 26 Oct 2020 04:01:07 +0100
Subject: [PATCH 229/590] nixos/avahi: Enable IPv6 by default
Treat it the same as IPv4 (I'm tempted to disable IPv4 by default);
this is the only option I still need to set manually to enjoy IPv6-only
networks including printer discovery!
---
nixos/modules/services/networking/avahi-daemon.nix | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix
index 2900c37f990f..0b7d5575c11f 100644
--- a/nixos/modules/services/networking/avahi-daemon.nix
+++ b/nixos/modules/services/networking/avahi-daemon.nix
@@ -86,7 +86,8 @@ in
ipv6 = mkOption {
type = types.bool;
- default = false;
+ default = config.networking.enableIPv6;
+ defaultText = "config.networking.enableIPv6";
description = "Whether to use IPv6.";
};
From aeb6d3edabac649352ad8b163cecb66f71dcc055 Mon Sep 17 00:00:00 2001
From: Jason O'Conal <lovek323@gmail.com>
Date: Mon, 26 Oct 2020 14:25:34 +1030
Subject: [PATCH 230/590] idea: 2020.2.2 -> 2020.2.3
---
.../editors/jetbrains/default.nix | 40 +++++++++----------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index d54513971a8a..9fbab346907d 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -268,12 +268,12 @@ in
clion = buildClion rec {
name = "clion-${version}";
- version = "2020.2.3"; /* updated by script */
+ version = "2020.2.4"; /* updated by script */
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
- sha256 = "1kdlmdsfxmwks3rk2dzm5q30vwzpxcwzpyjsir122k36xnqvaqxq"; /* updated by script */
+ sha256 = "0xkra8l3ga8qsmzbvfisn99lxm5wxa8c4d4jzljjwn8855bs20a3"; /* updated by script */
};
wmClass = "jetbrains-clion";
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@@ -307,12 +307,12 @@ in
idea-community = buildIdea rec {
name = "idea-community-${version}";
- version = "2020.2.2"; /* updated by script */
+ version = "2020.2.3"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
- sha256 = "0kbn9q7fvhrzb1w6l8i2nv4cx8qrj74jp7fidj9yk8vkv9lfijg6"; /* updated by script */
+ sha256 = "092swkz7l1p3asrna6fxj6j324sh7pdbgzrlapdwka8kq9y40ajz"; /* updated by script */
};
wmClass = "jetbrains-idea-ce";
update-channel = "IntelliJ IDEA RELEASE";
@@ -320,12 +320,12 @@ in
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
- version = "2020.2.2"; /* updated by script */
+ version = "2020.2.3"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz";
- sha256 = "1196zrcbgrr9271kjrzd2mzvhvxd7hkr1d2a4ij4h8f97qmsd6r6"; /* updated by script */
+ sha256 = "1416ikna169d2hx77yd0bb8hpxkpnf27jgyq5yrgla1w6h1fp1p0"; /* updated by script */
};
wmClass = "jetbrains-idea";
update-channel = "IntelliJ IDEA RELEASE";
@@ -333,12 +333,12 @@ in
mps = buildMps rec {
name = "mps-${version}";
- version = "2020.2"; /* updated by script */
+ version = "2020.2.2"; /* updated by script */
description = "Create your own domain-specific language";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/mps/2020.2/MPS-${version}.tar.gz";
- sha256 = "06c0yv9vvz0y5njh1sghn7ijpn1d81mxsyk5xjpj29bvvg511pjs"; /* updated by script */
+ sha256 = "1a09yahky8ii2dypj69m89c3yh7akn7sa74n0j0mff7r46ad421y"; /* updated by script */
};
wmClass = "jetbrains-mps";
update-channel = "MPS RELEASE";
@@ -346,12 +346,12 @@ in
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
- version = "2020.2.1"; /* updated by script */
+ version = "2020.2.3"; /* updated by script */
description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
- sha256 = "14hz6w5lgn8ddscicm4s9xhi07j5adsq0bmyr8amzmj5q6jgw4p9"; /* updated by script */
+ sha256 = "0bdxmxml6337cdpb2amhdqlvxicng50cgzlnmiw0wqnmwj5ihpih"; /* updated by script */
};
wmClass = "jetbrains-phpstorm";
update-channel = "PhpStorm RELEASE";
@@ -359,12 +359,12 @@ in
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
- version = "2020.2.2"; /* updated by script */
+ version = "2020.2.3"; /* updated by script */
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "1a1vhlc2q5n3dxli0x6ppxx3mgary4gpakcxdp9nylmixjzjph6v"; /* updated by script */
+ sha256 = "0wqhcag32fxqxg6aml2a3d0rpds0d48rgbcl7cp0ah8xj6x72047"; /* updated by script */
};
wmClass = "jetbrains-pycharm-ce";
update-channel = "PyCharm RELEASE";
@@ -372,12 +372,12 @@ in
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
- version = "2020.2.2"; /* updated by script */
+ version = "2020.2.3"; /* updated by script */
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "0v64f5sbv1639d6fjg0shfgdy40f1xc2zbn0jqfrx6xmkg7wgsz9"; /* updated by script */
+ sha256 = "0g7bki4bzi3a1w3rlwik2w0ma10xb4g450qxm4fr4fp8dy2xaysc"; /* updated by script */
};
wmClass = "jetbrains-pycharm";
update-channel = "PyCharm RELEASE";
@@ -385,12 +385,12 @@ in
rider = buildRider rec {
name = "rider-${version}";
- version = "2020.2.3"; /* updated by script */
+ version = "2020.2.4"; /* updated by script */
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
- sha256 = "01namzd29chj975w3awanlzf38hh30cfjzyljqfkp6y3djn0if1r"; /* updated by script */
+ sha256 = "1anl48ifv5ayqn876dqckxc1b5fw1271pvamzf1vvk501wv6dpaf"; /* updated by script */
};
wmClass = "jetbrains-rider";
update-channel = "Rider RELEASE";
@@ -398,12 +398,12 @@ in
ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}";
- version = "2020.2.2"; /* updated by script */
+ version = "2020.2.3"; /* updated by script */
description = "The Most Intelligent Ruby and Rails IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
- sha256 = "11v26hpf891nq5vj8i0ad4shhzpy8b7rvyrkr3l29dwfnd83lgpz"; /* updated by script */
+ sha256 = "03f1z7xhz90j9l8xp3il115yvb15kda0i6ba5ndhby7nf52vnphk"; /* updated by script */
};
wmClass = "jetbrains-rubymine";
update-channel = "RubyMine RELEASE";
@@ -411,12 +411,12 @@ in
webstorm = buildWebStorm rec {
name = "webstorm-${version}";
- version = "2020.2.2"; /* updated by script */
+ version = "2020.2.3"; /* updated by script */
description = "Professional IDE for Web and JavaScript development";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
- sha256 = "1w17cf0qj0vyizkzj1frcmi52q5qxbf31msg8df38wy2l8r0b928"; /* updated by script */
+ sha256 = "1c60k38ai63s4779fs55vaiswfc6bi7ki6p96hrmmkrnpzgsipg5"; /* updated by script */
};
wmClass = "jetbrains-webstorm";
update-channel = "WebStorm RELEASE";
From 6bc2bf412c7fd0ffd52b234a544f86bb29b7f61b Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Fri, 23 Oct 2020 21:24:08 -0300
Subject: [PATCH 231/590] atomicparsley: 0.9.6 -> 20200701.154658.b0d6223
---
pkgs/tools/video/atomicparsley/default.nix | 44 +++++++++-------------
1 file changed, 18 insertions(+), 26 deletions(-)
diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix
index 9a19a6789e57..2f7e4d97cbba 100644
--- a/pkgs/tools/video/atomicparsley/default.nix
+++ b/pkgs/tools/video/atomicparsley/default.nix
@@ -1,39 +1,31 @@
-{ stdenv, fetchhg, autoreconfHook, zlib, Cocoa }:
+{ stdenv, fetchFromGitHub, cmake, zlib, Cocoa }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "atomicparsley";
- version = "0.9.6";
+ version = "20200701.154658.b0d6223";
- src = fetchhg {
- url = "https://bitbucket.org/wez/atomicparsley";
- sha256 = "05n4kbn91ps52h3wi1qb2jwygjsc01qzx4lgkv5mvwl5i49rj8fm";
+ src = fetchFromGitHub {
+ owner = "wez";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-EHO4WkxoAXUhuJKMNYmBbGfOgtO9uklzXtWS4QsV1c8=";
};
- nativeBuildInputs = [ autoreconfHook ];
+ nativeBuildInputs = [ cmake ];
buildInputs = [ zlib ]
- ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
+ ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
- configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
- # AC_FUNC_MALLOC is broken on cross builds.
- "ac_cv_func_malloc_0_nonnull=yes"
- "ac_cv_func_realloc_0_nonnull=yes"
- ];
-
- installPhase = "install -D AtomicParsley $out/bin/AtomicParsley";
+ installPhase = ''
+ runHook preInstall
+ install -D AtomicParsley $out/bin/AtomicParsley
+ runHook postInstall
+ '';
meta = with stdenv.lib; {
- description = ''
- A lightweight command line program for reading, parsing and
- setting metadata into MPEG-4 files
- '';
-
- longDescription = ''
- This is a maintained fork of the original AtomicParsley.
- '';
-
- homepage = "https://bitbucket.org/wez/atomicparsley";
- license = licenses.gpl2;
+ description = "A CLI program for reading, parsing and setting metadata into MPEG-4 files";
+ homepage = "https://github.com/wez/atomicparsley";
+ license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ pjones ];
};
From af299d2891f8975ab54f33ca90f80b35c55ef338 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Fri, 23 Oct 2020 15:01:07 -0300
Subject: [PATCH 232/590] sakura: 3.7.0 -> 3.7.1
---
pkgs/applications/misc/sakura/default.nix | 40 +++++++++++++++--------
1 file changed, 27 insertions(+), 13 deletions(-)
diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix
index 89a4cf25b8db..7cccec3b72fc 100644
--- a/pkgs/applications/misc/sakura/default.nix
+++ b/pkgs/applications/misc/sakura/default.nix
@@ -1,27 +1,38 @@
-{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre2, glib , makeWrapper }:
+{ stdenv
+, fetchurl
+, cmake
+, pkgconfig
+, gtk3
+, perl
+, vte
+, pcre2
+, glib
+, makeWrapper
+}:
stdenv.mkDerivation rec {
pname = "sakura";
- version = "3.7.0";
+ version = "3.7.1";
src = fetchurl {
- url = "https://launchpad.net/sakura/trunk/${version}/+download/${pname}-${version}.tar.gz";
- sha256 = "15gskj5yv5qs3cj4ps43735kfx2nzjlhq4dk9ghirl8lvhhxsm5m";
+ url = "https://launchpad.net/${pname}/trunk/${version}/+download/${pname}-${version}.tar.bz2";
+ sha256 = "sha256-cppODnUKQpS9kFkkOqxU3yqAElAVn8VQtQsP4Carkos=";
};
- nativeBuildInputs = [ cmake perl pkgconfig ];
+ nativeBuildInputs = [ cmake perl pkgconfig makeWrapper ];
- buildInputs = [ makeWrapper gtk3 vte pcre2 glib ];
+ buildInputs = [ gtk3 vte pcre2 glib ];
- # Wrapper sets path to gsettings-schemata so sakura knows where to find colorchooser, fontchooser ...
- postInstall = "wrapProgram $out/bin/sakura --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/";
+ # Set path to gsettings-schemata so sakura knows
+ # where to find colorchooser, fontchooser etc.
+ postInstall = ''
+ wrapProgram $out/bin/sakura \
+ --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/
+ '';
meta = with stdenv.lib; {
+ homepage = "https://www.pleyades.net/david/projects/sakura";
description = "A terminal emulator based on GTK and VTE";
- homepage = "https://www.pleyades.net/david/projects/sakura";
- license = licenses.gpl2;
- maintainers = with maintainers; [ astsmtl codyopel ];
- platforms = platforms.linux;
longDescription = ''
sakura is a terminal emulator based on GTK and VTE. It's a terminal
emulator with few dependencies, so you don't need a full GNOME desktop
@@ -32,5 +43,8 @@ stdenv.mkDerivation rec {
terminals in one window and adds a contextual menu with some basic
options. No more no less.
'';
- };
+ license = licenses.gpl2Only;
+ maintainers = with maintainers; [ astsmtl codyopel AndersonTorres ];
+ platforms = platforms.linux;
+ };
}
From fefda2dd989bcb93eb492317a129aef6d8008147 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Fri, 23 Oct 2020 22:33:04 -0300
Subject: [PATCH 233/590] bombono: update expression
- New github page
- Update license
- Update homepage
---
pkgs/applications/video/bombono/default.nix | 78 ++++++++++++++-------
1 file changed, 52 insertions(+), 26 deletions(-)
diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix
index 2ae3722fff2e..05ba5ef19be7 100644
--- a/pkgs/applications/video/bombono/default.nix
+++ b/pkgs/applications/video/bombono/default.nix
@@ -1,54 +1,80 @@
-{ stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gtkmm2, scons,
-mjpegtools, libdvdread, dvdauthor, gettext, dvdplusrwtools, libxmlxx, ffmpeg_3,
-enca, pkgconfig, fetchpatch }:
+{ stdenv
+, fetchFromGitHub
+, pkgconfig
+, fetchpatch
+, scons
+, boost
+, dvdauthor
+, dvdplusrwtools
+, enca
+, ffmpeg_3
+, gettext
+, gtk2
+, gtkmm2
+, libdvdread
+, libxmlxx
+, mjpegtools
+, wrapGAppsHook
+}:
-let fetchPatchFromAur = {name, sha256}:
-fetchpatch {
- inherit name sha256;
- url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=e6cc6bc80c672aaa1a2260abfe8823da299a192c";
-}; in
+let
+ fetchPatchFromAur = {name, sha256}:
+ fetchpatch {
+ inherit name sha256;
+ url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=e6cc6bc80c672aaa1a2260abfe8823da299a192c";
+ };
+in
stdenv.mkDerivation rec {
pname = "bombono";
version = "1.2.4";
+
src = fetchFromGitHub {
- owner = "muravjov";
+ owner = "bombono-dvd";
repo = "bombono-dvd";
rev = version;
- sha256 = "1lz1vik6abn1i1pvxhm55c9g47nxxv755wb2ijszwswwrwgvq5b9";
+ sha256 = "sha256-aRW8H8+ca/61jGLxUs7u3R7yEiulwr5viMEuZWbc4dM=";
};
patches = [
(fetchpatch {
name = "bombono-dvd-1.2.4-scons3.patch";
url = "https://svnweb.mageia.org/packages/cauldron/bombono-dvd/current/SOURCES/bombono-dvd-1.2.4-scons-python3.patch?revision=1447925&view=co&pathrev=1484457";
- sha256 = "081116d0if6s2r1rgqfr1n5gl3kpvzk01pf4v2k7gg2rnid83qp4";
+ sha256 = "sha256-5OKBWrRZvHem2MTdAObfdw76ig3Z4ZdDFtq4CJoJISA=";
})
] ++ (map fetchPatchFromAur [
- {name="fix_ffmpeg_codecid.patch"; sha256="1asfc0lqzk4gjssrvjmsi1xr53ygnsx2sh7c8yzp5r3j2bagxhp7";}
- {name="fix_ptr2bool_cast.patch"; sha256="0iqzrmbg38ikh4x9cmx0v0rnm7a9lcq0kd8sh1z9yfmnz71qqahg";}
- {name="fix_c++11_literal_warnings.patch"; sha256="1zbf12i77p0j0090pz5lzg4a7kyahahzqssybv7vi0xikwvw57w9";}
- {name="autoptr2uniqueptr.patch"; sha256="0a3wvwfplmqvi8fnj929y85z3h1iq7baaz2d4v08h1q2wbmakqdm";}
- {name="fix_deprecated_boost_api.patch"; sha256="184gdz3w95ihhsd8xscpwvq77xd4il47kvmv6wslax77xyw50gm8";}
- {name="fix_throw_specifications.patch"; sha256="1f5gi3qwm843hsxvijq7sjy0s62xm7rnr1vdp7f242fi0ldq6c1n";}
- {name="fix_operator_ambiguity.patch"; sha256="0r4scsbsqfg6wgzsbfxxpckamvgyrida0n1ypg1klx24pk5dc7n7";}
- {name="fix_ffmpeg30.patch"; sha256="1irva7a9bpbzs60ga8ypa3la9y84i5rz20jnd721qmfqp2yip8dw";}
+ {name="fix_ffmpeg_codecid.patch"; sha256="sha256-58L+1BJy5HK/R+xALbq2z4+Se4i6yp21lo/MjylgTqs=";}
+ {name="fix_ptr2bool_cast.patch"; sha256="sha256-DyqMw/m2Op9+gBq1CTCjSZ1qM9igV5Y6gTOi8VbNH0c=";}
+ {name="fix_c++11_literal_warnings.patch"; sha256="sha256-iZ/CN5+xg7jPXl5r/KGCys+jyPu0/AsSABLcc6IIbv0=";}
+ {name="autoptr2uniqueptr.patch"; sha256="sha256-teGp6uICB4jAJk18pdbBMcDxC/JJJGkdihtXeh3ffCg=";}
+ {name="fix_deprecated_boost_api.patch"; sha256="sha256-qD5QuO/ndEU1N7vueQiNpPVz8OaX6Y6ahjCWxMdvj6A=";}
+ {name="fix_throw_specifications.patch"; sha256="sha256-NjCDGwXRCSLcuW2HbPOpXRgNvNQHy7i7hoOgyvGIr7g=";}
+ {name="fix_operator_ambiguity.patch"; sha256="sha256-xx7WyrxEdDrDuz5YoFrM/u2qJru9u6X/4+Y5rJdmmmQ=";}
+ {name="fix_ffmpeg30.patch"; sha256="sha256-vKEbvbjYVRzEaVYC8XOJBPmk6FDXI/WA0X/dldRRO8c=";}
]);
nativeBuildInputs = [ wrapGAppsHook scons pkgconfig gettext ];
buildInputs = [
- gtk2 gtkmm2 mjpegtools libdvdread dvdauthor boost dvdplusrwtools
- libxmlxx ffmpeg_3 enca
- ];
+ boost
+ dvdauthor
+ dvdplusrwtools
+ enca
+ ffmpeg_3
+ gtk2
+ gtkmm2
+ libdvdread
+ libxmlxx
+ mjpegtools
+ ];
prefixKey = "PREFIX=";
enableParallelBuilding = true;
- meta = {
+ meta = with stdenv.lib; {
description = "a DVD authoring program for personal computers";
- homepage = "http://www.bombono.org/";
- license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [ symphorien ];
+ homepage = "https://www.bombono.org/";
+ license = licenses.gpl2Only;
+ maintainers = with maintainers; [ symphorien ];
};
}
From 0f0a6ee9b7b30c1e178d5201eb8856c2f1689fcb Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Fri, 23 Oct 2020 19:59:33 -0300
Subject: [PATCH 234/590] babl: fix license and homepage URL
---
pkgs/development/libraries/babl/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index ac622fb290ea..9bb6e9e1c5e0 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Image pixel format conversion library";
- homepage = "http://gegl.org/babl/";
- license = licenses.gpl3;
- maintainers = with stdenv.lib.maintainers; [ jtojnar ];
+ homepage = "https://gegl.org/babl/";
+ license = licenses.lgpl3Plus;
+ maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix;
};
}
From 852d2a3af95508ee9612d1cbe2224b3fb24f315d Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 24 Oct 2020 12:58:16 -0300
Subject: [PATCH 235/590] gegl: update URL to HTTPS
---
pkgs/development/libraries/gegl/4.0.nix | 8 +++---
pkgs/development/libraries/gegl/default.nix | 31 +++++++++++++++------
2 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix
index 6b38251a6806..c25f9145ea5e 100644
--- a/pkgs/development/libraries/gegl/4.0.nix
+++ b/pkgs/development/libraries/gegl/4.0.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "097427icgpgvcx40019b3dm8m84cchz79pixzpz648drs8p1wdqg";
+ sha256 = "sha256-DzceLtK5IWL+/T3edD5kjKCKahsrBQBIZ/vdx+IR5CQ=";
};
patches = [
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
# https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/83
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/83.patch";
- sha256 = "CSBYbJ2xnEN23xrla1qqr244jxOR5vNK8ljBSXdg4yE=";
+ sha256 = "sha256-CSBYbJ2xnEN23xrla1qqr244jxOR5vNK8ljBSXdg4yE=";
})
];
@@ -120,8 +120,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Graph-based image processing framework";
- homepage = "http://www.gegl.org";
- license = licenses.gpl3;
+ homepage = "https://www.gegl.org";
+ license = licenses.lgpl3Plus;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix;
};
diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix
index 1b8643172177..a99ec05d771c 100644
--- a/pkgs/development/libraries/gegl/default.nix
+++ b/pkgs/development/libraries/gegl/default.nix
@@ -1,12 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, babl, libpng, cairo, libjpeg
-, librsvg, pango, gtk2, bzip2, intltool, libintl
+{ stdenv
+, fetchurl
+, pkgconfig
+, babl
+, libpng
+, cairo
+, libjpeg
+, librsvg
+, pango
+, gtk2
+, bzip2
+, intltool
+, libintl
, OpenGL ? null }:
stdenv.mkDerivation rec {
- name = "gegl-0.2.0";
+ pname = "gegl";
+ version = "0.2.0";
src = fetchurl {
- url = "ftp://ftp.gtk.org/pub/gegl/0.2/${name}.tar.bz2";
+ url = "ftp://ftp.gtk.org/pub/gegl/0.2/${pname}-${version}.tar.bz2";
sha256 = "df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426";
};
@@ -17,7 +29,7 @@ stdenv.mkDerivation rec {
name = "CVE-2012-4433.patch";
})];
- # needs fonts otherwise don't know how to pass them
+ # needs fonts otherwise don't know how to pass them
configureFlags = [ "--disable-docs" ];
buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ]
@@ -27,10 +39,11 @@ stdenv.mkDerivation rec {
doCheck = false; # fails 3 out of 19 tests
- meta = {
+ meta = with stdenv.lib; {
description = "Graph-based image processing framework";
- homepage = "http://www.gegl.org";
- license = stdenv.lib.licenses.gpl3;
- platforms = stdenv.lib.platforms.unix;
+ homepage = "https://www.gegl.org";
+ license = licenses.lgpl3Plus;
+ maintainers = with maintainers; [ jtojnar ];
+ platforms = platforms.unix;
};
}
From 507a352361b9ebda2552ced5f7c1a8ea802157d3 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sun, 25 Oct 2020 21:41:53 -0300
Subject: [PATCH 236/590] buildtorrent: update URL to HTTPS
---
pkgs/tools/misc/buildtorrent/default.nix | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/pkgs/tools/misc/buildtorrent/default.nix b/pkgs/tools/misc/buildtorrent/default.nix
index 150371f82b6e..d3d3651c2b05 100644
--- a/pkgs/tools/misc/buildtorrent/default.nix
+++ b/pkgs/tools/misc/buildtorrent/default.nix
@@ -1,20 +1,18 @@
{ stdenv, fetchurl }:
-let version = "0.8"; in
-
stdenv.mkDerivation rec {
pname = "buildtorrent";
- inherit version;
+ version = "0.8";
src = fetchurl {
url = "https://mathr.co.uk/blog/code/${pname}-${version}.tar.gz";
- sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0";
+ sha256 = "sha256-6OJ2R72ziHOsVw1GwalompKwG7Z/WQidHN0IeE9wUtA=";
};
- meta = {
+ meta = with stdenv.lib; {
description = "A simple commandline torrent creator";
- homepage = "http://mathr.co.uk/blog/torrent.html";
- license = stdenv.lib.licenses.gpl3Plus;
- platforms = stdenv.lib.platforms.all;
+ homepage = "https://mathr.co.uk/blog/torrent.html";
+ license = licenses.gpl3Plus;
+ platforms = platforms.all;
};
}
From d0702162e9c127222bd376451e3bc786a7fe3cb0 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sun, 25 Oct 2020 21:41:28 -0300
Subject: [PATCH 237/590] pharo: update URL to HTTPS
---
pkgs/development/pharo/launcher/default.nix | 7 +--
pkgs/development/pharo/vm/build-vm-legacy.nix | 40 +++++++++----
pkgs/development/pharo/vm/build-vm.nix | 56 +++++++++----------
pkgs/development/pharo/vm/share.nix | 2 +-
4 files changed, 62 insertions(+), 43 deletions(-)
diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix
index 5f6deca863c3..1737fb90c7ac 100644
--- a/pkgs/development/pharo/launcher/default.nix
+++ b/pkgs/development/pharo/launcher/default.nix
@@ -55,10 +55,10 @@ stdenv.mkDerivation rec {
test "$?" == 124 && echo "ok")
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Launcher for Pharo distributions";
+ homepage = "https://pharo.org";
longDescription = ''
-
Pharo's goal is to deliver a clean, innovative, free open-source
Smalltalk-inspired environment. By providing a stable and small
core system, excellent dev tools, and maintained releases, Pharo
@@ -75,8 +75,7 @@ stdenv.mkDerivation rec {
access it very rapidly from your OS application launcher. As a
result, launching any image is never more than 3 clicks away.
'';
- homepage = "http://pharo.org";
- license = stdenv.lib.licenses.mit;
+ license = licenses.mit;
maintainers = [ ];
platforms = pharo.meta.platforms;
};
diff --git a/pkgs/development/pharo/vm/build-vm-legacy.nix b/pkgs/development/pharo/vm/build-vm-legacy.nix
index fd6312c7b273..13db30eae909 100644
--- a/pkgs/development/pharo/vm/build-vm-legacy.nix
+++ b/pkgs/development/pharo/vm/build-vm-legacy.nix
@@ -1,4 +1,20 @@
-{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, libGLU, libGL, freetype, xorg, alsaLib, cairo, libuuid, makeWrapper, ... }:
+{ stdenv
+, fetchurl
+, cmake
+, bash
+, unzip
+, glibc
+, openssl
+, gcc
+, libGLU
+, libGL
+, freetype
+, xorg
+, alsaLib
+, cairo
+, libuuid
+, makeWrapper
+, ... }:
{ name, src, ... }:
@@ -10,7 +26,15 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" "pic" ];
- # Building
+ nativeBuildInputs = [ unzip cmake gcc makeWrapper ];
+
+ buildInputs = [ bash glibc openssl libGLU libGL freetype
+ xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ];
+
+ LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath
+ [ cairo libGLU libGL freetype openssl libuuid alsaLib
+ xorg.libICE xorg.libSM ];
+
preConfigure = ''
cd build/
'';
@@ -46,12 +70,9 @@ stdenv.mkDerivation rec {
ln -s "${pharo-share}/lib/"*.sources $prefix/lib/$name
'';
- LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ cairo libGLU libGL freetype openssl libuuid alsaLib xorg.libICE xorg.libSM ];
- nativeBuildInputs = [ unzip cmake gcc makeWrapper ];
- buildInputs = [ bash glibc openssl libGLU libGL freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ];
-
- meta = {
+ meta = with stdenv.lib; {
description = "Clean and innovative Smalltalk-inspired environment";
+ homepage = "https://pharo.org";
longDescription = ''
Pharo's goal is to deliver a clean, innovative, free open-source
Smalltalk-inspired environment. By providing a stable and small core
@@ -65,9 +86,8 @@ stdenv.mkDerivation rec {
Please fill bug reports on http://bugs.pharo.org under the 'Ubuntu
packaging (ppa:pharo/stable)' project.
'';
- homepage = "http://pharo.org";
- license = stdenv.lib.licenses.mit;
- maintainers = [ stdenv.lib.maintainers.lukego ];
+ license = licenses.mit;
+ maintainers = [ maintainers.lukego ];
# Pharo VM sources are packaged separately for darwin (OS X)
platforms = stdenv.lib.filter
(system: with stdenv.lib.systems.elaborate { inherit system; };
diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix
index 4bc60dde410f..d5469233f387 100644
--- a/pkgs/development/pharo/vm/build-vm.nix
+++ b/pkgs/development/pharo/vm/build-vm.nix
@@ -46,6 +46,33 @@ stdenv.mkDerivation rec {
# while the VM depends on <= gcc48:
"stackprotector" ];
+ # gcc 4.8 used for the build:
+ #
+ # gcc5 crashes during compilation; gcc >= 4.9 produces a
+ # binary that crashes when forking a child process. See:
+ # http://forum.world.st/OSProcess-fork-issue-with-Debian-built-VM-td4947326.html
+ #
+ # (stack protection is disabled above for gcc 4.8 compatibility.)
+ nativeBuildInputs = [ autoreconfHook ];
+ buildInputs = [
+ bash
+ unzip
+ glibc
+ openssl
+ gcc48
+ libGLU libGL
+ freetype
+ xorg.libX11
+ xorg.libICE
+ xorg.libSM
+ alsaLib
+ cairo
+ pharo-share
+ libuuid
+ ];
+
+ enableParallelBuilding = true;
+
# Regenerate the configure script.
# Unnecessary? But the build breaks without this.
autoreconfPhase = ''
@@ -123,35 +150,9 @@ stdenv.mkDerivation rec {
ln -s ${libgit2}/lib/libgit2.so* "$out/"
'';
- enableParallelBuilding = true;
-
- # gcc 4.8 used for the build:
- #
- # gcc5 crashes during compilation; gcc >= 4.9 produces a
- # binary that crashes when forking a child process. See:
- # http://forum.world.st/OSProcess-fork-issue-with-Debian-built-VM-td4947326.html
- #
- # (stack protection is disabled above for gcc 4.8 compatibility.)
- nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [
- bash
- unzip
- glibc
- openssl
- gcc48
- libGLU libGL
- freetype
- xorg.libX11
- xorg.libICE
- xorg.libSM
- alsaLib
- cairo
- pharo-share
- libuuid
- ];
-
meta = with stdenv.lib; {
description = "Clean and innovative Smalltalk-inspired environment";
+ homepage = "https://pharo.org";
longDescription = ''
Pharo's goal is to deliver a clean, innovative, free open-source
Smalltalk-inspired environment. By providing a stable and small core
@@ -165,7 +166,6 @@ stdenv.mkDerivation rec {
Please fill bug reports on http://bugs.pharo.org under the 'Ubuntu
packaging (ppa:pharo/stable)' project.
'';
- homepage = "http://pharo.org";
license = licenses.mit;
maintainers = [ maintainers.lukego ];
platforms = [ "i686-linux" "x86_64-linux" ];
diff --git a/pkgs/development/pharo/vm/share.nix b/pkgs/development/pharo/vm/share.nix
index ee7a0494ede6..2c8c376b7c12 100644
--- a/pkgs/development/pharo/vm/share.nix
+++ b/pkgs/development/pharo/vm/share.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Shared files for Pharo";
- homepage = "http://pharo.org";
+ homepage = "https://pharo.org";
license = stdenv.lib.licenses.mit;
maintainers = [ ];
};
From 924035bb97243afc566c20ed055187789e2adba5 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Mon, 26 Oct 2020 00:32:37 -0400
Subject: [PATCH 238/590] nixos/nginx: Allow unsetting ssl_ciphers
When using the Modern config from the Mozilla SSL config generator,
the `ssl_ciphers` parameter does not need to be set
as only TLSv1.3 is permitted and all of its ciphers are reasonable.
---
nixos/modules/services/web-servers/nginx/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 6d2ddea927e0..631e92fd6e95 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -86,7 +86,7 @@ let
''}
ssl_protocols ${cfg.sslProtocols};
- ssl_ciphers ${cfg.sslCiphers};
+ ${optionalString (cfg.sslCiphers != null) "ssl_ciphers ${cfg.sslCiphers};"}
${optionalString (cfg.sslDhparam != null) "ssl_dhparam ${cfg.sslDhparam};"}
${optionalString (cfg.recommendedTlsSettings) ''
@@ -487,7 +487,7 @@ in
};
sslCiphers = mkOption {
- type = types.str;
+ type = types.nullOr types.str;
# Keep in sync with https://ssl-config.mozilla.org/#server=nginx&config=intermediate
default = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384";
description = "Ciphers to choose from when negotiating TLS handshakes.";
From a2b7bad6c85041223bbff7bf28f4827665b8fa4f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 19 Oct 2020 07:30:49 +0200
Subject: [PATCH 239/590] =?UTF-8?q?ocamlPackages.google-drive-ocamlfuse:?=
=?UTF-8?q?=200.7.21=20=E2=86=92=200.7.22?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../google-drive-ocamlfuse/default.nix | 20 ++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
index ac6ad4f22fe9..b9b1c1f54a95 100644
--- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
+++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
@@ -1,25 +1,27 @@
-{ stdenv, buildDunePackage, fetchFromGitHub
-, ocamlfuse, gapi_ocaml, ocaml_sqlite3
+{ lib, buildDunePackage, fetchFromGitHub
+, ocaml_extlib, ocamlfuse, gapi_ocaml, ocaml_sqlite3
}:
buildDunePackage rec {
pname = "google-drive-ocamlfuse";
- version = "0.7.21";
+ version = "0.7.22";
+
+ useDune2 = true;
src = fetchFromGitHub {
owner = "astrada";
repo = "google-drive-ocamlfuse";
rev = "v${version}";
- sha256 = "0by3qnjrr1mbxyl2n99zggx8dxnqlicsq2b2hhhxb2d0k8qn47sw";
+ sha256 = "027j1r2iy8vnbqs8bv893f0909yk5312ki5p3zh2pdz6s865h750";
};
- buildInputs = [ ocamlfuse gapi_ocaml ocaml_sqlite3 ];
+ buildInputs = [ ocaml_extlib ocamlfuse gapi_ocaml ocaml_sqlite3 ];
meta = {
- homepage = "http://gdfuse.forge.ocamlcore.org/";
+ inherit (src.meta) homepage;
description = "A FUSE-based file system backed by Google Drive, written in OCaml";
- license = stdenv.lib.licenses.mit;
- platforms = stdenv.lib.platforms.linux;
- maintainers = with stdenv.lib.maintainers; [ obadz ];
+ license = lib.licenses.mit;
+ platforms = lib.platforms.linux;
+ maintainers = with lib.maintainers; [ obadz ];
};
}
From 024e71ec02f608c8e58e60bd4e30a6ca31e01a33 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sun, 25 Oct 2020 16:17:55 +0100
Subject: [PATCH 240/590] =?UTF-8?q?ocamlPackages.mirage-runtime:=203.8.1?=
=?UTF-8?q?=20=E2=86=92=203.9.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkgs/development/ocaml-modules/mirage/runtime.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/ocaml-modules/mirage/runtime.nix b/pkgs/development/ocaml-modules/mirage/runtime.nix
index 816e85d3c9ac..b3f308979f46 100644
--- a/pkgs/development/ocaml-modules/mirage/runtime.nix
+++ b/pkgs/development/ocaml-modules/mirage/runtime.nix
@@ -3,13 +3,13 @@
buildDunePackage rec {
pname = "mirage-runtime";
- version = "3.8.1";
+ version = "3.9.0";
- minimumOCamlVersion = "4.06";
+ minimumOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-v${version}.tbz";
- sha256 = "1sx9df041jb2rdrsibybifhml6h6kpzw9d2bw6vvv0ml500070ww";
+ sha256 = "1hznh49v1jlkwww6xi9f2f4yjzlh9qfvdrrdzvddnwsh3g00flla";
};
propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs ocaml_lwt ];
From a456ccb0c817a693e7f875e8159f0ec228a1d2d9 Mon Sep 17 00:00:00 2001
From: Keshav Kini <keshav.kini@gmail.com>
Date: Mon, 26 Oct 2020 00:50:06 -0700
Subject: [PATCH 241/590] lib/types.nix: fix missing inherit
I think there was a silent (i.e. semantic) merge conflict between PR #101139 and
PR #100456. This commit should fix the error, which manifests as follows:
error: undefined variable 'boolToString' at /home/kkini/src/nixpkgs/lib/types.nix:552:42
---
lib/types.nix | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/types.nix b/lib/types.nix
index 77f32f48ea2a..ee891f8231b6 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -57,6 +57,9 @@ let
escapeNixString
isCoercibleToString
;
+ inherit (lib.trivial)
+ boolToString
+ ;
inherit (lib.modules) mergeDefinitions;
outer_types =
From 7661b5541760e3debca5c538174d05b7e975ab99 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@euank.com>
Date: Sun, 25 Oct 2020 23:51:02 -0700
Subject: [PATCH 242/590] k3s: add modprobe to k3s's PATH
Otherwise we get warnings like 'level=warning msg="failed to start
br_netfilter module"' in k3s's logs.
Adding modprobe to k3s's PATH fixes the warning at least. I'm not
certain if it fixes any real issue or not.
---
pkgs/applications/networking/cluster/k3s/default.nix | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix
index ca0da973f2c6..ae98fbbcc2dc 100644
--- a/pkgs/applications/networking/cluster/k3s/default.nix
+++ b/pkgs/applications/networking/cluster/k3s/default.nix
@@ -9,6 +9,7 @@
, buildGoPackage
, git
, runc
+, kmod
, libseccomp
, pkgconfig
, ethtool
@@ -226,6 +227,7 @@ stdenv.mkDerivation rec {
# https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494
# Note the list in that issue is stale and some aren't relevant for k3s.
k3sRuntimeDeps = [
+ kmod
socat
iptables
iproute
From 8a26bfb4a11e1de2ad69cbccec6697077cfaa219 Mon Sep 17 00:00:00 2001
From: Moritz Scheuren <m.scheuren@oyra.eu>
Date: Mon, 26 Oct 2020 11:08:17 +0100
Subject: [PATCH 243/590] portfolio: 0.48.1 -> 0.49.0
---
pkgs/applications/office/portfolio/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix
index bb02c89486b5..e186b3e3ce50 100644
--- a/pkgs/applications/office/portfolio/default.nix
+++ b/pkgs/applications/office/portfolio/default.nix
@@ -24,11 +24,11 @@ let
in
stdenv.mkDerivation rec {
pname = "PortfolioPerformance";
- version = "0.48.1";
+ version = "0.49.0";
src = fetchurl {
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
- sha256 = "0xhxp4iglggv6rqwsg0xjn8z46v910rj372abkaviwa3cqzf7gdb";
+ sha256 = "1b3dll6ljkj2wyiy3ns9cgxqgjjr60dfrqrbbwdbndqj4pzfvbyf";
};
nativeBuildInputs = [
From c9a6cd0a30f23e9c41b0930e8312f66253c808ec Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 26 Oct 2020 12:08:42 +0200
Subject: [PATCH 244/590] libsForQt5.qtutilities: 6.0.6 -> 6.3.0
---
pkgs/development/libraries/qtutilities/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix
index 388665f5aabd..916e381ab4da 100644
--- a/pkgs/development/libraries/qtutilities/default.nix
+++ b/pkgs/development/libraries/qtutilities/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qtutilities";
- version = "6.0.6";
+ version = "6.3.0";
src = fetchFromGitHub {
owner = "Martchus";
repo = pname;
rev = "v${version}";
- sha256 = "0g3f18530w5f8dlzrh45k868hspga5p3m8qpz7pcg3nsdjda8cwz";
+ sha256 = "sha256-vHx2JMPqioY8jUpBOIFdhhN1mIUV3LS8ayQOo3g7bY0=";
};
buildInputs = [ qtbase cpp-utilities ];
From a5ca6e8e843ddb5212b6e28c63bb4ebbcfc33932 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 26 Oct 2020 12:10:40 +0200
Subject: [PATCH 245/590] syncthingtray: 0.11.0 -> 1.0.0
---
pkgs/applications/misc/syncthingtray/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix
index c45ea27c425e..bb4b3ac90ce1 100644
--- a/pkgs/applications/misc/syncthingtray/default.nix
+++ b/pkgs/applications/misc/syncthingtray/default.nix
@@ -20,14 +20,14 @@
}:
mkDerivation rec {
- version = "0.11.0";
+ version = "1.0.0";
pname = "syncthingtray";
src = fetchFromGitHub {
owner = "Martchus";
repo = "syncthingtray";
rev = "v${version}";
- sha256 = "1lpjrij6y8l738hd7bfig0piglqinnqbadidzw9k0nm53bh4pqrr";
+ sha256 = "sha256-mB23UOUrOfEmbFfVsAXyi3iod0NAfp/sl7Gkklqfmbo=";
};
buildInputs = [ qtbase cpp-utilities qtutilities ]
From 1829a89f844eb3cce64f761e31896d965e178c2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Mon, 26 Oct 2020 11:29:28 +0100
Subject: [PATCH 246/590] raspberrypifw: 1.20200902 -> 1.20201022
---
pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
index 6036eff2d984..70bcaa15d96e 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "raspberrypi-firmware";
- version = "1.20200902";
+ version = "1.20201022";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "firmware";
rev = version;
- sha256 = "1dj5vyhz2ljka7hwhl6s14hd017fspix1xp7zbm7lzdyys9jb9ni";
+ sha256 = "0j5m50cmmr11m3h8kk89j1pqkdqr7mzdzg04ayiqvfhvy32qqlg8";
};
installPhase = ''
From 9ac5e1ca06270c58c8a7a798333114dcc4de7a9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 26 Oct 2020 09:04:38 +0100
Subject: [PATCH 247/590] somafm-cli: set meta.platforms.all
---
pkgs/tools/misc/somafm-cli/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/tools/misc/somafm-cli/default.nix b/pkgs/tools/misc/somafm-cli/default.nix
index 312b402ae66d..3ce3f62a9e2b 100644
--- a/pkgs/tools/misc/somafm-cli/default.nix
+++ b/pkgs/tools/misc/somafm-cli/default.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
description = "Listen to SomaFM in your terminal via pure bash";
homepage = "https://github.com/rockymadden/somafm-cli";
license = licenses.mit;
+ platforms = platforms.all;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}
From 57c2755ca2522038bc88fbe3dcabc80190369321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 26 Oct 2020 09:04:52 +0100
Subject: [PATCH 248/590] ssh-audit: set meta.platforms.all
---
pkgs/tools/security/ssh-audit/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/tools/security/ssh-audit/default.nix b/pkgs/tools/security/ssh-audit/default.nix
index 9dbb0ce5fcf4..6a3dbfb615be 100644
--- a/pkgs/tools/security/ssh-audit/default.nix
+++ b/pkgs/tools/security/ssh-audit/default.nix
@@ -39,6 +39,7 @@ python3Packages.buildPythonApplication rec {
description = "Tool for ssh server auditing";
homepage = "https://github.com/jtesta/ssh-audit";
license = licenses.mit;
+ platforms = platforms.all;
maintainers = with maintainers; [ tv SuperSandro2000 ];
};
}
From fd29e9a3c0fc003fb47408164104c111b87c2ee2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 26 Oct 2020 09:52:56 +0100
Subject: [PATCH 249/590] rustscan: fix building on darwin
---
pkgs/tools/security/rustscan/default.nix | 10 ++++------
pkgs/top-level/all-packages.nix | 4 +++-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pkgs/tools/security/rustscan/default.nix b/pkgs/tools/security/rustscan/default.nix
index 773711d1f302..4d154bbc96ff 100644
--- a/pkgs/tools/security/rustscan/default.nix
+++ b/pkgs/tools/security/rustscan/default.nix
@@ -1,8 +1,4 @@
-{ lib
-, fetchFromGitHub
-, rustPlatform
-, nmap
-}:
+{ stdenv, fetchFromGitHub, rustPlatform, nmap, Security }:
rustPlatform.buildRustPackage rec {
pname = "rustscan";
@@ -22,6 +18,8 @@ rustPlatform.buildRustPackage rec {
--replace 'Command::new("nmap")' 'Command::new("${nmap}/bin/nmap")'
'';
+ buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+
checkFlags = [
"--skip=infer_ulimit_lowering_no_panic"
"--skip=google_dns_runs"
@@ -29,7 +27,7 @@ rustPlatform.buildRustPackage rec {
"--skip=parse_hosts_file_and_incorrect_hosts"
];
- meta = with lib; {
+ meta = with stdenv.lib; {
description = "Faster Nmap Scanning with Rust";
homepage = "https://github.com/RustScan/RustScan";
license = licenses.gpl3Only;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 14630896d3f2..5f1cb87dcc5c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6803,7 +6803,9 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
- rustscan = callPackage ../tools/security/rustscan { };
+ rustscan = callPackage ../tools/security/rustscan {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
rw = callPackage ../tools/misc/rw { };
From 951ec156d171ff62e8be357d78c87f4886ef117e Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 26 Oct 2020 21:57:33 +1000
Subject: [PATCH 250/590] .github/stale.yml: fix syntax
---
.github/stale.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.github/stale.yml b/.github/stale.yml
index f6e2240b5085..045dbc9ff45d 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -5,5 +5,6 @@ exemptLabels:
- "1.severity: security"
- "2.status: never-stale"
staleLabel: "2.status: stale"
-markComment: [Nixpkgs stale bot info](https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md)
+markComment: |
+ [Nixpkgs stale bot info](https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md)
closeComment: false
From 9e04bba0af3c3d39fe004d55ddb6601ca4caa077 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 26 Oct 2020 13:07:49 +0100
Subject: [PATCH 251/590] nixos/dnscrypt-wrapper: fix key rotation script
Fix an error in the validation code when the public key is in a
nonstandard location. The check command fails and the key is
incorrectly assumed to be expiring.
---
nixos/modules/services/networking/dnscrypt-wrapper.nix | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/nixos/modules/services/networking/dnscrypt-wrapper.nix b/nixos/modules/services/networking/dnscrypt-wrapper.nix
index b9333cd19a2a..ee7e9b0454de 100644
--- a/nixos/modules/services/networking/dnscrypt-wrapper.nix
+++ b/nixos/modules/services/networking/dnscrypt-wrapper.nix
@@ -55,7 +55,10 @@ let
rotateKeys = ''
# check if keys are not expired
keyValid() {
- fingerprint=$(dnscrypt-wrapper --show-provider-publickey | awk '{print $(NF)}')
+ fingerprint=$(dnscrypt-wrapper \
+ --show-provider-publickey \
+ --provider-publickey-file=${publicKey} \
+ | awk '{print $(NF)}')
dnscrypt-proxy --test=${toString (cfg.keys.checkInterval + 1)} \
--resolver-address=127.0.0.1:${toString cfg.port} \
--provider-name=${cfg.providerName} \
From a28e589938a5401ddad9beaa05d7a91a91aded67 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 26 Oct 2020 14:18:42 +0200
Subject: [PATCH 252/590] sequoia: 0.19.0 -> 0.20.0
---
pkgs/tools/security/sequoia/default.nix | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix
index a54433b92c93..58899d399fd6 100644
--- a/pkgs/tools/security/sequoia/default.nix
+++ b/pkgs/tools/security/sequoia/default.nix
@@ -23,16 +23,16 @@ assert pythonSupport -> pythonPackages != null;
rustPlatform.buildRustPackage rec {
pname = "sequoia";
- version = "0.19.0";
+ version = "0.20.0";
src = fetchFromGitLab {
owner = "sequoia-pgp";
repo = "sequoia";
rev = "v${version}";
- sha256 = "1870wd03c3x0da9p3jmkvfx8am87ak0dcsvp2qkjvglbl396kd8y";
+ sha256 = "sha256-br5GRzWprQTixNrE0WpNIB7Ayj5oEfyCg5JY4MnX5rA=";
};
- cargoSha256 = "0bb51vdppdjhsxbfy3lyqvw5r5j58r3wi0qb68m2a45k3za7liss";
+ cargoSha256 = "sha256-SpCdoLCtvU9jpG/ivB/+4KhRdKZxN3/+7P/RlR6n9/c=";
nativeBuildInputs = [
pkg-config
@@ -62,6 +62,8 @@ rustPlatform.buildRustPackage rec {
makeFlags = [
"PREFIX=${placeholder "out"}"
+ # Defaults to "ginstall" from some reason, although upstream's Makefiles check uname
+ "INSTALL=install"
];
buildFlags = [
From 722c94310c7a839beb5ec4074a685769a4f77565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Mon, 26 Oct 2020 13:58:41 +0100
Subject: [PATCH 253/590] asterisk: Bump all packages
---
pkgs/servers/asterisk/default.nix | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index b0e7d6aec56c..2cf40f3d026b 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -104,8 +104,8 @@ in rec {
asterisk = asterisk_17;
asterisk_13 = common {
- version = "13.36.0";
- sha256 = "1p41xrxmzpqmjgvrl7f4vbigiqpmg60fd8bqg5rxbf4lxzpvknnp";
+ version = "13.37.0";
+ sha256 = "09wc6cqh4f15wm62drzdppwvh7nwgnbwapvz1kgb0qdgixsshn3v";
externals = {
"externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
"addons/mp3" = mp3-202;
@@ -113,8 +113,8 @@ in rec {
};
asterisk_16 = common {
- version = "16.13.0";
- sha256 = "01nja8hd6jk1966awc2vcz3hl46pvhi797k515q87vzmap1khlp9";
+ version = "16.14.0";
+ sha256 = "1y120p4jlhg4iwihdxlk64y3y3n8w7y785lwqxsyqg6zviz0ghx6";
externals = {
"externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
"addons/mp3" = mp3-202;
@@ -122,8 +122,8 @@ in rec {
};
asterisk_17 = common {
- version = "17.7.0";
- sha256 = "0lsglrh3l823200rmkay3pgy42k0fsij610s3s4vd3zv4jjb1g0s";
+ version = "17.8.0";
+ sha256 = "0xhwh8s8n8xg43gcdkqjj484assva7lm5ah1b306a5nf6j8p9bjy";
externals = {
"externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
"addons/mp3" = mp3-202;
From 25599d571c4f0050d42f49042a7174a10e1a99e6 Mon Sep 17 00:00:00 2001
From: IvarWithoutBones <ivar.scholten@protonmail.com>
Date: Mon, 26 Oct 2020 14:01:35 +0100
Subject: [PATCH 254/590] pythonPackages.rich: 8.0.0 -> 9.1.0
---
pkgs/development/python-modules/rich/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix
index 71166b86f18e..6284ed7b649a 100644
--- a/pkgs/development/python-modules/rich/default.nix
+++ b/pkgs/development/python-modules/rich/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "rich";
- version = "8.0.0";
+ version = "9.1.0";
# tests not included in pypi tarball
src = fetchFromGitHub {
owner = "willmcgugan";
repo = pname;
rev = "v${version}";
- sha256 = "0hv27b22x7dbx1i7nzsd8y8fymmvdak2hcx9242jwk4c1a7jr151";
+ sha256 = "18iha0fs8vm0j11k39yxj26h8qxrp27ijhx6h1yyizbygmr5b5nk";
};
format = "pyproject";
From 3ad266417037f075dc1addca49dc7a4bf26d42ad Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 26 Oct 2020 13:41:52 +0100
Subject: [PATCH 255/590] redkite: 1.1.0 -> 1.2.0
---
pkgs/development/libraries/redkite/default.nix | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pkgs/development/libraries/redkite/default.nix b/pkgs/development/libraries/redkite/default.nix
index b5202658352b..af8a1a914e4b 100644
--- a/pkgs/development/libraries/redkite/default.nix
+++ b/pkgs/development/libraries/redkite/default.nix
@@ -2,24 +2,24 @@
stdenv.mkDerivation rec {
pname = "redkite";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchFromGitLab {
owner = "iurie-sw";
repo = pname;
rev = "v${version}";
- sha256 = "0bim1ifyslwvaf885klmf9hpszqq5k9bm2y4l7gcgl6cljfzi04y";
+ sha256 = "0c5k0a6ydb8szdgniqsva8l9j2sishlhsww13b3a9grvr7hb2bpq";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ cairo ];
- meta = {
+ meta = with stdenv.lib; {
homepage = "https://gitlab.com/iurie-sw/redkite";
description = "A small GUI toolkit";
- license = stdenv.lib.licenses.gpl3Plus;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.magnetophon ];
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.magnetophon ];
};
}
From fe217b9fb9a3c5d64968d56cd19b1511605c6561 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philippe=20H=C3=BCrlimann?= <p@hurlimann.org>
Date: Mon, 26 Oct 2020 14:10:53 +0100
Subject: [PATCH 256/590] gradle: 6.6 -> 6.7
---
.../tools/build-managers/gradle/default.nix | 10 +++++-----
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 73e9bc7b5601..d06282739afe 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -51,15 +51,15 @@ rec {
};
};
- gradle_latest = gradle_6_6;
+ gradle_latest = gradle_6_7;
- gradle_6_6 = gradleGen rec {
- name = "gradle-6.6";
- nativeVersion = "0.22-milestone-4";
+ gradle_6_7 = gradleGen rec {
+ name = "gradle-6.7";
+ nativeVersion = "0.22-milestone-8";
src = fetchurl {
url = "https://services.gradle.org/distributions/${name}-bin.zip";
- sha256 = "09a0fnz6fn8yaxm3q3iwyjm3nnaz7k8i1xlpc7sm414py043by76";
+ sha256 = "1i6zm55wzy13wvvmf3804b0rs47yrqqablf4gpf374ls05cpgmca";
};
};
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f1cb87dcc5c..833473f81cfd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11173,7 +11173,7 @@ in
gradle_4_10 = res.gradleGen.gradle_4_10;
gradle_4 = gradle_4_10;
gradle_5 = res.gradleGen.gradle_5_6;
- gradle_6 = res.gradleGen.gradle_6_6;
+ gradle_6 = res.gradleGen.gradle_6_7;
gperf = callPackage ../development/tools/misc/gperf { };
# 3.1 changed some parameters from int to size_t, leading to mismatches.
From 5f0bf8d30eaaba66dfa2aa9f5a2b6c3e46c28030 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Mon, 26 Oct 2020 20:29:04 +0700
Subject: [PATCH 257/590] miranda: remove gcc as buildInput
---
pkgs/development/compilers/miranda/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/development/compilers/miranda/default.nix b/pkgs/development/compilers/miranda/default.nix
index c3cb854cdf49..55d3976858b7 100644
--- a/pkgs/development/compilers/miranda/default.nix
+++ b/pkgs/development/compilers/miranda/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchzip, fetchpatch, gcc }:
+{ stdenv, lib, fetchzip, fetchpatch }:
stdenv.mkDerivation rec {
pname = "miranda";
From 50fc95822e1f8fececdebabe7ae3ccca7235cedc Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Mon, 26 Oct 2020 15:32:24 +0100
Subject: [PATCH 258/590] moarvm: 2020.09 -> 2020.10
---
pkgs/development/interpreters/rakudo/moarvm.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix
index f03043369e92..a873bfd28f53 100644
--- a/pkgs/development/interpreters/rakudo/moarvm.nix
+++ b/pkgs/development/interpreters/rakudo/moarvm.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "moarvm";
- version = "2020.09";
+ version = "2020.10";
src = fetchurl {
url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz";
- sha256 = "08prlvnyqwnzb7mwaqvgv662v78xgwsyy12cpyim6gc4z0i1kcj8";
+ sha256 = "1i7jjjwv4av3rsfgbqb213fhb9ns25jfm19nzn7kki0n7w486y33";
};
buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
From f4b99505379d96e28f8d0418d77cd7df8661d63a Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 26 Oct 2020 13:43:20 +0100
Subject: [PATCH 259/590] geonkick: 2.3.8 -> 2.4.0
---
pkgs/applications/audio/geonkick/default.nix | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/applications/audio/geonkick/default.nix
index e32bef008d99..0da00d319720 100644
--- a/pkgs/applications/audio/geonkick/default.nix
+++ b/pkgs/applications/audio/geonkick/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchFromGitLab, cmake, pkg-config, redkite, libsndfile, rapidjson, libjack2, lv2, libX11, cairo }:
+{ stdenv, fetchFromGitLab, cmake, pkg-config, redkite, libsndfile, rapidjson
+, libjack2, lv2, libX11, cairo }:
stdenv.mkDerivation rec {
pname = "geonkick";
- version = "2.3.8";
+ version = "2.4.0";
src = fetchFromGitLab {
owner = "iurie-sw";
repo = pname;
rev = "v${version}";
- sha256 = "07809yy2q7dd6fcp0yndlg1vw2ca2zisnsplb3xrxvzdvrqlw910";
+ sha256 = "1ibsfyzkvzijv929p91db56gaxm582b7nikbn10wbbjvv4f46mmj";
};
nativeBuildInputs = [ cmake pkg-config ];
@@ -16,13 +17,16 @@ stdenv.mkDerivation rec {
buildInputs = [ redkite libsndfile rapidjson libjack2 lv2 libX11 cairo ];
# https://github.com/iurie-sw/geonkick/issues/120
- cmakeFlags = [ "-DGKICK_REDKITE_SDK_PATH=${redkite}" "-DCMAKE_INSTALL_LIBDIR=lib" ];
+ cmakeFlags = [
+ "-DGKICK_REDKITE_SDK_PATH=${redkite}"
+ "-DCMAKE_INSTALL_LIBDIR=lib"
+ ];
- meta = {
+ meta = with stdenv.lib; {
homepage = "https://gitlab.com/iurie-sw/geonkick";
description = "A free software percussion synthesizer";
- license = stdenv.lib.licenses.gpl3Plus;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.magnetophon ];
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.magnetophon ];
};
}
From e0007b13832631ed1c258d8ff6b63a24dc8916ff Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Mon, 26 Oct 2020 15:32:42 +0100
Subject: [PATCH 260/590] nqp: 2020.09 -> 2020.10
---
pkgs/development/interpreters/rakudo/nqp.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix
index 14d5f563fcd2..e200b59b61c3 100644
--- a/pkgs/development/interpreters/rakudo/nqp.nix
+++ b/pkgs/development/interpreters/rakudo/nqp.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nqp";
- version = "2020.09";
+ version = "2020.10";
src = fetchurl {
url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz";
- sha256 = "09kiy7r732yrh3nzdzdq9yki0jx2hamyqvrbahk4mlxmb6cl9qmh";
+ sha256 = "0nb0vdycz2wrd5yspvps2wy7a21066csr18v786085qim347830h";
};
buildInputs = [ perl ];
From 8b71dfed9255c9f26f0decee4e2aa2633cbc24b7 Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Mon, 26 Oct 2020 15:32:59 +0100
Subject: [PATCH 261/590] rakudo: 2020.09 -> 2020.10
---
pkgs/development/interpreters/rakudo/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index 94f01cd51dff..f06c51fce0d4 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "rakudo";
- version = "2020.09";
+ version = "2020.10";
src = fetchurl {
url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz";
- sha256 = "1izfwns7viwy0x9hnhx13j9w5qa97qpyxqk9cd8iax7i68z057m7";
+ sha256 = "0wvsinmpz8icd0409f8rg93mqdb5ml76m0vb4r26ngz237ph69dn";
};
buildInputs = [ icu zlib gmp perl ];
From feac386ca98d0e285c7468d0f2728de8922c95d3 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Mon, 26 Oct 2020 10:47:29 -0400
Subject: [PATCH 262/590] cinnamon.cjs: don't use fork, 4.6.0 -> 2020-10-19
The code in that fork was been integrated into cjs master https://github.com/linuxmint/cjs/pull/84
---
pkgs/desktops/cinnamon/cjs/default.nix | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix
index a810bdcc03e1..6471d06cd517 100644
--- a/pkgs/desktops/cinnamon/cjs/default.nix
+++ b/pkgs/desktops/cinnamon/cjs/default.nix
@@ -27,14 +27,14 @@
}:
stdenv.mkDerivation rec {
- pname = "cjs";
- version = "4.6.0-gjs-1.66.0";
+ pname = "cjs-unstable";
+ version = "2020-10-19";
src = fetchFromGitHub {
- owner = "leigh123linux";
- repo = pname;
- rev = "gjs-1.66.0";
- sha256 = "1pccz7h8mwljziflhn04gmfnbl99pvcj1byz1c6zn947v5gqskj1";
+ owner = "linuxmint";
+ repo = "cjs";
+ rev = "befc11adb5ba10681464e6fa81b1a79f108ce61c";
+ hash = "sha256-F2t8uKV2r29NxX2+3mYp5x1bug2lwihJZTK1dSS8rPg=";
};
outputs = [ "out" "dev" ];
From 6d109130027e6d7349c3eb0dddb7ee403d791575 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 26 Oct 2020 15:27:17 +0100
Subject: [PATCH 263/590] wmfocus: 1.1.3 -> 1.1.5
---
pkgs/applications/window-managers/i3/wmfocus.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix
index c4e22546d1c4..5c9f2b779530 100644
--- a/pkgs/applications/window-managers/i3/wmfocus.nix
+++ b/pkgs/applications/window-managers/i3/wmfocus.nix
@@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "wmfocus";
- version = "1.1.3";
+ version = "1.1.5";
src = fetchFromGitHub {
owner = "svenstaro";
repo = pname;
- rev = version;
- sha256 = "17qdsqp9072yr7rcm6g1h620rff95ldawr8ldpkbjmkh0rc86skn";
+ rev = "v${version}";
+ sha256 = "09xffklpz62h6yiksxdlv3a9s1z0wr3ax9syl399avwdmq3c0y49";
};
- cargoSha256 = "1nsdvzrsgprwq7lsvfpymqslhggdzfk3840y8x92qjb0l2g4jhw1";
+ cargoSha256 = "0rczas6sgcppacz48xx7sarkvc4s2sgcdz6c661d7vcry1y46xms";
nativeBuildInputs = [ python3 pkgconfig ];
buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ];
From 99fabc5779f00e7fd7ab6bf459c4a5aa1d543359 Mon Sep 17 00:00:00 2001
From: V <v@anomalous.eu>
Date: Tue, 29 Sep 2020 09:54:34 +0200
Subject: [PATCH 264/590] mpd: remove unused fetchpatch argument
This argument is no longer referenced anywhere as of #93143.
---
pkgs/servers/mpd/default.nix | 1 -
1 file changed, 1 deletion(-)
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index f7cc688dc564..d994ba99dfc3 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -24,7 +24,6 @@
, python3Packages # for sphinx-build
# For tests
, gtest
-, fetchpatch # used to fetch an upstream patch fixing a failing test
, zip
}:
From 7cea8833ebe5cdbb18f51c7c0c2bcd5d5bbbed85 Mon Sep 17 00:00:00 2001
From: IvarWithoutBones <ivar.scholten@protonmail.com>
Date: Mon, 26 Oct 2020 14:04:02 +0100
Subject: [PATCH 265/590] pythonPackages.myfitnesspal: fix build
---
.../python-modules/myfitnesspal/default.nix | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/python-modules/myfitnesspal/default.nix b/pkgs/development/python-modules/myfitnesspal/default.nix
index 53e5f8253449..0638ce5d1ee5 100644
--- a/pkgs/development/python-modules/myfitnesspal/default.nix
+++ b/pkgs/development/python-modules/myfitnesspal/default.nix
@@ -1,6 +1,9 @@
{ lib, fetchPypi, buildPythonPackage
-, blessed, keyring, keyrings-alt, lxml, measurement, python-dateutil, requests, six
-, mock, nose }:
+, blessed, keyring, keyrings-alt, lxml, measurement, python-dateutil, requests, six, rich
+, pytestCheckHook, mock, nose }:
+
+# TODO: Define this package in "all-packages.nix" using "toPythonApplication".
+# This currently errors out, complaining about not being able to find "etree" from "lxml" even though "lxml" is defined in "propagatedBuildInputs".
buildPythonPackage rec {
pname = "myfitnesspal";
@@ -11,14 +14,18 @@ buildPythonPackage rec {
sha256 = "c2275e91c794a3569a76c47c78cf2ff04d7f569a98558227e899ead7b30af0d6";
};
- # Remove overly restrictive version constraints on keyring and keyrings.alt
+ # Remove overly restrictive version constraints
postPatch = ''
sed -i 's/keyring>=.*/keyring/' requirements.txt
sed -i 's/keyrings.alt>=.*/keyrings.alt/' requirements.txt
+ sed -i 's/rich>=.*/rich/' requirements.txt
'';
- checkInputs = [ mock nose ];
- propagatedBuildInputs = [ blessed keyring keyrings-alt lxml measurement python-dateutil requests six ];
+ propagatedBuildInputs = [ blessed keyring keyrings-alt lxml measurement python-dateutil requests six rich ];
+
+ # Integration tests require an account to be set
+ disabledTests = [ "test_integration" ];
+ checkInputs = [ pytestCheckHook mock nose ];
meta = with lib; {
description = "Access your meal tracking data stored in MyFitnessPal programatically";
From 8a4edf9087f41db298edd13eec6afc0b41dfe2ae Mon Sep 17 00:00:00 2001
From: devhell <devhell@mailfresser.de>
Date: Sun, 18 Oct 2020 15:58:56 +0100
Subject: [PATCH 266/590] {lib}mediainfo{-gui}: 20.08 -> 20.09
This release includes a fix for https://github.com/NixOS/nixpkgs/issues/92874
---
pkgs/applications/misc/mediainfo-gui/default.nix | 4 ++--
pkgs/applications/misc/mediainfo/default.nix | 4 ++--
pkgs/development/libraries/libmediainfo/default.nix | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index 96833bb25d35..b3e23f2245cf 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -2,11 +2,11 @@
, desktop-file-utils, libSM, imagemagick }:
stdenv.mkDerivation rec {
- version = "20.08";
+ version = "20.09";
pname = "mediainfo-gui";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
- sha256 = "1baf2dj5s3g1x4ssqli1b2r1203syk42m09zhp36qcinmfixv11l";
+ sha256 = "0rqg9z7s5bk7vlvjrs4gackzg7ib05a0dffi2ihsjf5a7kw7wcir";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index 09f20a9ba5dd..0fd3826f4e56 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
stdenv.mkDerivation rec {
- version = "20.08";
+ version = "20.09";
pname = "mediainfo";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
- sha256 = "1baf2dj5s3g1x4ssqli1b2r1203syk42m09zhp36qcinmfixv11l";
+ sha256 = "0rqg9z7s5bk7vlvjrs4gackzg7ib05a0dffi2ihsjf5a7kw7wcir";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index e6650db85cc7..31d64101e6bf 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }:
stdenv.mkDerivation rec {
- version = "20.08";
+ version = "20.09";
pname = "libmediainfo";
src = fetchurl {
url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
- sha256 = "19n8h9jq42b6r3dbag77fzwfksfywszmzpi636w87fvc1nqldlqj";
+ sha256 = "15ni9pnch6688m72swwax109a7mg4a08yx75qknrx7qa6dbyhz6h";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
From a091ac564ff36d30a924f8cea4df8adfd7d3acf1 Mon Sep 17 00:00:00 2001
From: David Birks <david@birks.dev>
Date: Mon, 26 Oct 2020 13:23:53 -0400
Subject: [PATCH 267/590] kubernetes-helm: 3.3.4 -> 3.4.0
---
pkgs/applications/networking/cluster/helm/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 7a5ecc5c80d7..a0daba8d8f28 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "helm";
- version = "3.3.4";
+ version = "3.4.0";
src = fetchFromGitHub {
owner = "helm";
repo = "helm";
rev = "v${version}";
- sha256 = "1b719kzchgis4imscgf6i7dvc1mq3ymgh5ganpb89kcs88qw3szj";
+ sha256 = "1z5s8c6yrc1v2y54lx2mbyz31schzpaz2r304m0wwxhn06p43sl0";
};
- vendorSha256 = "0f8a0psvic923rh13f5041p7hr6w8dy9qxdw3l195yky5cf3fj6w";
+ vendorSha256 = "0vcvmbvfmj0bi5msjhy9qcqabiscjpfqpnb1lxy49mshs902qc14";
doCheck = false;
From 8f7b1ecb529ebe8e5f03eb7f44c4c8340ce7af2d Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Mon, 26 Oct 2020 13:29:08 -0400
Subject: [PATCH 268/590] pantheon.switchboard-with-plugs: add testing support
---
pkgs/desktops/pantheon/apps/switchboard/wrapper.nix | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
index 67f4105ff3d1..7953105951c6 100644
--- a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
@@ -8,15 +8,18 @@
, plugs
# Only useful to disable for development testing.
, useDefaultPlugs ? true
+, testName ? null
}:
let
selectedPlugs =
if plugs == null then switchboardPlugs
else plugs ++ (lib.optionals useDefaultPlugs switchboardPlugs);
+
+ testingName = lib.optionalString (testName != null) "${testName}-";
in
stdenv.mkDerivation rec {
- name = "${switchboard.name}-with-plugs";
+ name = "${testingName}${switchboard.name}-with-plugs";
src = null;
From ace69f768bd0e607623df5eaaba76fcf1fffdfdc Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Mon, 26 Oct 2020 13:45:19 -0400
Subject: [PATCH 269/590] Revert "nixos/pantheon: install nixos wallpaper"
This reverts commit 5100e4f250833d42dffd9c55e3fda82303b606fd.
Fixes https://github.com/NixOS/nixpkgs/issues/100293
Though it's only a workaround for now.
See https://github.com/elementary/switchboard-plug-pantheon-shell/issues/246#issuecomment-716713218
We trigger the broken scenario where we have two subdirectories. Reverting
that commit undoes this.
---
nixos/modules/services/x11/desktop-managers/pantheon.nix | 1 -
1 file changed, 1 deletion(-)
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index e67e216f90d9..cf02a71248b1 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -180,7 +180,6 @@ in
gtk3.out
hicolor-icon-theme
lightlocker
- nixos-artwork.wallpapers.simple-dark-gray
onboard
qgnomeplatform
shared-mime-info
From e1a0f94ae74fedbfcb398b7196a3653530b47f48 Mon Sep 17 00:00:00 2001
From: David Arnold <dar@xoe.solutions>
Date: Mon, 26 Oct 2020 12:53:44 -0500
Subject: [PATCH 270/590] stale-bot: TL;DR tweak
Tweak TL;DR a little to provide an empathetic springboard
to where we want people to land.
---
.github/stale.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/stale.yml b/.github/stale.yml
index 045dbc9ff45d..b5e6ec93baf9 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -6,5 +6,5 @@ exemptLabels:
- "2.status: never-stale"
staleLabel: "2.status: stale"
markComment: |
- [Nixpkgs stale bot info](https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md)
+ I marked this as stale due to inactivity. → [More info](https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md)
closeComment: false
From 4deb3a51df0701551e6ede217a1b0417d5113250 Mon Sep 17 00:00:00 2001
From: elseym <elseym@me.com>
Date: Mon, 26 Oct 2020 18:59:52 +0100
Subject: [PATCH 271/590] plex: 1.20.2.3402 -> 1.20.3.3483
---
pkgs/servers/plex/raw.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index c816f314863a..f06b0a486985 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -8,13 +8,13 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
- version = "1.20.2.3402-0fec14d92";
+ version = "1.20.3.3483-211702a9f";
pname = "plexmediaserver";
# Fetch the source
src = fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm";
- sha256 = "0vylajkk6424cnxx4kg0yl53pg6w271pp71zgg1f4p2nhkbxd91c";
+ sha256 = "0b05mxmvjn2sr0aqy8s2c41gz0vlpmwjwx42jpqddk3qzidvwkbd";
};
outputs = [ "out" "basedb" ];
From c24433bedb0c9148c6a29824d9406b9a0fb183e5 Mon Sep 17 00:00:00 2001
From: Henrik Olsson <henrik@fixme.se>
Date: Fri, 16 Oct 2020 08:17:46 +0200
Subject: [PATCH 272/590] noise-suppression-for-voice: init at 2020-10-10
---
maintainers/maintainer-list.nix | 6 +++++
.../noise-suppression-for-voice/default.nix | 26 +++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 ++
3 files changed, 34 insertions(+)
create mode 100644 pkgs/development/libraries/noise-suppression-for-voice/default.nix
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d11e0c0dba2b..bce077b906f1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3425,6 +3425,12 @@
githubId = 2405974;
name = "Sébastian Méric de Bellefon";
};
+ henrikolsson = {
+ email = "henrik@fixme.se";
+ github = "henrikolsson";
+ githubId = 982322;
+ name = "Henrik Olsson";
+ };
henrytill = {
email = "henrytill@gmail.com";
github = "henrytill";
diff --git a/pkgs/development/libraries/noise-suppression-for-voice/default.nix b/pkgs/development/libraries/noise-suppression-for-voice/default.nix
new file mode 100644
index 000000000000..27b77a3bd32e
--- /dev/null
+++ b/pkgs/development/libraries/noise-suppression-for-voice/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+ pname = "noise-suppression-for-voice-unstable";
+ version = "2020-10-10";
+
+ src = fetchFromGitHub {
+ owner = "werman";
+ repo = "noise-suppression-for-voice";
+ rev = "15bac8f34018184d7d4de1b3b2ba98c433705f6c";
+ sha256 = "11pwisbcks7g0mdgcrrv49v3ci1l6m26bbb7f67xz4pr1hai5dwc";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ meta = with stdenv.lib; {
+ description = "A real-time noise suppression plugin for voice";
+ longDescription = ''
+The plugin is meant to suppress a wide range of noise origins (from original paper): computer fans, office, crowd, airplane, car, train, construction.
+ '';
+ homepage = "https://github.com/werman/noise-suppression-for-voice";
+ license = licenses.gpl3;
+ maintainers = [ maintainers.henrikolsson ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 78dd13023808..25a84c5d4b24 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14631,6 +14631,8 @@ in
non = callPackage ../applications/audio/non { };
+ noise-suppression-for-voice = callPackage ../development/libraries/noise-suppression-for-voice { };
+
ntl = callPackage ../development/libraries/ntl { };
nspr = callPackage ../development/libraries/nspr {
From a05f7f73a55fe51ebe7f6b5484fe2d24c78bf8df Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Mon, 26 Oct 2020 14:00:25 -0400
Subject: [PATCH 273/590] pantheon.wingpanel-indicator-bluetooth: 2.1.5 ->
2020-10-01
* Fix device duplicates:
https://github.com/elementary/wingpanel-indicator-bluetooth/pull/116
---
.../desktop/wingpanel-indicators/bluetooth/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
index 51c87d5f34b2..995577b80d06 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-bluetooth";
- version = "2.1.5";
+ version = "unstable-2020-10-01";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
- rev = version;
- sha256 = "sha256-txEjChutJCse/WjgQEfo+MSeeGWdpHUABGCsAqK6i3o=";
+ rev = "2b59d646ea0d66ae45dafc851374f24dcd98c064";
+ sha256 = "sha256-selp70P+7RhbdHF6iiNmcNbMf/c+B9zZ6nlxwRSZGn4=";
};
passthru = {
From c851af868fe48ed9305d115093ca8bea56dffeac Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 26 Oct 2020 16:25:37 -0400
Subject: [PATCH 274/590] docker-edge: Fix test
---
nixos/tests/docker-edge.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nixos/tests/docker-edge.nix b/nixos/tests/docker-edge.nix
index 96de885a554a..703179eef195 100644
--- a/nixos/tests/docker-edge.nix
+++ b/nixos/tests/docker-edge.nix
@@ -43,7 +43,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
docker.fail("sudo -u noprivs docker ps")
docker.succeed("docker stop sleeping")
- # Must match version twice to ensure client and server versions are correct
- docker.succeed('[ $(docker version | grep ${pkgs.docker-edge.version} | wc -l) = "2" ]')
+ # Must match version 4 times to ensure client and server git commits and versions are correct
+ docker.succeed('[ $(docker version | grep ${pkgs.docker-edge.version} | wc -l) = "4" ]')
'';
})
From 40fb3ed6dc4c817e0416ae7c562aa6efff3fe241 Mon Sep 17 00:00:00 2001
From: Masanori Ogino <167209+omasanori@users.noreply.github.com>
Date: Tue, 27 Oct 2020 06:08:21 +0900
Subject: [PATCH 275/590] maxima: remove 5.41.0
It had been kept for SageMath, but it uses the default version nowadays
and this version is not referenced in nixpkgs.
Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
---
.../applications/science/math/maxima/5.41.nix | 102 ------------------
.../math/maxima/known-ecl-failures.patch | 21 ----
2 files changed, 123 deletions(-)
delete mode 100644 pkgs/applications/science/math/maxima/5.41.nix
delete mode 100644 pkgs/applications/science/math/maxima/known-ecl-failures.patch
diff --git a/pkgs/applications/science/math/maxima/5.41.nix b/pkgs/applications/science/math/maxima/5.41.nix
deleted file mode 100644
index 829dffc6116e..000000000000
--- a/pkgs/applications/science/math/maxima/5.41.nix
+++ /dev/null
@@ -1,102 +0,0 @@
-{ stdenv, fetchurl, fetchpatch, sbcl, texinfo, perl, python, makeWrapper, rlwrap ? null
-, tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false
-}:
-
-let
- name = "maxima";
- # old version temporarily kept for sage, see discussion at
- # https://github.com/NixOS/nixpkgs/commit/82254747af35f3e0e0d6f78023ded3a81e25331b
- version = "5.41.0";
-
- searchPath =
- stdenv.lib.makeBinPath
- (stdenv.lib.filter (x: x != null) [ sbcl ecl rlwrap tk gnuplot ]);
-in
-stdenv.mkDerivation ({
- inherit version;
- name = "${name}-${version}";
-
- src = fetchurl {
- url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
- sha256 = "0x0n81z0s4pl8nwpf7ivlsbvsdphm9w42250g7qdkizl0132by6s";
- };
-
- buildInputs = stdenv.lib.filter (x: x != null) [
- sbcl ecl texinfo perl python makeWrapper
- ];
-
- postInstall = ''
- # Make sure that maxima can find its runtime dependencies.
- for prog in "$out/bin/"*; do
- wrapProgram "$prog" --prefix PATH ":" "$out/bin:${searchPath}"
- done
- # Move emacs modules and documentation into the right place.
- mkdir -p $out/share/emacs $out/share/doc
- ln -s ../maxima/${version}/emacs $out/share/emacs/site-lisp
- ln -s ../maxima/${version}/doc $out/share/doc/maxima
- ''
- + (stdenv.lib.optionalString ecl-fasl ''
- cp src/binary-ecl/maxima.fas* "$out/lib/maxima/${version}/binary-ecl/"
- '')
- ;
-
- patches = [
- # fix path to info dir (see https://trac.sagemath.org/ticket/11348)
- (fetchpatch {
- url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/infodir.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
- sha256 = "09v64n60f7i6frzryrj0zd056lvdpms3ajky4f9p6kankhbiv21x";
- })
-
- # fix https://sourceforge.net/p/maxima/bugs/2596/
- (fetchpatch {
- url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/matrixexp.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
- sha256 = "06961hn66rhjijfvyym21h39wk98sfxhp051da6gz0n9byhwc6zg";
- })
-
- # undo https://sourceforge.net/p/maxima/code/ci/f5e9b0f7eb122c4e48ea9df144dd57221e5ea0ca, see see https://trac.sagemath.org/ticket/13364#comment:93
- (fetchpatch {
- url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
- sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx";
- })
-
- # upstream bug https://sourceforge.net/p/maxima/bugs/2520/ (not fixed)
- # introduced in https://trac.sagemath.org/ticket/13364
- (fetchpatch {
- url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/0001-taylor2-Avoid-blowing-the-stack-when-diff-expand-isn.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
- sha256 = "0xa0b6cr458zp7lc7qi0flv5ar0r3ivsqhjl0c3clv86di2y522d";
- })
- ] ++ stdenv.lib.optionals ecl-fasl [
- # build fasl, needed for ECL support
- (fetchpatch {
- url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/maxima.system.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
- sha256 = "18zafig8vflhkr80jq2ivk46k92dkszqlyq8cfmj0b2vcfjwwbar";
- })
- # There are some transient test failures. I hope this disables all those tests.
- # If those test failures ever happen in the non-ecl version, that should be
- # reportetd upstream.
- ./known-ecl-failures.patch
- ];
-
- # Failures in the regression test suite won't abort the build process. We run
- # the suite only so that potential errors show up in the build log. See also:
- # https://sourceforge.net/tracker/?func=detail&aid=3365831&group_id=4933&atid=104933.
- doCheck = true;
-
- enableParallelBuilding = true;
-
- meta = {
- description = "Computer algebra system";
- homepage = "http://maxima.sourceforge.net";
- license = stdenv.lib.licenses.gpl2;
-
- longDescription = ''
- Maxima is a fairly complete computer algebra system written in
- lisp with an emphasis on symbolic computation. It is based on
- DOE-MACSYMA and licensed under the GPL. Its abilities include
- symbolic integration, 3D plotting, and an ODE solver.
- '';
-
- platforms = stdenv.lib.platforms.unix;
- maintainers = [ stdenv.lib.maintainers.peti ];
- };
-})
diff --git a/pkgs/applications/science/math/maxima/known-ecl-failures.patch b/pkgs/applications/science/math/maxima/known-ecl-failures.patch
deleted file mode 100644
index f1d612d993e6..000000000000
--- a/pkgs/applications/science/math/maxima/known-ecl-failures.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/tests/testsuite.lisp b/tests/testsuite.lisp
-index 45a81f4..36c35b8 100644
---- a/tests/testsuite.lisp
-+++ b/tests/testsuite.lisp
-@@ -25,13 +25,14 @@
- ((mlist simp) "rtest10" 24 25)
- ((mlist) "rtest11" #+(or gcl cmucl ccl64) 158 #+(or gcl cmucl ccl64) 174 #+gcl 175)
- "rtest13" "rtest13s"
-- "rtest14"
-+ ;; "rtest14" ;; some tests sometimes fail with ecl, hard to reproduce. Observed failing: 250, 267, 297, 307, 310, 312, 315, 319
- "rtest15"
- ;; ccl versions 1.11 and earlier fail test 50. Mark it as a
- ;; known failure. Presumably 1.12 will have this fixed.
- ((mlist simp) "rtest16" #+ccl 50)
- "rtestode" "rtestode_zp"
-- "rtest3" "rtest8"
-+ "rtest3"
-+ ((mlist simp) "rtest8" 104) ;; fails with ecl
- ((mlist simp) "rtest12" 76 78)
- "rexamples"
- ((mlist simp) "rtesthyp" 105 112 113 123 124 128)
From dc63a0d52575dedcc944d36adec2fdfb63f47ad0 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 26 Oct 2020 23:10:47 +0200
Subject: [PATCH 276/590] sequoia: unmark as broken on Darwin
According to:
https://github.com/NixOS/nixpkgs/pull/101753#issuecomment-716641372
---
pkgs/tools/security/sequoia/default.nix | 1 -
1 file changed, 1 deletion(-)
diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix
index 58899d399fd6..aa2a12fc351e 100644
--- a/pkgs/tools/security/sequoia/default.nix
+++ b/pkgs/tools/security/sequoia/default.nix
@@ -102,6 +102,5 @@ rustPlatform.buildRustPackage rec {
homepage = "https://sequoia-pgp.org/";
license = licenses.gpl3;
maintainers = with maintainers; [ minijackson doronbehar ];
- broken = stdenv.targetPlatform.isDarwin;
};
}
From b3b40bc7d02a8c257997a6d45c79fb55bb4f1a96 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Mon, 26 Oct 2020 22:33:13 +0100
Subject: [PATCH 277/590] springlobby: patch libcurl cmake configuration
---
pkgs/games/spring/springlobby.nix | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index 9912675ee673..39a6243d08ba 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, wxGTK30, openal, pkgconfig, curl, libtorrentRasterbar
+{ stdenv, fetchurl, fetchpatch, cmake, wxGTK30, openal, pkgconfig, curl, libtorrentRasterbar
, libpng, libX11, gettext, boost, libnotify, gtk2, doxygen, spring
, makeWrapper, glib, minizip, alure, pcre, jsoncpp }:
@@ -17,7 +17,14 @@ stdenv.mkDerivation rec {
boost libpng libX11 libnotify gtk2 doxygen makeWrapper glib minizip alure
];
- patches = [ ./revert_58b423e.patch ./fix-certs.patch ]; # Allows springLobby to continue using system installed spring until #707 is fixed
+ patches = [
+ ./revert_58b423e.patch # Allows springLobby to continue using system installed spring until #707 is fixed
+ ./fix-certs.patch
+ (fetchpatch {
+ url = "https://github.com/springlobby/springlobby/commit/252c4cb156c1442ed9b4faec3f26265bc7c295ff.patch";
+ sha256 = "sha256-Nq1F5fRPnCkZwl9KgrfuUmpIMK3hUOyZQYIKElWpmzU=";
+ })
+ ];
enableParallelBuilding = true;
From 8dee03f40dd7e9389be11b68e4c3d4d9bc3c3555 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Mon, 26 Oct 2020 22:33:58 +0100
Subject: [PATCH 278/590] springlobby: move build tools to nativeBuildInputs
---
pkgs/games/spring/springlobby.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index 39a6243d08ba..33dc364c5b70 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
sha256 = "1r1g2hw9ipsmsmzbhsi7bxqra1za6x7j1kw12qzl5psqyq8rqbgs";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ cmake pkgconfig gettext doxygen makeWrapper ];
buildInputs = [
- cmake wxGTK30 openal curl gettext libtorrentRasterbar pcre jsoncpp
- boost libpng libX11 libnotify gtk2 doxygen makeWrapper glib minizip alure
+ wxGTK30 openal curl libtorrentRasterbar pcre jsoncpp
+ boost libpng libX11 libnotify gtk2 glib minizip alure
];
patches = [
From a8d35dc10dc21a5fc6170824984263db8ccdbd31 Mon Sep 17 00:00:00 2001
From: Max Hausch <cheriimoya@googlemail.com>
Date: Mon, 26 Oct 2020 23:57:03 +0100
Subject: [PATCH 279/590] ssw 0.3 -> 0.6
---
pkgs/applications/misc/ssw/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/misc/ssw/default.nix b/pkgs/applications/misc/ssw/default.nix
index 24b7953fe3d2..7e1e40258106 100644
--- a/pkgs/applications/misc/ssw/default.nix
+++ b/pkgs/applications/misc/ssw/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ssw";
- version = "0.3";
+ version = "0.6";
src = fetchurl {
url = "https://alpha.gnu.org/gnu/ssw/spread-sheet-widget-${version}.tar.gz";
- sha256 = "1h93yyh2by6yrmkwqg38nd5knids05k5nqzcihc1hdwgzg3c4b8y";
+ sha256 = "08ck9l697xg8vpya5h07raq837i4pqxjqzx30vhscq4xpps2b8kj";
};
nativeBuildInputs = [ pkg-config ];
From 765b7f33eaacacd90a1992b7e0f6e099914e05d8 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Tue, 27 Oct 2020 00:06:52 +0100
Subject: [PATCH 280/590] electron-cash: 4.1.1 -> 4.2.0
---
pkgs/applications/misc/electron-cash/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index 12362823cc50..fe263dd6692b 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -3,13 +3,13 @@
python3Packages.buildPythonApplication rec {
pname = "electron-cash";
- version = "4.1.1";
+ version = "4.2.0";
src = fetchFromGitHub {
owner = "Electron-Cash";
repo = "Electron-Cash";
rev = version;
- sha256 = "1fllz2s20lg4hrppzmnlgjy9mrq7gaq66l2apb3vz1avzvsjw3gm";
+ sha256 = "0ixsx4224jilc5zis6wbsbxqxv10mm5sksrzq15xp30zz0bzb6md";
};
propagatedBuildInputs = with python3Packages; [
@@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec {
checkPhase = ''
unset HOME
- pytest lib/tests
+ pytest electroncash/tests
'';
postInstall = ''
From eba8f5425f7bf939846cee994f9194f4f215da7e Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 27 Oct 2020 00:10:31 +0100
Subject: [PATCH 281/590] nixos/tests: fix wrong inherit that passes on the
nodes attrs
The hydra tarball step would fail due to the nodes attribute not being
properly inherited. Since we can't execute all the tests and release
steps locally anymore (thanks to the JSONification and faster hydra
eval) these errors will probably keep in appearing.
This is hopefully the last of those introduced by me test runner
refactoring.
Error was seen on hydra (https://hydra.nixos.org/build/129282411):
> unpacking sources
> unpacking source archive /nix/store/bp95x52h6nv3j8apxrryyj2rviw682k1-source
> source root is source
> patching sources
> autoconfPhase
> No bootstrap, bootstrap.sh, configure.in or configure.ac. Assuming this is not an GNU Autotools package.
> configuring
> release name is nixpkgs-21.03pre249116.1088f059401
> git-revision is 1088f059401c43450ed85e4a4ec3f57dc8aa992f
> building
> no Makefile, doing nothing
> running tests
> warning: you did not specify '--add-root'; the result might be removed by the garbage collector
> warning: you did not specify '--add-root'; the result might be removed by the garbage collector
> checking Nixpkgs on i686-linux
> checking Nixpkgs on x86_64-linux
> checking Nixpkgs on x86_64-darwin
> checking eval-release.nix
> trace: `mkStrict' is obsolete; use `mkOverride 0' instead.
> trace: `lib.nixpkgsVersion` is deprecated, use `lib.version` instead!
> trace: warning: lib.readPathsFromFile is deprecated, use a list instead
> trace: Warning: `showVal` is deprecated and will be removed in the next release, please use `traceSeqN`
> trace: lib.zip is deprecated, use lib.zipAttrsWith instead
> checking find-tarballs.nix
> trace: `mkStrict' is obsolete; use `mkOverride 0' instead.
> trace: `lib.nixpkgsVersion` is deprecated, use `lib.version` instead!
> trace: warning: lib.readPathsFromFile is deprecated, use a list instead
> trace: Warning: `showVal` is deprecated and will be removed in the next release, please use `traceSeqN`
> trace: lib.zip is deprecated, use lib.zipAttrsWith instead
> error: while evaluating anonymous function at /build/source/maintainers/scripts/find-tarballs.nix:6:1, called from undefined position:
> while evaluating 'operator' at /build/source/maintainers/scripts/find-tarballs.nix:27:16, called from undefined position:
> while evaluating 'immediateDependenciesOf' at /build/source/maintainers/scripts/find-tarballs.nix:39:29, called from /build/source/maintainers/scripts/find-tarballs.nix:27:44:
> while evaluating anonymous function at /build/source/lib/attrsets.nix:234:10, called from undefined position:
> while evaluating anonymous function at /build/source/maintainers/scripts/find-tarballs.nix:40:37, called from /build/source/lib/attrsets.nix:234:16:
> while evaluating 'derivationsIn' at /build/source/maintainers/scripts/find-tarballs.nix:42:19, called from /build/source/maintainers/scripts/find-tarballs.nix:40:40:
> while evaluating 'canEval' at /build/source/maintainers/scripts/find-tarballs.nix:48:13, called from /build/source/maintainers/scripts/find-tarballs.nix:43:9:
> while evaluating the attribute 'nodes' at /build/source/nixos/lib/testing-python.nix:195:23:
> attribute 'nodes' missing, at /build/source/nixos/lib/testing-python.nix:193:16
> build time elapsed: 0m0.122s 0m0.043s 17m51.526s 0m56.668s
> builder for '/nix/store/96rk3c74vrk6m3snm7n6jhis3j640pn4-nixpkgs-tarball-21.03pre249116.1088f059401.drv' failed with exit code 1
---
nixos/lib/testing-python.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix
index 8dad4d535162..13abfb9a111d 100644
--- a/nixos/lib/testing-python.nix
+++ b/nixos/lib/testing-python.nix
@@ -192,7 +192,7 @@ rec {
else
test // {
inherit test driver driverInteractive;
- inherit (test) nodes;
+ inherit (driver) nodes;
};
runInMachine =
From 6315b008797fe2fd8d8d44a37008bc5cca77576c Mon Sep 17 00:00:00 2001
From: Matt Votava <mvnetbiz@gmail.com>
Date: Sat, 24 Oct 2020 06:12:14 -0700
Subject: [PATCH 282/590] python3Packages.zigpy: 0.22.2 -> 0.26.0, add tests
---
.../python-modules/zigpy/default.nix | 46 ++++++++++++++-----
1 file changed, 35 insertions(+), 11 deletions(-)
diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix
index e85784e51ad4..54f0df340169 100644
--- a/pkgs/development/python-modules/zigpy/default.nix
+++ b/pkgs/development/python-modules/zigpy/default.nix
@@ -1,20 +1,44 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, aiohttp, crccheck, pycryptodome, pycrypto, voluptuous
-, pytest, pytest-asyncio, asynctest }:
+{ lib
+, aiohttp
+, asynctest
+, buildPythonPackage
+, crccheck
+, fetchFromGitHub
+, pycrypto
+, pycryptodome
+, pytest-aiohttp
+, pytest-asyncio
+, pytestCheckHook
+, tox
+, voluptuous }:
buildPythonPackage rec {
pname = "zigpy";
- version = "0.22.2";
+ version = "0.26.0";
- propagatedBuildInputs = [ aiohttp crccheck pycrypto pycryptodome voluptuous ];
- checkInputs = [ pytest pytest-asyncio asynctest ];
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "a43129932c6e4af0d2d57542218faf7695e2424ce18a5a8915d016e1303f5e44";
+ src = fetchFromGitHub {
+ owner = "zigpy";
+ repo = "zigpy";
+ rev = version;
+ sha256 = "ba8Ru6RCbFOHhctFtklnrxVD3uEpxF4XDvO5RMgXPBs=";
};
- meta = with stdenv.lib; {
+ propagatedBuildInputs = [
+ aiohttp
+ crccheck
+ pycrypto
+ pycryptodome
+ voluptuous
+ ];
+
+ checkInputs = [
+ asynctest
+ pytest-aiohttp
+ pytest-asyncio
+ pytestCheckHook
+ ];
+
+ meta = with lib; {
description = "Library implementing a ZigBee stack";
homepage = "https://github.com/zigpy/zigpy";
license = licenses.gpl3Plus;
From 8deec831139db73e247b56a6c744cc0f1f97854d Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 27 Oct 2020 00:00:00 +0000
Subject: [PATCH 283/590] ncspot: 0.2.3 -> 0.2.4
https://github.com/hrkfdn/ncspot/releases/tag/v0.2.4
---
pkgs/applications/audio/ncspot/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix
index 0f65438737be..60fb40c5f743 100644
--- a/pkgs/applications/audio/ncspot/default.nix
+++ b/pkgs/applications/audio/ncspot/default.nix
@@ -14,16 +14,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "ncspot";
- version = "0.2.3";
+ version = "0.2.4";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "v${version}";
- sha256 = "08lxdd6biypxmzfc34cbrpsp9ajb157my4vc51ra5237b7jmy6vk";
+ sha256 = "0vdg1ybzfj7xg8nmrb8q9vr8bpwcs52730v9v0413wjyxb7hcll2";
};
- cargoSha256 = "110mqm1md8x7vjw3hsy4yz8nj38h6mwrr357awchq52inxj3jmbk";
+ cargoSha256 = "0afaxx8dv7jn48934ba0r8kd1h8l3k00sl83v07a1xqmfcmil2qf";
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
From 366bebd53aaf6d2ce453590be9c700f8c78f872b Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 4 Sep 2020 10:16:22 -0700
Subject: [PATCH 284/590] README.md: update stable release links
---
.github/CONTRIBUTING.md | 4 ++--
README.md | 4 ++--
nixos/doc/manual/installation/upgrading.xml | 16 ++++++++--------
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index fd2a6073df6a..8ec9d535332d 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -53,10 +53,10 @@ For package version upgrades and such a one-line commit message is usually suffi
Follow these steps to backport a change into a release branch in compliance with the [commit policy](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches).
1. Take note of the commits in which the change was introduced into `master` branch.
-2. Check out the target _release branch_, e.g. `release-20.03`. Do not use a _channel branch_ like `nixos-20.03` or `nixpkgs-20.03`.
+2. Check out the target _release branch_, e.g. `release-20.09`. Do not use a _channel branch_ like `nixos-20.09` or `nixpkgs-20.09`.
3. Create a branch for your change, e.g. `git checkout -b backport`.
4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe <original commit>` and add a reason. Otherwise use `git cherry-pick -x <original commit>`. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. Please also ensure the commits exists on the master branch; in the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request.
-5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.03`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[20.03]`.
+5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.09`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[20.09]`.
## Reviewing contributions
diff --git a/README.md b/README.md
index d1187b372805..70d50e5efcd6 100644
--- a/README.md
+++ b/README.md
@@ -46,9 +46,9 @@ Nixpkgs and NixOS are built and tested by our continuous integration
system, [Hydra](https://hydra.nixos.org/).
* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
-* [Continuous package builds for the NixOS 20.03 release](https://hydra.nixos.org/jobset/nixos/release-20.03)
+* [Continuous package builds for the NixOS 20.09 release](https://hydra.nixos.org/jobset/nixos/release-20.09)
* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
-* [Tests for the NixOS 20.03 release](https://hydra.nixos.org/job/nixos/release-20.03/tested#tabs-constituents)
+* [Tests for the NixOS 20.09 release](https://hydra.nixos.org/job/nixos/release-20.09/tested#tabs-constituents)
Artifacts successfully built with Hydra are published to cache at
https://cache.nixos.org/. When successful build and test criteria are
diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml
index 08780051d5f6..15ba5db9a37b 100644
--- a/nixos/doc/manual/installation/upgrading.xml
+++ b/nixos/doc/manual/installation/upgrading.xml
@@ -14,7 +14,7 @@
<para>
<emphasis>Stable channels</emphasis>, such as
<literal
- xlink:href="https://nixos.org/channels/nixos-20.03">nixos-20.03</literal>.
+ xlink:href="https://nixos.org/channels/nixos-20.09">nixos-20.09</literal>.
These only get conservative bug fixes and package upgrades. For instance,
a channel update may cause the Linux kernel on your system to be upgraded
from 4.19.34 to 4.19.38 (a minor bug fix), but not from
@@ -38,7 +38,7 @@
<para>
<emphasis>Small channels</emphasis>, such as
<literal
- xlink:href="https://nixos.org/channels/nixos-20.03-small">nixos-20.03-small</literal>
+ xlink:href="https://nixos.org/channels/nixos-20.09-small">nixos-20.09-small</literal>
or
<literal
xlink:href="https://nixos.org/channels/nixos-unstable-small">nixos-unstable-small</literal>.
@@ -63,8 +63,8 @@
<para>
When you first install NixOS, you’re automatically subscribed to the NixOS
channel that corresponds to your installation source. For instance, if you
- installed from a 20.03 ISO, you will be subscribed to the
- <literal>nixos-20.03</literal> channel. To see which NixOS channel you’re
+ installed from a 20.09 ISO, you will be subscribed to the
+ <literal>nixos-20.09</literal> channel. To see which NixOS channel you’re
subscribed to, run the following as root:
<screen>
<prompt># </prompt>nix-channel --list | grep nixos
@@ -75,13 +75,13 @@ nixos https://nixos.org/channels/nixos-unstable
<prompt># </prompt>nix-channel --add https://nixos.org/channels/<replaceable>channel-name</replaceable> nixos
</screen>
(Be sure to include the <literal>nixos</literal> parameter at the end.) For
- instance, to use the NixOS 20.03 stable channel:
+ instance, to use the NixOS 20.09 stable channel:
<screen>
-<prompt># </prompt>nix-channel --add https://nixos.org/channels/nixos-20.03 nixos
+<prompt># </prompt>nix-channel --add https://nixos.org/channels/nixos-20.09 nixos
</screen>
If you have a server, you may want to use the “small” channel instead:
<screen>
-<prompt># </prompt>nix-channel --add https://nixos.org/channels/nixos-20.03-small nixos
+<prompt># </prompt>nix-channel --add https://nixos.org/channels/nixos-20.09-small nixos
</screen>
And if you want to live on the bleeding edge:
<screen>
@@ -132,7 +132,7 @@ nixos https://nixos.org/channels/nixos-unstable
kernel, initrd or kernel modules.
You can also specify a channel explicitly, e.g.
<programlisting>
-<xref linkend="opt-system.autoUpgrade.channel"/> = https://nixos.org/channels/nixos-20.03;
+<xref linkend="opt-system.autoUpgrade.channel"/> = https://nixos.org/channels/nixos-20.09;
</programlisting>
</para>
</section>
From 855a6bb9c1d68bdd4b5beef44b293717c01b25a2 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Mon, 26 Oct 2020 20:11:52 -0400
Subject: [PATCH 285/590] zabbix: 4.0.25 -> 4.0.26
---
pkgs/servers/monitoring/zabbix/versions.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix
index 79d2916c05a9..ec2babe96dda 100644
--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/pkgs/servers/monitoring/zabbix/versions.nix
@@ -5,8 +5,8 @@ generic: {
};
v40 = generic {
- version = "4.0.25";
- sha256 = "1w9k0pw3w0klpzw7ny8igv5a97icv2jl4xicbgyr5464if8sw9ck";
+ version = "4.0.26";
+ sha256 = "0mbk8afkwv208hwyl0zr2l4sib65z7n9ykisznk6pjzb9kdl73s1";
};
v30 = generic {
From 9aa5b53b5a7a1721a75f97af14aff7feb2c34069 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Mon, 26 Oct 2020 20:12:32 -0400
Subject: [PATCH 286/590] zabbix: 5.0.4 -> 5.0.5
---
pkgs/servers/monitoring/zabbix/versions.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix
index ec2babe96dda..a19b2432becd 100644
--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/pkgs/servers/monitoring/zabbix/versions.nix
@@ -1,7 +1,7 @@
generic: {
v50 = generic {
- version = "5.0.4";
- sha256 = "0ivigwqcdfzx58vx5crixjsr4fh8l4bcf1wvnpf6xg46p0zninn1";
+ version = "5.0.5";
+ sha256 = "104jxyaclx92pyas7kqz357da7qjcw44yx3yi7vqlc7h5ch3avgc";
};
v40 = generic {
From b70ab2350ad51c60fe7a3a411e6511224058e2f7 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Mon, 26 Oct 2020 20:33:43 -0400
Subject: [PATCH 287/590] liburing: fix cross-compilation
---
pkgs/development/libraries/liburing/default.nix | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix
index 1839c0ec187c..938846ace54f 100644
--- a/pkgs/development/libraries/liburing/default.nix
+++ b/pkgs/development/libraries/liburing/default.nix
@@ -28,6 +28,9 @@ stdenv.mkDerivation rec {
)
'';
+ # Doesn't recognize platform flags
+ configurePlatforms = [];
+
outputs = [ "out" "bin" "dev" "man" ];
postInstall =
From 3ac1ffe8b22ce0db0a112a9e472aa90f0e946c1f Mon Sep 17 00:00:00 2001
From: Nicolas Berbiche <nicolas@normie.dev>
Date: Mon, 26 Oct 2020 20:52:46 -0400
Subject: [PATCH 288/590] byobu: add support for the screen backend
---
pkgs/development/libraries/newt/default.nix | 12 +++-
pkgs/tools/misc/byobu/default.nix | 65 ++++++++++++++++-----
pkgs/top-level/python-packages.nix | 2 +
3 files changed, 64 insertions(+), 15 deletions(-)
diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix
index 0dade017d08f..41d9671b204e 100644
--- a/pkgs/development/libraries/newt/default.nix
+++ b/pkgs/development/libraries/newt/default.nix
@@ -1,5 +1,8 @@
-{ fetchurl, stdenv, slang, popt }:
+{ lib, fetchurl, stdenv, slang, popt, python }:
+let
+ pythonIncludePath = "${lib.getDev python}/include/python";
+in
stdenv.mkDerivation rec {
pname = "newt";
version = "0.52.21";
@@ -11,9 +14,14 @@ stdenv.mkDerivation rec {
patchPhase = ''
sed -i -e s,/usr/bin/install,install, -e s,-I/usr/include/slang,, Makefile.in po/Makefile
+
+ substituteInPlace configure \
+ --replace "/usr/include/python" "${pythonIncludePath}"
+ substituteInPlace configure.ac \
+ --replace "/usr/include/python" "${pythonIncludePath}"
'';
- buildInputs = [ slang popt ];
+ buildInputs = [ slang popt python ];
NIX_LDFLAGS = "-lncurses";
diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix
index ad17c5edd6ee..695ae54d876e 100644
--- a/pkgs/tools/misc/byobu/default.nix
+++ b/pkgs/tools/misc/byobu/default.nix
@@ -1,5 +1,11 @@
-{ stdenv, fetchurl, python3, perl, textual-window-manager }:
+{ stdenv, fetchurl, makeWrapper
+, ncurses, python3, perl, textual-window-manager
+, gettext, vim, bc, screen }:
+let
+ inherit (stdenv) lib;
+ pythonEnv = python3.withPackages (ps: with ps; [ snack ]);
+in
stdenv.mkDerivation rec {
version = "5.133";
name = "byobu-" + version;
@@ -11,26 +17,59 @@ stdenv.mkDerivation rec {
doCheck = true;
- buildInputs = [ python3 perl ];
- propagatedBuildInputs = [ textual-window-manager ];
+ buildInputs = [ perl makeWrapper gettext ];
+ propagatedBuildInputs = [ textual-window-manager screen ];
- meta = {
+ postPatch = ''
+ substituteInPlace usr/bin/byobu-export.in \
+ --replace "gettext" "${gettext}/bin/gettext"
+ substituteInPlace usr/lib/byobu/menu \
+ --replace "gettext" "${gettext}/bin/gettext"
+ '';
+
+ postInstall = ''
+ # Byobu does not compile its po files for some reason
+ for po in po/*.po; do
+ lang=''${po#po/}
+ lang=''${lang%.po}
+ # Path where byobu looks for translations as observed in the source code and strace
+ mkdir -p $out/share/byobu/po/$lang/LC_MESSAGES/
+ msgfmt $po -o $out/share/byobu/po/$lang/LC_MESSAGES/byobu.mo
+ done
+
+ # Override the symlinks otherwise they mess with the wrapping
+ cp --remove-destination $out/bin/byobu $out/bin/byobu-screen
+ cp --remove-destination $out/bin/byobu $out/bin/byobu-tmux
+
+ for i in $out/bin/byobu*; do
+ # We don't use the usual ".$package-wrapped" because arg0 within the shebang scripts
+ # points to the filename and byobu matches against this to know which backend
+ # to start with
+ file=".$(basename $i)"
+ mv $i $out/bin/$file
+ makeWrapper "$out/bin/$file" "$out/bin/$(basename $i)" --argv0 $(basename $i) \
+ --set BYOBU_PATH ${lib.escapeShellArg (lib.makeBinPath [ vim bc ])} \
+ --set BYOBU_PYTHON "${pythonEnv}/bin/python"
+ done
+ '';
+
+ meta = with stdenv.lib; {
homepage = "https://launchpad.net/byobu/";
description = "Text-based window manager and terminal multiplexer";
longDescription =
- ''Byobu is a GPLv3 open source text-based window manager and terminal multiplexer.
- It was originally designed to provide elegant enhancements to the otherwise functional,
- plain, practical GNU Screen, for the Ubuntu server distribution.
- Byobu now includes an enhanced profiles, convenient keybindings,
- configuration utilities, and toggle-able system status notifications for both
- the GNU Screen window manager and the more modern Tmux terminal multiplexer,
+ ''Byobu is a GPLv3 open source text-based window manager and terminal multiplexer.
+ It was originally designed to provide elegant enhancements to the otherwise functional,
+ plain, practical GNU Screen, for the Ubuntu server distribution.
+ Byobu now includes an enhanced profiles, convenient keybindings,
+ configuration utilities, and toggle-able system status notifications for both
+ the GNU Screen window manager and the more modern Tmux terminal multiplexer,
and works on most Linux, BSD, and Mac distributions.
'';
- license = stdenv.lib.licenses.gpl3;
+ license = licenses.gpl3;
- platforms = stdenv.lib.platforms.unix;
- maintainers = [ stdenv.lib.maintainers.qknight ];
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ qknight berbiche ];
};
}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index aab9f760dbad..8f65c2409995 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6610,6 +6610,8 @@ in {
smugpy = callPackage ../development/python-modules/smugpy { };
+ snack = toPythonModule (pkgs.newt.override { inherit (self) python; });
+
snakebite = callPackage ../development/python-modules/snakebite { };
snakeviz = callPackage ../development/python-modules/snakeviz { };
From 51ca426eb505b9960b20bbc15c50586ca7a2281f Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 26 Oct 2020 18:03:25 -0700
Subject: [PATCH 289/590] release-notes-2009: add contributions section
---
nixos/doc/manual/release-notes/rl-2009.xml | 127 +++++++++++++++++++++
1 file changed, 127 insertions(+)
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 89bdd12adf80..2923df80ea4c 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -1668,4 +1668,131 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0";
</listitem>
</itemizedlist>
</section>
+
+ <section xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ version="5.0"
+ xml:id="sec-release-20.09-contributions">
+ <title>Contributions</title>
+ <para>
+ I, Jonathan Ringer, would like to thank the following individuals for their work on nixpkgs. This release could not be done without the hard work of the NixOS community. There were 31282 contributions across 1313 contributors.
+ </para>
+ <orderedlist>
+ <para>
+ Top contributors to NixOS/Nixpkgs from the 20.03 release to the 20.09 release:
+ </para>
+ <listitem>
+ <para>
+ 2288 Mario Rodas
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ 1837 Frederik Rietdijk
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ 946 Jörg Thalheim
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ 925 Maximilian Bosch
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ 687 Jonathan Ringer
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ 651 Jan Tojnar
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ 622 Daniël de Kok
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ 605 WORLDofPEACE
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ 597 Florian Klink
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ 528 José Romildo Malaquias
+ </para>
+ </listitem>
+ </orderedlist>
+
+ <orderedlist>
+ <para>
+ Top contributors to stabilizing this release (Zero Hydra Failures period):
+ </para>
+ <listitem>
+ <para>
+ 281 volth
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ 101 Robert Scott
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ 86 Tim Steinbach
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ 76 WORLDofPEACE
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ 49 Maximilian Bosch
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ 42 Thomas Tuegel
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ 37 Doron Behar
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ 36 Vladimír Čunát
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ 27 Jonathan Ringer
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ 27 Maciej Krüger
+ </para>
+ </listitem>
+ </orderedlist>
+
+ <para>
+ I, Jonathan Ringer, would also like to personally thank @WORLDofPEACE for their help in mentoring me on the release process. Special thanks also goes to Thomas Tuegel for helping immensely with stabilizing Qt, kde, and Plasma5; I would also like to thank Robert Scott for his numerous fixes and pull request reviews.
+ </para>
+
+ </section>
</section>
From f5d94570f3bb3eb0ec5085bd254c037f8a3e9335 Mon Sep 17 00:00:00 2001
From: Matt Votava <mvnetbiz@gmail.com>
Date: Sat, 24 Oct 2020 06:53:00 -0700
Subject: [PATCH 290/590] python3Packages.zigpy-cc: 0.5.1 -> 0.5.2, add tests
---
.../python-modules/zigpy-cc/default.nix | 46 ++++++++++++++-----
1 file changed, 34 insertions(+), 12 deletions(-)
diff --git a/pkgs/development/python-modules/zigpy-cc/default.nix b/pkgs/development/python-modules/zigpy-cc/default.nix
index 76887e399207..79b9d910053a 100644
--- a/pkgs/development/python-modules/zigpy-cc/default.nix
+++ b/pkgs/development/python-modules/zigpy-cc/default.nix
@@ -1,22 +1,44 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, pyserial, pyserial-asyncio, zigpy
-, asynctest, pytest, pytest-asyncio }:
+{ lib
+, asynctest
+, buildPythonPackage
+, fetchFromGitHub
+, pyserial
+, pyserial-asyncio
+, pytest-asyncio
+, pytestCheckHook
+, pythonOlder
+, zigpy }:
buildPythonPackage rec {
pname = "zigpy-cc";
- version = "0.5.1";
+ version = "0.5.2";
+ # https://github.com/Martiusweb/asynctest/issues/152
+ # broken by upstream python bug with asynctest and
+ # is used exclusively by home-assistant with python 3.8
+ disabled = pythonOlder "3.8";
- propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ];
- checkInputs = [ asynctest pytest pytest-asyncio ];
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "06759615b28c45beaa5f03e594769a373d41674b96aeafefccd5c4e1c67e25ca";
+ src = fetchFromGitHub {
+ owner = "zigpy";
+ repo = "zigpy-cc";
+ rev = version;
+ sha256 = "U3S8tQ3zPlexZDt5GvCd+rOv7CBVeXJJM1NGe7nRl2o=";
};
- meta = with stdenv.lib; {
+ propagatedBuildInputs = [
+ pyserial
+ pyserial-asyncio
+ zigpy
+ ];
+
+ checkInputs = [
+ asynctest
+ pytest-asyncio
+ pytestCheckHook
+ ];
+
+ meta = with lib; {
description = "A library which communicates with Texas Instruments CC2531 radios for zigpy";
- homepage = "http://github.com/sanyatuning/zigpy-cc";
+ homepage = "https://github.com/zigpy/zigpy-cc";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ etu mvnetbiz ];
platforms = platforms.linux;
From 871aee2f91e9089ed38d1b5e0306dca6b4831cab Mon Sep 17 00:00:00 2001
From: Matt Votava <mvnetbiz@gmail.com>
Date: Sat, 24 Oct 2020 06:57:07 -0700
Subject: [PATCH 291/590] python3Packages.zigpy-xbee: 0.12.1 -> 0.13.0, add
tests
---
.../python-modules/zigpy-xbee/default.nix | 44 ++++++++++++++-----
1 file changed, 33 insertions(+), 11 deletions(-)
diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix
index 702666448018..697ae5bb92d3 100644
--- a/pkgs/development/python-modules/zigpy-xbee/default.nix
+++ b/pkgs/development/python-modules/zigpy-xbee/default.nix
@@ -1,20 +1,42 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, pyserial, pyserial-asyncio, zigpy
-, pytest }:
+{ lib
+, asynctest
+, buildPythonPackage
+, fetchFromGitHub
+, pyserial
+, pyserial-asyncio
+, pytest-asyncio
+, pytestCheckHook
+, pythonOlder
+, zigpy }:
buildPythonPackage rec {
pname = "zigpy-xbee";
- version = "0.12.1";
+ version = "0.13.0";
+ # https://github.com/Martiusweb/asynctest/issues/152
+ # broken by upstream python bug with asynctest and
+ # is used exclusively by home-assistant with python 3.8
+ disabled = pythonOlder "3.8";
- buildInputs = [ pyserial pyserial-asyncio zigpy ];
- checkInputs = [ pytest ];
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "09488hl27qjv8shw38iiyzvzwcjkc0k4n00l2bfn1ac443xzw0vh";
+ src = fetchFromGitHub {
+ owner = "zigpy";
+ repo = "zigpy-xbee";
+ rev = version;
+ sha256 = "Krdqb9bYKwUC2cdNppB2+tLwWjzmzIHhXnQ1KRduofU=";
};
- meta = with stdenv.lib; {
+ buildInputs = [
+ pyserial
+ pyserial-asyncio
+ zigpy
+ ];
+
+ checkInputs = [
+ asynctest
+ pytest-asyncio
+ pytestCheckHook
+ ];
+
+ meta = with lib; {
description = "A library which communicates with XBee radios for zigpy";
homepage = "http://github.com/zigpy/zigpy-xbee";
license = licenses.gpl3Plus;
From b9a82c26a3c5674923bca8283e184fd0cbb852ca Mon Sep 17 00:00:00 2001
From: Matt Votava <mvnetbiz@gmail.com>
Date: Sat, 24 Oct 2020 06:59:57 -0700
Subject: [PATCH 292/590] python3Packages.zigpy-zigate: 0.6.1 -> 0.6.2, add
tests
---
.../python-modules/zigpy-zigate/default.nix | 46 ++++++++++++++-----
1 file changed, 34 insertions(+), 12 deletions(-)
diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix
index 43f291841ffc..a906ff4f4195 100644
--- a/pkgs/development/python-modules/zigpy-zigate/default.nix
+++ b/pkgs/development/python-modules/zigpy-zigate/default.nix
@@ -1,22 +1,44 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, pyserial, pyserial-asyncio, zigpy
-, pytest }:
+{ lib
+, asynctest
+, buildPythonPackage
+, fetchFromGitHub
+, pyserial
+, pyserial-asyncio
+, pytest-asyncio
+, pytestCheckHook
+, pythonOlder
+, zigpy }:
buildPythonPackage rec {
pname = "zigpy-zigate";
- version = "0.6.1";
+ version = "0.6.2";
+ # https://github.com/Martiusweb/asynctest/issues/152
+ # broken by upstream python bug with asynctest and
+ # is used exclusively by home-assistant with python 3.8
+ disabled = pythonOlder "3.8";
- buildInputs = [ pyserial pyserial-asyncio zigpy ];
- checkInputs = [ pytest ];
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0xxqv65drrr96b9ncwsx9ayd369lpwimj1jjb0d7j6l9lil0wmf5";
+ src = fetchFromGitHub {
+ owner = "zigpy";
+ repo = "zigpy-zigate";
+ rev = version;
+ sha256 = "EV6DV+BytUcPMtzYVKDnq/Uv2efg3stjL5uVlL62II4=";
};
- meta = with stdenv.lib; {
+ buildInputs = [
+ pyserial
+ pyserial-asyncio
+ zigpy
+ ];
+
+ checkInputs = [
+ asynctest
+ pytest-asyncio
+ pytestCheckHook
+ ];
+
+ meta = with lib; {
description = "A library which communicates with ZiGate radios for zigpy";
- homepage = "http://github.com/doudz/zigpy-zigate";
+ homepage = "https://github.com/zigpy/zigpy-zigate";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ etu mvnetbiz ];
platforms = platforms.linux;
From 760e367b6d449403d7c3ae62dc6c819e7c1313a5 Mon Sep 17 00:00:00 2001
From: Matt Votava <mvnetbiz@gmail.com>
Date: Sat, 24 Oct 2020 07:26:06 -0700
Subject: [PATCH 293/590] python3Packages.zigpy-znp: init at 0.2.2, add tests
---
.../python-modules/zigpy-znp/default.nix | 55 +++++++++++++++++++
pkgs/top-level/python-packages.nix | 2 +
2 files changed, 57 insertions(+)
create mode 100644 pkgs/development/python-modules/zigpy-znp/default.nix
diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix
new file mode 100644
index 000000000000..7a942a213720
--- /dev/null
+++ b/pkgs/development/python-modules/zigpy-znp/default.nix
@@ -0,0 +1,55 @@
+{ stdenv
+, async-timeout
+, asynctest
+, buildPythonPackage
+, coloredlogs
+, coveralls
+, fetchFromGitHub
+, pyserial
+, pyserial-asyncio
+, pytest-asyncio
+, pytest-mock
+, pytest-timeout
+, pytestcov
+, pytestCheckHook
+, voluptuous
+, zigpy }:
+
+buildPythonPackage rec {
+ pname = "zigpy-znp";
+ version = "0.2.2";
+
+ src = fetchFromGitHub {
+ owner = "zha-ng";
+ repo = "zigpy-znp";
+ rev = "v${version}";
+ sha256 = "a98RYPvcYE1NPERmPo1jPwMf86N+0297u4pOKuaB6u4=";
+ };
+
+ propagatedBuildInputs = [
+ async-timeout
+ coloredlogs
+ pyserial
+ pyserial-asyncio
+ voluptuous
+ zigpy
+ ];
+
+ checkInputs = [
+ asynctest
+ coveralls
+ pytest-asyncio
+ pytest-mock
+ pytest-timeout
+ pytestcov
+ pytestCheckHook
+ ];
+
+ meta = with stdenv.lib; {
+ description = "A library for zigpy which communicates with TI ZNP radios";
+ homepage = "https://github.com/zha-ng/zigpy-znp";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ mvnetbiz ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ec3fdac387dd..c9cbe4133e0c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7808,6 +7808,8 @@ in {
zigpy-zigate = callPackage ../development/python-modules/zigpy-zigate { };
+ zigpy-znp = callPackage ../development/python-modules/zigpy-znp { };
+
zimports = callPackage ../development/python-modules/zimports { };
zipfile36 = callPackage ../development/python-modules/zipfile36 { };
From c4e2e9adf81fbcae549d8d96e748c271c5f46de2 Mon Sep 17 00:00:00 2001
From: Matt Votava <mvnetbiz@gmail.com>
Date: Sat, 24 Oct 2020 07:26:36 -0700
Subject: [PATCH 294/590] home-assistant: update component-packages.nix
---
pkgs/servers/home-assistant/component-packages.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index d6f08ffd9188..a55b695b4576 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -36,7 +36,7 @@
"apcupsd" = ps: with ps; [ ]; # missing inputs: apcaccess
"api" = ps: with ps; [ aiohttp-cors ];
"apns" = ps: with ps; [ ]; # missing inputs: apns2
- "apple_tv" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: pyatv
+ "apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv zeroconf ];
"apprise" = ps: with ps; [ apprise ];
"aprs" = ps: with ps; [ ]; # missing inputs: aprslib geopy
"aqualogic" = ps: with ps; [ ]; # missing inputs: aqualogic
@@ -956,7 +956,7 @@
"zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ];
"zerproc" = ps: with ps; [ ]; # missing inputs: pyzerproc
"zestimate" = ps: with ps; [ xmltodict ];
- "zha" = ps: with ps; [ bellows pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy ]; # missing inputs: zigpy-znp
+ "zha" = ps: with ps; [ bellows pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ];
"zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac
"ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl
"zodiac" = ps: with ps; [ ];
From 5a08ab936ba779d8ec043f5e01727e30a9b24af5 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Tue, 27 Oct 2020 03:03:43 -0400
Subject: [PATCH 295/590] rl-2009: release on a Tuesday
Because hydra took it's good old time
---
nixos/doc/manual/release-notes/rl-2009.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 2923df80ea4c..f7a0936ce150 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -3,7 +3,7 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-release-20.09">
- <title>Release 20.09 (“Nightingale”, 2020.10/26)</title>
+ <title>Release 20.09 (“Nightingale”, 2020.10/27)</title>
<para>
Support is planned until the end of April 2021, handing over to 21.03.
From ae61f4f1ccd105e5171c0d41718828251ac578a5 Mon Sep 17 00:00:00 2001
From: Max Hausch <cheriimoya@googlemail.com>
Date: Mon, 26 Oct 2020 22:46:48 +0100
Subject: [PATCH 296/590] Update matio: 1.5.17 -> 1.5.18
---
pkgs/development/libraries/matio/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix
index e12280a088bd..7bcef2b65531 100644
--- a/pkgs/development/libraries/matio/default.nix
+++ b/pkgs/development/libraries/matio/default.nix
@@ -1,9 +1,9 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "matio-1.5.17";
+ name = "matio-1.5.18";
src = fetchurl {
url = "mirror://sourceforge/matio/${name}.tar.gz";
- sha256 = "00644612zhn53j25vj50q73kmjcrsns2lnmy99y2kavhsckmaiay";
+ sha256 = "09gy507zm1gxxyxf5qapzgars51pm16wis7lqqf84kc57ak73baz";
};
meta = with stdenv.lib; {
From 02796d77f8e7357863577583c3da52119b822e92 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Tue, 27 Oct 2020 08:48:19 +0100
Subject: [PATCH 297/590] bind: 9.16.7 -> 9.16.8
https://bind9.readthedocs.io/en/v9_16_8/notes.html#notes-for-bind-9-16-8
---
pkgs/servers/dns/bind/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 2afc5da51f57..16d031d49fea 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -10,11 +10,11 @@ assert enablePython -> python3 != null;
stdenv.mkDerivation rec {
pname = "bind";
- version = "9.16.7";
+ version = "9.16.8";
src = fetchurl {
url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";
- sha256 = "1l8lhgnkj3fnl1101bs3pzj5gv2x5m9ahvrbyscsc9mxxc91hzcz";
+ sha256 = "0ccdbqmpvnxlbrxjsx2w8ir4xh961svzcw7n87n8dglj6rb9r6wy";
};
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
From 3ff7bf9166f14888fdb4d4434578be500be22298 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 15:17:36 +0000
Subject: [PATCH 298/590] gqrx: 2.13 -> 2.13.2
---
pkgs/applications/radio/gqrx/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix
index 413424a5b8b9..786e463686f6 100644
--- a/pkgs/applications/radio/gqrx/default.nix
+++ b/pkgs/applications/radio/gqrx/default.nix
@@ -9,13 +9,13 @@ assert pulseaudioSupport -> libpulseaudio != null;
mkDerivation rec {
pname = "gqrx";
- version = "2.13";
+ version = "2.13.2";
src = fetchFromGitHub {
owner = "csete";
repo = "gqrx";
rev = "v${version}";
- sha256 = "034y8w2cwv35ibqnqb9bdgscsrcp6rr02fgscbfi3gky3n0qddcy";
+ sha256 = "1lcy9gqb1x9fwq550bywj7h66rdacq5893wsax1p7qvqa27d945b";
};
nativeBuildInputs = [ cmake ];
From e84fc8f64ce9f44094cb5fde6c8980d863cb1ec5 Mon Sep 17 00:00:00 2001
From: Timothy Stott <stott.timothy@gmail.com>
Date: Tue, 27 Oct 2020 08:49:45 +0000
Subject: [PATCH 299/590] _1password-gui: add timstott as maintainer
---
pkgs/tools/security/1password-gui/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix
index 7d52311b398e..c3d406ce3aad 100644
--- a/pkgs/tools/security/1password-gui/default.nix
+++ b/pkgs/tools/security/1password-gui/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://1password.com/";
license = licenses.unfree;
- maintainers = with maintainers; [ danieldk ];
+ maintainers = with maintainers; [ danieldk timstott ];
platforms = [ "x86_64-linux" ];
};
}
From f6560368a7218b298db65e1a35be8db894395d1b Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Tue, 27 Oct 2020 12:19:59 +0300
Subject: [PATCH 300/590] cdesktopenv: mark as broken
---
pkgs/desktops/cdesktopenv/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/desktops/cdesktopenv/default.nix b/pkgs/desktops/cdesktopenv/default.nix
index 60ea33ca6ba5..7e6b49957b8e 100644
--- a/pkgs/desktops/cdesktopenv/default.nix
+++ b/pkgs/desktops/cdesktopenv/default.nix
@@ -74,5 +74,6 @@ EOF
license = licenses.lgpl2;
maintainers = [ maintainers.gnidorah ];
platforms = [ "i686-linux" "x86_64-linux" ];
+ broken = true; # not compatible with glibc 2.32
};
}
From d838ef0795f19ca05658296e385763c6c32d2bd0 Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Tue, 27 Oct 2020 11:28:02 +0100
Subject: [PATCH 301/590] sgtpuzzles: 20191114 -> 20200610
---
pkgs/games/sgt-puzzles/default.nix | 4 ++--
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix
index c17439b5e3e8..ba6a3601328f 100644
--- a/pkgs/games/sgt-puzzles/default.nix
+++ b/pkgs/games/sgt-puzzles/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "sgt-puzzles-r${version}";
- version = "20191114.1c0c49d";
+ version = "20200610.9aa7b7c";
src = fetchurl {
url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
- sha256 = "01fi2f3w71bfbgcfr6gxdp5a9cxh4dshbflv83q2j5rxxs2ll870";
+ sha256 = "0rrd1c77ar91zqy4rr4xp1z7x3ywnshlac99cga4hnrgwb7vwl3f";
};
sgt-puzzles-menu = fetchurl {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7997136ffb2a..ee552c9aa1a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25514,7 +25514,7 @@ in
sfrotz = callPackage ../games/sfrotz { };
- sgtpuzzles = callPackage (callPackage ../games/sgt-puzzles) { };
+ sgtpuzzles = callPackage ../games/sgt-puzzles { };
shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { };
From a9f6f7c82d4955ae7519b16e9a0977320bab59e2 Mon Sep 17 00:00:00 2001
From: Scriptkiddi <fritz@otlinghaus.it>
Date: Tue, 27 Oct 2020 11:58:52 +0100
Subject: [PATCH 302/590] amazon-ecs-cli: 1.18.1 -> 1.20.0
---
pkgs/tools/virtualization/amazon-ecs-cli/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
index 19766fb5ba9d..4c37054f4a05 100644
--- a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
+++ b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
@@ -2,18 +2,18 @@
stdenv.mkDerivation rec {
pname = "amazon-ecs-cli";
- version = "1.18.1";
+ version = "1.20.0";
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-v${version}";
- sha256 = "1q0qsvxwz6mgslwzwslddxxv45v9wmlbbkxgyfz3dfkw6n6d1a2s";
+ sha256 = "11cw2hk48x66wlsg5bzay95l2pgncwnawzj4xmqmbchhhvphrvxr";
}
else if stdenv.hostPlatform.system == "x86_64-darwin" then
fetchurl {
url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-darwin-amd64-v${version}";
- sha256 = "0hik88z5xm1pw6a3mxa6zpghdv47s6bg56srxv4azjinzdi59s3b";
+ sha256 = "1f4yq04sgwkj2p0j598a8vc54dzihmqvg9daa6mxnqj403ln0rg1";
}
else throw "Architecture not supported";
From d2cd0230ee2851eff8d84a80ff0fed2d261a6cc3 Mon Sep 17 00:00:00 2001
From: Scriptkiddi <fritz@otlinghaus.it>
Date: Tue, 27 Oct 2020 12:20:51 +0100
Subject: [PATCH 303/590] gif-for-cli: unstable-2018-08-14 -> 1.1.2
---
pkgs/tools/misc/gif-for-cli/default.nix | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pkgs/tools/misc/gif-for-cli/default.nix b/pkgs/tools/misc/gif-for-cli/default.nix
index fed22e518937..52d3e043ce9c 100644
--- a/pkgs/tools/misc/gif-for-cli/default.nix
+++ b/pkgs/tools/misc/gif-for-cli/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchFromGitHub, python3Packages, ffmpeg_3, zlib, libjpeg }:
+{ stdenv, fetchFromGitHub, python3Packages, ffmpeg, zlib, libjpeg }:
python3Packages.buildPythonApplication {
pname = "gif-for-cli";
- version = "unstable-2018-08-14";
+ version = "1.1.2";
src = fetchFromGitHub {
owner = "google";
repo = "gif-for-cli";
- rev = "9696f25fea2e38499b7c248a3151030c3c68bb00";
- sha256 = "1rj8wjfsabn27k1ds7a5fdqgf2r28zpz4lvhbzssjfj1yf0mfh7s";
+ rev = "31f8aa2d617d6d6e941154f60e287c38dd9a74d5";
+ sha256 = "Bl5o492BUAn1KsscnlMIXCzJuy7xWUsdnxIKZKaRM3M=";
};
checkInputs = [ python3Packages.coverage ];
- buildInputs = [ ffmpeg_3 zlib libjpeg ];
- propagatedBuildInputs = with python3Packages; [ pillow requests x256 ];
+ buildInputs = [ zlib libjpeg ];
+ propagatedBuildInputs = with python3Packages; [ ffmpeg pillow requests x256 ];
meta = with stdenv.lib; {
description = "Render gifs as ASCII art in your cli";
From 8bcf0418b6d336aa40559ac2cd9c1ab202a48548 Mon Sep 17 00:00:00 2001
From: Scriptkiddi <fritz@otlinghaus.it>
Date: Tue, 27 Oct 2020 12:41:08 +0100
Subject: [PATCH 304/590] litecli: 1.3.2 -> 1.4.1
---
pkgs/development/tools/database/litecli/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/tools/database/litecli/default.nix b/pkgs/development/tools/database/litecli/default.nix
index 17f7e2c7e492..3d24ac34b3eb 100644
--- a/pkgs/development/tools/database/litecli/default.nix
+++ b/pkgs/development/tools/database/litecli/default.nix
@@ -2,7 +2,7 @@
python3Packages.buildPythonApplication rec {
pname = "litecli";
- version = "1.3.2";
+ version = "1.4.1";
# Python 2 won't have prompt_toolkit 2.x.x
# See: https://github.com/NixOS/nixpkgs/blob/f49e2ad3657dede09dc998a4a98fd5033fb52243/pkgs/top-level/python-packages.nix#L3408
@@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec {
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "0bfx7fw6jnkqxa82xvd10yx1w2wbmrrqxwbh4anp5x9wnl91a9lp";
+ sha256 = "FARWjtbS5zi/XQDyAVImUmArLj8xATz1jZ4jnXFdq1w=";
};
propagatedBuildInputs = with python3Packages; [
From 0dc4ced3ebe71f6c91bfa22540f88cfabeb8bfea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <milan@petabyte.dev>
Date: Mon, 26 Oct 2020 12:28:43 +0100
Subject: [PATCH 305/590] docker: 19.03.12 -> 19.03.13
Added libseccomp and pkgconfig inputs to containerd, because 1.3.x requires them.
However containerd 1.2.x and 1.4.x do not.
---
.../virtualization/docker/default.nix | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 3dbfd8f5bb1c..4d6f53ceb5db 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -29,7 +29,9 @@ rec {
patches = [];
});
- docker-containerd = containerd.overrideAttrs (oldAttrs: {
+ docker-containerd = let
+ withlibseccomp = lib.versionAtLeast version "19.03";
+ in containerd.overrideAttrs (oldAttrs: {
name = "docker-containerd-${version}";
inherit version;
src = fetchFromGitHub {
@@ -38,6 +40,9 @@ rec {
rev = containerdRev;
sha256 = containerdSha256;
};
+ # This should be removed once Docker uses containerd >=1.4
+ nativeBuildInputs = oldAttrs.nativeBuildInputs ++ lib.optional withlibseccomp pkgconfig;
+ buildInputs = oldAttrs.buildInputs ++ lib.optional withlibseccomp libseccomp;
});
docker-tini = tini.overrideAttrs (oldAttrs: {
@@ -210,13 +215,14 @@ rec {
};
docker_19_03 = makeOverridable dockerGen rec {
- version = "19.03.12";
+ version = "19.03.13";
rev = "v${version}";
- sha256 = "0i5xr8q3yjrz5zsjcq63v4g1mzqpingjr1hbf9amk14484i2wkw7";
+ sha256 = "139qqy8jiz1phnngknpa7c1nk9iqwd3hcc9as8x50p1vnycwzr3f";
runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10
runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk";
- containerdRev = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; # v1.2.13
- containerdSha256 = "1rac3iak3jpz57yarxc72bxgxvravwrl0j6s6w2nxrmh2m3kxqzn";
+ # Note: Once all packaged Docker versions use containerd <=1.2 or >=1.4 remove the libseccomp and pkgconfig inputs above
+ containerdRev = "8fba4e9a7d01810a393d5d25a3621dc101981175"; # v1.3.7
+ containerdSha256 = "10zy507ajslizicagb64dvbs7wmw0j4x3hdhygbdh4g2nv3mgjb7";
tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; # v0.18.0
tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn";
};
From 8a1fdce8d3482b60ac13678a8eab838777b51549 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 27 Oct 2020 13:44:13 +0100
Subject: [PATCH 306/590] wshowkeys: Fix the license
The project license is the GPL3 and only portions are MIT licensed.
---
pkgs/tools/wayland/wshowkeys/default.nix | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pkgs/tools/wayland/wshowkeys/default.nix b/pkgs/tools/wayland/wshowkeys/default.nix
index f2519725594c..0db02990c036 100644
--- a/pkgs/tools/wayland/wshowkeys/default.nix
+++ b/pkgs/tools/wayland/wshowkeys/default.nix
@@ -28,7 +28,9 @@ in stdenv.mkDerivation rec {
setuid binary (use "programs.wshowkeys.enable = true;").
'';
homepage = "https://git.sr.ht/~sircmpwn/wshowkeys";
- license = licenses.mit;
+ license = with licenses; [ gpl3Only mit ];
+ # Some portions of the code are taken from Sway which is MIT licensed.
+ # TODO: gpl3Only or gpl3Plus (ask upstream)?
platforms = platforms.unix;
maintainers = with maintainers; [ primeos berbiche ];
};
From 922af1cd2d11715433b58dd06f66dabecd418d17 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Tue, 27 Oct 2020 13:51:04 +0100
Subject: [PATCH 307/590] python3Packages.trezor: make udev rules dependency
linux-only
---
pkgs/development/python-modules/trezor/default.nix | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix
index 0e0c6da021fb..bb85ca6b6f3c 100644
--- a/pkgs/development/python-modules/trezor/default.nix
+++ b/pkgs/development/python-modules/trezor/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
, buildPythonPackage
, fetchPypi
, isPy3k
@@ -49,6 +50,7 @@ buildPythonPackage rec {
rlp
shamir-mnemonic
typing-extensions
+ ] ++ lib.optionals stdenv.isLinux [
trezor-udev-rules
];
From 8cae6703efdf7ddd8b999209de99bfd141abf7b0 Mon Sep 17 00:00:00 2001
From: AmineChikhaoui <amine@chikhaoui.org>
Date: Sun, 25 Oct 2020 21:30:39 -0400
Subject: [PATCH 308/590] ec2-amis: add stable NixOS 20.09 AMIs
Fixes #101694
---
nixos/modules/virtualisation/ec2-amis.nix | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix
index 24de8cf1afbf..4d9c391e0465 100644
--- a/nixos/modules/virtualisation/ec2-amis.nix
+++ b/nixos/modules/virtualisation/ec2-amis.nix
@@ -329,5 +329,24 @@ let self = {
"20.03".ap-east-1.hvm-ebs = "ami-0d18fdd309cdefa86";
"20.03".sa-east-1.hvm-ebs = "ami-09859378158ae971d";
- latest = self."20.03";
+ # 20.09.1465.9a0b14b097d
+ "20.09".eu-west-1.hvm-ebs = "ami-0d90f16418e3c364c";
+ "20.09".eu-west-2.hvm-ebs = "ami-0635ec0780ea57cfe";
+ "20.09".eu-west-3.hvm-ebs = "ami-0714e94352f2eabb9";
+ "20.09".eu-central-1.hvm-ebs = "ami-0979d39762a4d2a02";
+ "20.09".eu-north-1.hvm-ebs = "ami-0b14e273185c66e9b";
+ "20.09".us-east-1.hvm-ebs = "ami-0f8b063ac3f2d9645";
+ "20.09".us-east-2.hvm-ebs = "ami-0959202a0393fdd0c";
+ "20.09".us-west-1.hvm-ebs = "ami-096d50833b785478b";
+ "20.09".us-west-2.hvm-ebs = "ami-0fc31031df0df6104";
+ "20.09".ca-central-1.hvm-ebs = "ami-0787786a38cde3905";
+ "20.09".ap-southeast-1.hvm-ebs = "ami-0b3f693d3a2a0b9ae";
+ "20.09".ap-southeast-2.hvm-ebs = "ami-02471872bc876b610";
+ "20.09".ap-northeast-1.hvm-ebs = "ami-06505fd2bf44a59a7";
+ "20.09".ap-northeast-2.hvm-ebs = "ami-0754b4c014eea1e8a";
+ "20.09".ap-south-1.hvm-ebs = "ami-05100e32242ae65a6";
+ "20.09".ap-east-1.hvm-ebs = "ami-045288859a39de009";
+ "20.09".sa-east-1.hvm-ebs = "ami-0a937748db48fb00d";
+
+ latest = self."20.09";
}; in self
From 2e2eea4338ddf0cdb1bd588420c738f32942267e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 27 Oct 2020 14:48:35 +0100
Subject: [PATCH 309/590] matrix-synapse: 1.21.2 -> 1.22.0
https://github.com/matrix-org/synapse/releases/tag/v1.22.0
---
pkgs/servers/matrix-synapse/default.nix | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index f18c6f83ffc9..4aff60587065 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -9,11 +9,11 @@ let
in
buildPythonApplication rec {
pname = "matrix-synapse";
- version = "1.21.2";
+ version = "1.22.0";
src = fetchPypi {
inherit pname version;
- sha256 = "061b2mpdzqxyks1kj3p7xmw8i4akqfd2s9vb7v8w27k2qpcw7528";
+ sha256 = "0dl4a5zirrjabbfibl9vj4zb16md11kqkz2v9l299gxbwwvzqc39";
};
patches = [
@@ -53,6 +53,7 @@ buildPythonApplication rec {
typing-extensions
authlib
pyjwt
+ hiredis
] ++ lib.optional enableSystemd systemd;
checkInputs = [ mock parameterized openssl ];
From f806d4c79ac243884b9a6fc52cf1731858564c7e Mon Sep 17 00:00:00 2001
From: midchildan <git@midchildan.org>
Date: Sun, 16 Aug 2020 05:08:03 +0900
Subject: [PATCH 310/590] sourcetrail: 2019.3.46 -> 2020.2.43
---
.../development/tools/sourcetrail/default.nix | 250 ++++++++++++++----
.../sourcetrail/disable-failing-tests.patch | 48 ++++
.../tools/sourcetrail/disable-updates.patch | 13 +
pkgs/development/tools/sourcetrail/java.nix | 27 ++
pkgs/development/tools/sourcetrail/jedi.nix | 36 +++
pkgs/development/tools/sourcetrail/parso.nix | 29 ++
pkgs/development/tools/sourcetrail/python.nix | 68 +++++
pkgs/top-level/all-packages.nix | 6 +-
8 files changed, 419 insertions(+), 58 deletions(-)
create mode 100644 pkgs/development/tools/sourcetrail/disable-failing-tests.patch
create mode 100644 pkgs/development/tools/sourcetrail/disable-updates.patch
create mode 100644 pkgs/development/tools/sourcetrail/java.nix
create mode 100644 pkgs/development/tools/sourcetrail/jedi.nix
create mode 100644 pkgs/development/tools/sourcetrail/parso.nix
create mode 100644 pkgs/development/tools/sourcetrail/python.nix
diff --git a/pkgs/development/tools/sourcetrail/default.nix b/pkgs/development/tools/sourcetrail/default.nix
index 9e41f209cfd6..e6b86e4a85c1 100644
--- a/pkgs/development/tools/sourcetrail/default.nix
+++ b/pkgs/development/tools/sourcetrail/default.nix
@@ -1,77 +1,213 @@
-{ stdenv, fetchurl, autoPatchelfHook
-, zlib, expat, dbus, openssl, python3 }:
+{ stdenv, fetchFromGitHub, callPackage, writeScript, cmake, wrapQtAppsHook
+, boost, qt5, llvmPackages, gcc, jdk, pythonPackages, desktop-file-utils
+, shared-mime-info, imagemagick, which, coreutils, maven, fetchpatch }:
+let
+ # TODO: remove when version incompatibility issue with python3Packages.jedi is
+ # resolved
+ parso = pythonPackages.callPackage ./parso.nix {};
+ jedi = pythonPackages.callPackage ./jedi.nix { inherit parso; };
+
+ pythonIndexer = pythonPackages.callPackage ./python.nix { inherit jedi parso; };
+ javaIndexer = callPackage ./java.nix {};
+
+ # Upstream script:
+ # https://github.com/CoatiSoftware/Sourcetrail/blob/master/script/update_java_indexer.sh
+ installJavaIndexer = writeScript "update_java_indexer.sh" ''
+ #!${stdenv.shell}
+
+ cd "$(dirname "$0")/.."
+ dst="$out/opt/sourcetrail/share/data/java/lib"
+
+ mkdir -p "$dst"
+ cp "${javaIndexer}/target/java-indexer-1.0.jar" "$dst/java-indexer.jar"
+ cp -r java_indexer/lib/*.jar "$dst"
+ '';
+
+ # Upstream script:
+ # https://github.com/CoatiSoftware/Sourcetrail/blob/master/script/download_python_indexer.sh
+ installPythonIndexer = writeScript "download_python_indexer.sh" ''
+ #!${stdenv.shell}
+
+ mkdir -p $out/opt/sourcetrail/share/data
+ ln -s "${pythonIndexer}/bin" "$out/opt/sourcetrail/share/data/python"
+ '';
+in
stdenv.mkDerivation rec {
pname = "sourcetrail";
- version = "2019.3.46";
+ version = "2020.2.43";
- src = fetchurl {
- name = "sourtrail.tar.gz";
- url = "https://www.sourcetrail.com/downloads/${version}/linux/64bit";
- sha256 = "0dnkxr3fijcsbn6pd20lyxhr9ns6ji1c4dffly9s16yq4x9ad5r4";
+ src = fetchFromGitHub {
+ owner = "CoatiSoftware";
+ repo = "Sourcetrail";
+ rev = "${version}";
+ sha256 = "0jp9y86xzkcxikc1cn4f6gqgg6zdssck08677ldagw25p1zadvzw";
};
- nativeBuildInputs = [ autoPatchelfHook ];
- buildInputs = [ zlib expat dbus stdenv.cc.cc openssl python3 ];
+ patches = let
+ url = commit: "https://github.com/CoatiSoftware/Sourcetrail/commit/${commit}.patch";
+ in [
+ ./disable-updates.patch
+ ./disable-failing-tests.patch # FIXME: 5 test cases failing due to sandbox
+ # TODO: remove on next release
+ (fetchpatch {
+ name = "fix-filecopy.patch";
+ url = url "d079d1787c9e5cadcf41a003666dc0746cc1cda0";
+ sha256 = "0mixy2a4s16kv2q89k7y4dv21wnv2zd86i4gdwn3xz977y8hf92b";
+ })
+ (fetchpatch {
+ name = "fix-broken-test.patch";
+ url = url "85329174bac8a301733100dc4540258f977e2c5a";
+ sha256 = "17l4417sbmkrgr6v3fbazlmkzl9774zrpjv2n9zwfrz52y30f7b9";
+ })
+ ];
- installPhase = ''
- runHook preInstall
+ nativeBuildInputs = [
+ cmake
+ jdk
+ wrapQtAppsHook
+ desktop-file-utils
+ imagemagick
+ javaIndexer # the resulting jar file is copied by our install script
+ ] ++ stdenv.lib.optionals doCheck testBinPath;
+ buildInputs = [
+ boost pythonIndexer shared-mime-info
+ ] ++ (with qt5; [ qtbase qtsvg ])
+ ++ (with llvmPackages; [ libclang llvm ]);
+ binPath = [ gcc jdk.jre maven which ];
+ testBinPath = binPath ++ [ coreutils ];
- mkdir -p $out/bin $out/opt
+ cmakeFlags = [
+ "-DBoost_USE_STATIC_LIBS=OFF"
+ "-DBUILD_CXX_LANGUAGE_PACKAGE=ON"
+ "-DCMAKE_PREFIX_PATH=${llvmPackages.clang-unwrapped}"
+ "-DBUILD_JAVA_LANGUAGE_PACKAGE=ON"
+ "-DBUILD_PYTHON_LANGUAGE_PACKAGE=ON"
+ ];
- mv -v setup/share $out
- mv -v data/gui/icon/logo_1024_1024.png $out/share/icons/sourcetrail.png
- mv -v data/gui/icon/project_256_256.png $out/share/icons/project-sourcetrail.png
-
- mkdir -p $out/share/sourcetrail/doc
- mv -v README EULA.txt $out/share/sourcetrail/doc
- mv -v plugin $out/share/sourcetrail
-
- cp -rv . $out/opt
-
- rm $out/opt/lib/libssl.so
- rm $out/opt/lib/platforms/{libqeglfs.so,libqwebgl.so}
- ln -s ${openssl}/lib/libssl.so $out/opt/lib/libssl.so
-
- substituteInPlace \
- $out/share/applications/sourcetrail.desktop \
- --replace /usr/bin/ $out/bin/
-
- cat <<EOF > $out/bin/sourcetrail
- #! ${stdenv.shell} -e
-
- # XXX: Sourcetrail somehow copies the initial config files into the home
- # directory without write permissions. We currently just copy them
- # ourselves to work around this problem.
- setup_config() {
- local src dst
-
- [ ! -d ~/.config/sourcetrail ] && mkdir -p ~/.config/sourcetrail
- for src in $out/opt/data/fallback/*; do
- dst=~/.config/sourcetrail/"\$(basename "\$src")"
- if [ ! -e "\$dst" ]; then
- cp -r "\$src" "\$dst"
- fi
- done
-
- chmod -R u+w ~/.config/sourcetrail
- }
-
- [ -d "\$HOME" ] && setup_config
- export PATH="\$PATH:${python3}/bin"
- exec "$out/opt/Sourcetrail.sh" "\$@"
+ postPatch = let
+ major = stdenv.lib.versions.major version;
+ minor = stdenv.lib.versions.minor version;
+ patch = stdenv.lib.versions.patch version;
+ in ''
+ # Upstream script obtains it's version from git:
+ # https://github.com/CoatiSoftware/Sourcetrail/blob/master/cmake/version.cmake
+ cat > cmake/version.cmake <<EOF
+ set(GIT_BRANCH "")
+ set(GIT_COMMIT_HASH "")
+ set(GIT_VERSION_NUMBER "")
+ set(VERSION_YEAR "${major}")
+ set(VERSION_MINOR "${minor}")
+ set(VERSION_COMMIT "${patch}")
+ set(BUILD_TYPE "Release")
+ set(VERSION_STRING "${major}.${minor}.${patch}")
EOF
- chmod +x $out/bin/sourcetrail
+ # Sourcetrail attempts to copy clang headers from the LLVM store path
+ substituteInPlace CMakeLists.txt \
+ --replace "\''${LLVM_BINARY_DIR}" '${llvmPackages.clang-unwrapped}'
- runHook postInstall
+ patchShebangs script
+ ln -sf ${installJavaIndexer} script/update_java_indexer.sh
+ ln -sf ${installPythonIndexer} script/download_python_indexer.sh
'';
+ # Sourcetrail doesn't use the usual cmake install() commands and instead uses
+ # its own bash script for packaging. Since we're not able to reuse the script,
+ # we'll have to roll our own in nixpkgs.
+ #
+ # Sourcetrail currently assumes one of the following two layouts for the
+ # placement of its files:
+ #
+ # AppImage Layout Traditional Layout
+ # ├── bin/ ├── sourcetrail*
+ # │ └── sourcetrail* └── data/
+ # └── share/
+ # └── data/ sourcetrail: application executable
+ # data: contains assets exlusive to Sourcetrail
+ #
+ # The AppImage layout is the one currently used by the upstream project for
+ # packaging its Linux port. We can't use this layout as-is for nixpkgs,
+ # because Sourcetrail treating $out/share/data as its own might lead to
+ # conflicts with other packages when linked into a Nix profile.
+ #
+ # On the other hand, the traditional layout isn't used by the upstream project
+ # anymore so there's a risk that it might become unusable at any time in the
+ # future. Since it's hard to detect these problems at build time, it's not a
+ # good idea to use this layout for packaging in nixpkgs.
+ #
+ # Considering the problems with the above layouts, we go with the third
+ # option, a slight variation of the AppImage layout:
+ #
+ # nixpkgs
+ # ├── bin/
+ # │ └── sourcetrail* (wrapper for opt/sourcetrail/bin/sourcetrail)
+ # └── opt/sourcetrail/
+ # ├── bin/
+ # │ └── sourcetrail*
+ # └── share/
+ # └── data/
+ #
+ # Upstream install script:
+ # https://github.com/CoatiSoftware/Sourcetrail/blob/master/setup/Linux/createPackages.sh
+ installPhase = ''
+ mkdir -p $out/opt/sourcetrail/bin
+ cp app/Sourcetrail $out/opt/sourcetrail/bin/sourcetrail
+ cp app/sourcetrail_indexer $out/opt/sourcetrail/bin/sourcetrail_indexer
+
+ desktop-file-install --dir=$out/share/applications \
+ --set-key Exec --set-value $out/bin/sourcetrail \
+ ../setup/Linux/data/sourcetrail.desktop
+
+ mkdir -p $out/share/mime/packages
+ cp ../setup/Linux/data/sourcetrail-mime.xml $out/share/mime/packages/
+
+ mkdir -p $out/opt/sourcetrail/share
+ cp -R ../bin/app/data $out/opt/sourcetrail/share
+ cp -R ../bin/app/user/projects $out/opt/sourcetrail/share/data/fallback
+ rm $out/opt/sourcetrail/share/data/*_template.xml
+ rm -r $out/opt/sourcetrail/share/data/install
+
+ for size in 48 64 128 256 512; do
+ mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps/
+ convert app/data/gui/icon/logo_1024_1024.png -resize ''${size}x''${size} \
+ $out/share/icons/hicolor/''${size}x''${size}/apps/sourcetrail.png
+ done
+
+ mkdir -p $out/bin
+ makeQtWrapper $out/opt/sourcetrail/bin/sourcetrail $out/bin/sourcetrail \
+ --prefix PATH : ${stdenv.lib.makeBinPath binPath}
+ '';
+
+ checkPhase = ''
+ rm -rf ../bin/app/data/{python,java/lib}
+ ln -s $out/opt/sourcetrail/share/data/python ../bin/app/data/python
+ ln -s $out/opt/sourcetrail/share/data/java/lib ../bin/app/data/java/lib
+
+ pushd test
+ # shorten PATH to prevent build failures
+ wrapQtApp ./Sourcetrail_test \
+ --set PATH "" \
+ --prefix PATH : ${stdenv.lib.makeBinPath testBinPath} \
+ --set MAVEN_OPTS "-Dmaven.repo.local=$TMPDIR/m2repo"
+ ./Sourcetrail_test
+ popd
+
+ rm ../bin/app/data/{python,java/lib}
+ '';
+
+ # This has to be done manually in the installPhase because the actual binary
+ # lives in $out/opt/sourcetrail/bin, which isn't covered by wrapQtAppsHook
+ dontWrapQtApps = true;
+
+ # FIXME: some test cases are disabled in the patch phase
+ doCheck = true;
+
meta = with stdenv.lib; {
homepage = "https://www.sourcetrail.com";
description = "A cross-platform source explorer for C/C++ and Java";
- platforms = [ "x86_64-linux" ];
- license = licenses.unfree;
+ platforms = platforms.all;
+ license = licenses.gpl3;
maintainers = with maintainers; [ midchildan ];
};
}
diff --git a/pkgs/development/tools/sourcetrail/disable-failing-tests.patch b/pkgs/development/tools/sourcetrail/disable-failing-tests.patch
new file mode 100644
index 000000000000..7903642ef585
--- /dev/null
+++ b/pkgs/development/tools/sourcetrail/disable-failing-tests.patch
@@ -0,0 +1,48 @@
+diff --git a/src/test/SourceGroupTestSuite.cpp b/src/test/SourceGroupTestSuite.cpp
+index b5c5562a..d56b83bb 100644
+--- a/src/test/SourceGroupTestSuite.cpp
++++ b/src/test/SourceGroupTestSuite.cpp
+@@ -522,6 +522,7 @@ TEST_CASE("sourcegroup java gradle generates expected output")
+
+ TEST_CASE("sourcegroup java maven generates expected output")
+ {
++ return;
+ std::vector<FilePath> mavenPaths = utility::getMavenExecutablePathDetector()->getPaths();
+
+ REQUIRE(!mavenPaths.empty());
+diff --git a/src/test/UtilityMavenTestSuite.cpp b/src/test/UtilityMavenTestSuite.cpp
+index f48fe2b6..363ef64a 100644
+--- a/src/test/UtilityMavenTestSuite.cpp
++++ b/src/test/UtilityMavenTestSuite.cpp
+@@ -17,6 +17,7 @@ TEST_CASE("maven path detector is working")
+
+ TEST_CASE("maven wrapper detects source directories of simple projects")
+ {
++ return;
+ std::shared_ptr<PathDetector> mavenPathDetector = utility::getMavenExecutablePathDetector();
+ REQUIRE(!mavenPathDetector->getPaths().empty());
+
+@@ -41,6 +42,7 @@ TEST_CASE("maven wrapper detects source directories of simple projects")
+
+ TEST_CASE("maven wrapper detects source and test directories of simple projects")
+ {
++ return;
+ std::shared_ptr<PathDetector> mavenPathDetector = utility::getMavenExecutablePathDetector();
+ REQUIRE(!mavenPathDetector->getPaths().empty());
+
+@@ -65,6 +67,7 @@ TEST_CASE("maven wrapper detects source and test directories of simple projects"
+
+ TEST_CASE("maven wrapper detects source directories of nested modules")
+ {
++ return;
+ std::shared_ptr<PathDetector> mavenPathDetector = utility::getMavenExecutablePathDetector();
+ REQUIRE(!mavenPathDetector->getPaths().empty());
+
+@@ -101,6 +104,7 @@ TEST_CASE("maven wrapper detects source directories of nested modules")
+
+ TEST_CASE("maven wrapper detects source and test directories of nested modules")
+ {
++ return;
+ std::shared_ptr<PathDetector> mavenPathDetector = utility::getMavenExecutablePathDetector();
+ REQUIRE(!mavenPathDetector->getPaths().empty());
+
diff --git a/pkgs/development/tools/sourcetrail/disable-updates.patch b/pkgs/development/tools/sourcetrail/disable-updates.patch
new file mode 100644
index 000000000000..112af857c59e
--- /dev/null
+++ b/pkgs/development/tools/sourcetrail/disable-updates.patch
@@ -0,0 +1,13 @@
+diff --git a/src/lib/settings/ApplicationSettings.cpp b/src/lib/settings/ApplicationSettings.cpp
+index 1be13ccd..db6098e1 100644
+--- a/src/lib/settings/ApplicationSettings.cpp
++++ b/src/lib/settings/ApplicationSettings.cpp
+@@ -593,7 +593,7 @@ void ApplicationSettings::setUserToken(std::string token)
+
+ bool ApplicationSettings::getAutomaticUpdateCheck() const
+ {
+- return getValue<bool>("user/update_check/automatic", true);
++ return false;
+ }
+
+ void ApplicationSettings::setAutomaticUpdateCheck(bool automaticUpdates)
diff --git a/pkgs/development/tools/sourcetrail/java.nix b/pkgs/development/tools/sourcetrail/java.nix
new file mode 100644
index 000000000000..7056dca447f7
--- /dev/null
+++ b/pkgs/development/tools/sourcetrail/java.nix
@@ -0,0 +1,27 @@
+{ pkgs, javaPackages }:
+
+let
+ javaIndexer = javaPackages.mavenbuild {
+ name = "sourcetrail-java-indexer-${pkgs.sourcetrail.version}";
+ src = pkgs.sourcetrail.src;
+ m2Path = "com/sourcetrail/java-indexer";
+
+ # This doesn't include all required dependencies. We still rely on binary
+ # copies of maven packages included in the source repo for building.
+ mavenDeps = with javaPackages; [
+ mavenCompiler_3_2
+ plexusCompilerApi_2_4
+ plexusCompilerJavac_2_4
+ plexusCompilerManager_2_4
+ ];
+
+ meta = {
+ description = "Java indexer for Sourcetrail";
+ };
+ };
+in
+javaIndexer.overrideAttrs (drv: {
+ postUnpack = ''
+ export sourceRoot=''${sourceRoot}/java_indexer
+ '';
+})
diff --git a/pkgs/development/tools/sourcetrail/jedi.nix b/pkgs/development/tools/sourcetrail/jedi.nix
new file mode 100644
index 000000000000..14a40a6e6db4
--- /dev/null
+++ b/pkgs/development/tools/sourcetrail/jedi.nix
@@ -0,0 +1,36 @@
+# Taken from a past commit of nixpkgs
+
+{ stdenv, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }:
+
+buildPythonPackage rec {
+ pname = "jedi";
+
+ # TODO: Remove this package when version incompatibility issue with
+ # python3Packages.jedi is resolved.
+ #
+ # Upstream requirements:
+ # https://github.com/CoatiSoftware/SourcetrailPythonIndexer#requirements
+ version = "0.17.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "86ed7d9b750603e4ba582ea8edc678657fb4007894a12bcf6f4bb97892f31d20";
+ };
+
+ checkInputs = [ pytest glibcLocales tox pytestcov ];
+
+ propagatedBuildInputs = [ parso ];
+
+ checkPhase = ''
+ LC_ALL="en_US.UTF-8" py.test test
+ '';
+
+ # tox required for tests: https://github.com/davidhalter/jedi/issues/808
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/davidhalter/jedi";
+ description = "An autocompletion tool for Python that can be used for text editors";
+ license = licenses.lgpl3Plus;
+ };
+}
diff --git a/pkgs/development/tools/sourcetrail/parso.nix b/pkgs/development/tools/sourcetrail/parso.nix
new file mode 100644
index 000000000000..bd5d5b86ac51
--- /dev/null
+++ b/pkgs/development/tools/sourcetrail/parso.nix
@@ -0,0 +1,29 @@
+# Taken from a past commit of nixpkgs
+
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+}:
+
+buildPythonPackage rec {
+ pname = "parso";
+
+ # TODO: Remove along with ./jedi.nix when version compatiblity issue is
+ # resolved.
+ version = "0.7.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "908e9fae2144a076d72ae4e25539143d40b8e3eafbaeae03c1bfe226f4cdf12c";
+ };
+
+ checkInputs = [ pytest ];
+
+ meta = {
+ description = "A Python Parser";
+ homepage = "https://github.com/davidhalter/parso";
+ license = lib.licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/tools/sourcetrail/python.nix b/pkgs/development/tools/sourcetrail/python.nix
new file mode 100644
index 000000000000..113abb77d61b
--- /dev/null
+++ b/pkgs/development/tools/sourcetrail/python.nix
@@ -0,0 +1,68 @@
+{ stdenv, lib, fetchFromGitHub, wrapPython, python, jedi, parso, cmake, swig }:
+
+stdenv.mkDerivation rec {
+ pname = "SourcetrailPythonIndexer";
+ version = "v1_db25_p5";
+
+ src = fetchFromGitHub {
+ owner = "CoatiSoftware";
+ repo = pname;
+ rev = version;
+ sha256 = "05hlpd3am029pv1wi6mys3q0ggp64axmg8bdf1fabl9cl9jffscq";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [ wrapPython cmake swig ];
+ buildInputs = [ python ];
+ pythonPath = [ jedi parso ];
+
+ dontUseCmakeConfigure = true;
+ cmakeFlags = [
+ "-DBUILD_BINDINGS_PYTHON=1"
+ "-DPYTHON_VERSION=${lib.versions.majorMinor python.version}"
+ ];
+
+ buildPhase = ''
+ pushd SourcetrailDB
+ cmake -Bbuild $cmakeFlags .
+ pushd build
+ make -j $NIX_BUILD_CORES
+ popd
+ popd
+ '';
+
+ checkPhase = ''
+ buildPythonPath "$pythonPath"
+
+ # FIXME: some tests are failing
+ # PYTHONPATH="$program_PYTHONPATH:SourcetrailDB/build/bindings_python" \
+ # ${python}/bin/python test.py
+ PYTHONPATH="$program_PYTHONPATH:SourcetrailDB/build/bindings_python" \
+ ${python}/bin/python test_shallow.py
+ '';
+
+ installPhase = ''
+ shopt -s extglob
+ mkdir -p $out/{bin,libexec}
+
+ cp !(run).py $out/libexec # copy *.py excluding run.py (needs extglob)
+ cat <(echo '#!/usr/bin/env python') run.py > $out/libexec/run.py
+ chmod +x $out/libexec/run.py
+ ln -s $out/libexec/run.py $out/bin/SourcetrailPythonIndexer
+
+ pushd SourcetrailDB/build/bindings_python
+ cp sourcetraildb.py $out/libexec
+ cp _sourcetraildb* $out/libexec/_sourcetraildb.so
+ popd
+
+ wrapPythonProgramsIn "$out/libexec" "$pythonPath"
+ '';
+
+ doCheck = true;
+
+ meta = with lib; {
+ description = "Python indexer for Sourcetrail";
+ homepage = "https://github.com/CoatiSoftware/SourcetrailPythonIndexer";
+ license = licenses.gpl3;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b07bd0db037..180f96d6f5b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23457,7 +23457,11 @@ in
libspotify = callPackage ../development/libraries/libspotify (config.libspotify or {});
- sourcetrail = callPackage ../development/tools/sourcetrail { };
+ sourcetrail = libsForQt5.callPackage ../development/tools/sourcetrail {
+ jdk = jdk8;
+ llvmPackages = llvmPackages_10;
+ pythonPackages = python3Packages;
+ };
spotifywm = callPackage ../applications/audio/spotifywm { };
From 74504e85270c6a803ccd6004b6beea8b1b09a915 Mon Sep 17 00:00:00 2001
From: Jonathan Strickland <djanatyn@gmail.com>
Date: Tue, 20 Oct 2020 23:03:38 -0400
Subject: [PATCH 311/590] maintainers: add djanatyn
---
maintainers/maintainer-list.nix | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c0b1ae06abe5..5b06fe102f6f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1303,10 +1303,12 @@
name = "Vladimir Serov";
keys = [
# compare with https://keybase.io/cab404
- { longkeyid = "1BB96810926F4E715DEF567E6BA7C26C3FDF7BB3";
+ {
+ longkeyid = "1BB96810926F4E715DEF567E6BA7C26C3FDF7BB3";
fingerprint = "rsa3072/0xCBDECF658C38079E";
}
- { longkeyid = "1EBC648C64D6045463013B3EB7EFFC271D55DB8A";
+ {
+ longkeyid = "1EBC648C64D6045463013B3EB7EFFC271D55DB8A";
fingerprint = "ed25519/0xB7EFFC271D55DB8A";
}
];
@@ -1431,10 +1433,12 @@
githubId = 2054509;
name = "Constantine Evans";
keys = [
- { longkeyid = "rsa4096/0xB67DB1D20A93A9F9";
+ {
+ longkeyid = "rsa4096/0xB67DB1D20A93A9F9";
fingerprint = "32B1 6EE7 DBA5 16DE 526E 4C5A B67D B1D2 0A93 A9F9";
}
- { longkeyid = "rsa4096/0x1A1D58B86AE2AABD";
+ {
+ longkeyid = "rsa4096/0x1A1D58B86AE2AABD";
fingerprint = "669C 1D24 5A87 DB34 6BE4 3216 1A1D 58B8 6AE2 AABD";
}
];
@@ -4373,7 +4377,7 @@
name = "Jeff Zellner";
};
kaction = {
- name = "Dmitry Bogatov";
+ name = "Dmitry Bogatov";
email = "KAction@disroot.org";
github = "kaction";
githubId = 44864956;
@@ -7006,7 +7010,7 @@
purcell = {
email = "steve@sanityinc.com";
github = "purcell";
- githubId = 5636;
+ githubId = 5636;
name = "Steve Purcell";
};
puzzlewolf = {
@@ -7275,10 +7279,12 @@
github = "rissson";
githubId = 18313093;
keys = [
- { longkeyid = "rsa4096/0xF6FD87B15C263EC9";
+ {
+ longkeyid = "rsa4096/0xF6FD87B15C263EC9";
fingerprint = "8A0E 6A7C 08AB B9DE 67DE 2A13 F6FD 87B1 5C26 3EC9";
}
- { longkeyid = "ed25519/0xBBB7A6801DF1E03F";
+ {
+ longkeyid = "ed25519/0xBBB7A6801DF1E03F";
fingerprint = "C0A7 A9BB 115B C857 4D75 EA99 BBB7 A680 1DF1 E03F";
}
];
@@ -9749,7 +9755,7 @@
name = "Asad Saeeduddin";
};
ngerstle = {
- name = "Nicholas Gerstle";
+ name = "Nicholas Gerstle";
email = "ngerstle@gmail.com";
github = "ngerstle";
githubId = 1023752;
From c84ddc7bf448039a12757cb5cb18296662ab2ed3 Mon Sep 17 00:00:00 2001
From: Jonathan Strickland <djanatyn@gmail.com>
Date: Tue, 20 Oct 2020 21:56:08 -0400
Subject: [PATCH 312/590] peaclock: init at 0.4.3
Co-authored-by: r-burns <52847440+r-burns@users.noreply.github.com>
---
pkgs/applications/misc/peaclock/default.nix | 24 +++++++++++++++++++++
pkgs/top-level/all-packages.nix | 4 ++++
2 files changed, 28 insertions(+)
create mode 100644 pkgs/applications/misc/peaclock/default.nix
diff --git a/pkgs/applications/misc/peaclock/default.nix b/pkgs/applications/misc/peaclock/default.nix
new file mode 100644
index 000000000000..e824bbaf583b
--- /dev/null
+++ b/pkgs/applications/misc/peaclock/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, cmake, libpthreadstubs, icu }:
+
+stdenv.mkDerivation rec {
+ pname = "peaclock";
+ version = "0.4.3";
+
+ src = fetchFromGitHub {
+ owner = "octobanana";
+ repo = pname;
+ rev = version;
+ sha256 = "1582vgslhpgbvcd7ipgf1d1razrvgpq1f93q069yr2bbk6xn8i16";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ libpthreadstubs icu ];
+
+ meta = with stdenv.lib; {
+ description = "A clock, timer, and stopwatch for the terminal";
+ homepage = "https://octobanana.com/software/peaclock";
+ license = licenses.mit;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ djanatyn ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7997136ffb2a..0d369617ec76 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22755,6 +22755,10 @@ in
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav;
};
+ peaclock = callPackage ../applications/misc/peaclock {
+ stdenv = gccStdenv;
+ };
+
peek = callPackage ../applications/video/peek { };
pflask = callPackage ../os-specific/linux/pflask {};
From f2eb36b889019ed473f6b07f43f5d5e85339741e Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 27 Oct 2020 23:23:13 +1000
Subject: [PATCH 313/590] gitAndTools.gh: 1.1.0 -> 1.2.0
https://github.com/cli/cli/releases/tag/v1.2.0
---
.../version-management/git-and-tools/gh/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix
index e59ca6ac8999..4fe805f752ce 100644
--- a/pkgs/applications/version-management/git-and-tools/gh/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gh";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
- sha256 = "1jf1y6135p30dlr42fnl0w7782fczizq8yya4bsd6xf66bcq0zzn";
+ sha256 = "17hbgi1jh4p07r4p5mr7w7p01i6zzr28mn5i4jaki7p0jwfqbvvi";
};
- vendorSha256 = "12ka5x5m4h8dfpcdhfjc5lz6bm8pzfqkbhs9j3a8w08xsi93dvdz";
+ vendorSha256 = "0ybbwbw4vdsxdq4w75s1i0dqad844sfgs69b3vlscwfm6g3i9h51";
nativeBuildInputs = [ installShellFiles ];
From e140227fe359324fee6c0215392d0b8206779bca Mon Sep 17 00:00:00 2001
From: "Aaron L. Zeng" <me@bcc32.com>
Date: Tue, 20 Oct 2020 02:37:46 -0400
Subject: [PATCH 314/590] ocamlPackages.sexp: init at 0.13
---
.../ocaml-modules/janestreet/0.13.nix | 45 +++++++++++++++++++
.../ocaml-modules/janestreet/sexp.patch | 30 +++++++++++++
2 files changed, 75 insertions(+)
create mode 100644 pkgs/development/ocaml-modules/janestreet/sexp.patch
diff --git a/pkgs/development/ocaml-modules/janestreet/0.13.nix b/pkgs/development/ocaml-modules/janestreet/0.13.nix
index 175651f69605..3bea83f0d2bd 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.13.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.13.nix
@@ -498,6 +498,51 @@ rec {
meta.description = "Process library and s-expression based shell";
};
+ csvfields = janePackage {
+ pname = "csvfields";
+ hash = "19pnq9m9lkdgqfy9l21w779d6c8djr1dvvjq7r9kbgfwb04symmr";
+ propagatedBuildInputs = [ core expect_test_helpers ];
+ meta.description = "Runtime support for ppx_xml_conv and ppx_csv_conv";
+ };
+
+ sexp_diff_kernel = janePackage {
+ pname = "sexp_diff_kernel";
+ hash = "125gssd24vfcfbkpjlqbxijlc4jyw2n0wv1cnddcfvpn1f7cghzb";
+ propagatedBuildInputs = [ core_kernel ];
+ meta.description = "Code for computing the diff of two sexps";
+ };
+
+ sexp_macro = janePackage {
+ pname = "sexp_macro";
+ hash = "1rqs2r2ihwsqzgnqsdr0db6dqzz4q6s9hi1hvnwf0cb2vnkhsjln";
+ propagatedBuildInputs = [ async sexplib ];
+ meta.description = "Sexp macros";
+ };
+
+ sexp_select = janePackage {
+ pname = "sexp_select";
+ hash = "02yckmin937scqs2i45r2qqp56rqa6j2q04nfhnnxvn3bkb0qnb1";
+ propagatedBuildInputs = [ base ppx_jane ];
+ meta.description = "A library to use CSS-style selectors to traverse sexp trees";
+ };
+
+ sexp = janePackage {
+ pname = "sexp";
+ hash = "0cqp6syc4ap2nxgg1mvwwz2pmib48kp3gigzpjwh20wr38qq0p1r";
+ propagatedBuildInputs = [
+ async
+ core
+ csvfields
+ re2
+ sexp_diff_kernel
+ sexp_macro
+ sexp_pretty
+ sexp_select
+ ];
+ patches = ./sexp.patch;
+ meta.description = "S-expression swiss knife";
+ };
+
### Packages at version 0.11, with dependencies at version 0.12
configurator = janePackage {
diff --git a/pkgs/development/ocaml-modules/janestreet/sexp.patch b/pkgs/development/ocaml-modules/janestreet/sexp.patch
new file mode 100644
index 000000000000..e56ce6508db1
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/sexp.patch
@@ -0,0 +1,30 @@
+diff --git a/lazy_list/src/dune b/lazy_list/src/dune
+index f1650ad..df90914 100644
+--- a/lazy_list/src/dune
++++ b/lazy_list/src/dune
+@@ -1,2 +1,3 @@
+ (library (name lazy_list) (libraries core_kernel)
++ (public_name sexp.lazy_list)
+ (preprocess (pps ppx_jane)))
+\ No newline at end of file
+diff --git a/sexp_app/pattern/dune b/sexp_app/pattern/dune
+index b7d2c3b..baf136b 100644
+--- a/sexp_app/pattern/dune
++++ b/sexp_app/pattern/dune
+@@ -1,4 +1,5 @@
+ (library (name sexp_app_pattern) (libraries core re2 sexplib str)
++ (public_name sexp.sexp_app_pattern)
+ (preprocess (pps ppx_jane)))
+
+ (ocamllex lexer)
+diff --git a/sexp_app/src/dune b/sexp_app/src/dune
+index b91ff40..a07a4e7 100644
+--- a/sexp_app/src/dune
++++ b/sexp_app/src/dune
+@@ -1,4 +1,5 @@
+ (library (name sexp_app) (libraries core lazy_list re2 sexplib str)
++ (public_name sexp.sexp_app)
+ (preprocess (pps ppx_jane -allow-unannotated-ignores)))
+
+ (ocamllex csv_lexeme)
+\ No newline at end of file
From d240c4e1d1d92b9b4b0a9ab56b5ffdce64212fdb Mon Sep 17 00:00:00 2001
From: "Aaron L. Zeng" <me@bcc32.com>
Date: Tue, 20 Oct 2020 02:48:38 -0400
Subject: [PATCH 315/590] ocamlPackages.bignum: init at 0.13
---
pkgs/development/ocaml-modules/janestreet/0.13.nix | 14 ++++++++++++++
pkgs/top-level/ocaml-packages.nix | 2 +-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/ocaml-modules/janestreet/0.13.nix b/pkgs/development/ocaml-modules/janestreet/0.13.nix
index 3bea83f0d2bd..4266b499d17c 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.13.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.13.nix
@@ -6,6 +6,7 @@
, ppxlib
, re
, openssl
+, zarith
}:
rec {
@@ -543,6 +544,19 @@ rec {
meta.description = "S-expression swiss knife";
};
+ zarith_stubs_js = janePackage {
+ pname = "zarith_stubs_js";
+ hash = "0dldnf85rfyx8z63qjly9n8plj8nnkw4i5zrj5vbm7s2wjcfjzj1";
+ meta.description = "Javascripts stubs for the Zarith library";
+ };
+
+ bignum = janePackage {
+ pname = "bignum";
+ hash = "0qldyl5mhlffnyps7n9y8qykm0ylrdiw5ii8zlww82zmmpp8zv5x";
+ propagatedBuildInputs = [ core_kernel zarith zarith_stubs_js ];
+ meta.description = "Core-flavoured wrapper around zarith's arbitrary-precision rationals";
+ };
+
### Packages at version 0.11, with dependencies at version 0.12
configurator = janePackage {
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 250329573056..9b0dff7c70e3 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1029,7 +1029,7 @@ let
janeStreet =
if lib.versionOlder "4.08" ocaml.version
then import ../development/ocaml-modules/janestreet/0.13.nix {
- inherit ctypes dune-configurator janePackage num octavius ppxlib re;
+ inherit ctypes dune-configurator janePackage num octavius ppxlib re zarith;
inherit (pkgs) openssl;
}
else if lib.versionOlder "4.07" ocaml.version
From 30ea1f1288f1dfe4c3580bc38435d7588c83833c Mon Sep 17 00:00:00 2001
From: "Aaron L. Zeng" <me@bcc32.com>
Date: Mon, 25 May 2020 14:40:28 -0400
Subject: [PATCH 316/590] ocamlPackages.delimited_parsing: init at 0.13
---
pkgs/development/ocaml-modules/janestreet/0.13.nix | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/pkgs/development/ocaml-modules/janestreet/0.13.nix b/pkgs/development/ocaml-modules/janestreet/0.13.nix
index 4266b499d17c..9ab45aa5b30d 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.13.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.13.nix
@@ -557,6 +557,13 @@ rec {
meta.description = "Core-flavoured wrapper around zarith's arbitrary-precision rationals";
};
+ delimited_parsing = janePackage {
+ pname = "delimited_parsing";
+ hash = "0siz746q28241wk0sv435lfvvips7sl151z5a1sbqanr3lm4s17w";
+ propagatedBuildInputs = [ async core_extended ];
+ meta.description = "Parsing of character (e.g., comma) separated and fixed-width values";
+ };
+
### Packages at version 0.11, with dependencies at version 0.12
configurator = janePackage {
From db236e588de4058d40b157936059835c378c2a3e Mon Sep 17 00:00:00 2001
From: Klemens Nanni <klemens@posteo.de>
Date: Tue, 27 Oct 2020 16:12:02 +0100
Subject: [PATCH 317/590] steam: Do $PATH lookup in steam.desktop instead of
hardcoding derivation
The desktop application and the absoloute path work fine.
But consider desktop environments such as KDE where, in the application
menu, one can right click entries and pin them to widgets/panels, add
them to the desktop, etc.
Doing so effectively means copying
/run/current-system/sw/share/applications/steam.desktop to
~/.local/share/plasma_icons/ or ~/Desktop/, i.e. managed stated gets
duplicated outside the nix scope.
The problem here is that steam.desktop hardcodes
Exec=/nix/store/<derivation hash>-steam/bin/steam %U
this means such copies will point at wrong/outdated derivations once
the steam package changes, i.e. widgets/panels/desktop icons will no
longer work and must be recreated.
Therefore replace the absoloute path with a $PATH lookup to allow "safe"
copying; this isn't optimal but other applications such Firefox and
Thunderbrid currently behave the same way ($PATH lookup in their
.desktop file).
---
pkgs/games/steam/fhsenv.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix
index 32acef9757be..ecd318e64c66 100644
--- a/pkgs/games/steam/fhsenv.nix
+++ b/pkgs/games/steam/fhsenv.nix
@@ -223,7 +223,7 @@ in buildFHSUserEnv rec {
mkdir -p $out/share/applications
ln -s ${steam}/share/icons $out/share
ln -s ${steam}/share/pixmaps $out/share
- sed "s,/usr/bin/steam,$out/bin/steam,g" ${steam}/share/applications/steam.desktop > $out/share/applications/steam.desktop
+ sed "s,/usr/bin/steam,steam,g" ${steam}/share/applications/steam.desktop > $out/share/applications/steam.desktop
'';
profile = ''
From 1a50aad173fb52f4e20d300a77c445ab8d131887 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 27 Oct 2020 11:58:49 -0400
Subject: [PATCH 318/590] oh-my-zsh: 2020-10-18 -> 2020-10-27
---
pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index d02e6267940a..0f34b08785d0 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,15 +4,15 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- version = "2020-10-18";
+ version = "2020-10-27";
pname = "oh-my-zsh";
- rev = "7525b1d533b927bc40e3cfb29e399e5f2e0828d4";
+ rev = "d05544562532fdf4d5f4a4d4eba01f4263e17cc7";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
- sha256 = "1a92k8yv7zs830z33v9f4aqq1cv2gmvib1x05vb0kzynwv7p3gmd";
+ sha256 = "1mzbic14ilka454dyv6ksxpchmswqn7w4d7sa9067ikh1kjb7s86";
};
installPhase = ''
From c54308d27c76155b9c4c9baf2a6ba031f03d1e90 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 27 Oct 2020 17:05:35 +0100
Subject: [PATCH 319/590] Disable the metrics job
We currently don't have a machine to build this job
(https://github.com/NixOS/nixos-org-configurations/issues/127) which
delays channel updates until hydra-queue-runner auto-cancels the job.
---
pkgs/top-level/release.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 5fc6e91b3118..eacd2f5904ca 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -30,7 +30,7 @@ let
jobs =
{ tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; };
- metrics = import ./metrics.nix { inherit pkgs nixpkgs; };
+ #metrics = import ./metrics.nix { inherit pkgs nixpkgs; };
manual = import ../../doc { inherit pkgs nixpkgs; };
lib-tests = import ../../lib/tests/release.nix { inherit pkgs; };
From db74029e3e9b884731f0753f605e2d838b70afb0 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Mon, 26 Oct 2020 11:08:40 +0700
Subject: [PATCH 320/590] treewide: remove package names from prefix of
descriptions
---
pkgs/applications/audio/ecasound/default.nix | 2 +-
pkgs/applications/audio/eflite/default.nix | 2 +-
pkgs/applications/audio/picoloop/default.nix | 2 +-
pkgs/applications/blockchains/sumokoin.nix | 2 +-
pkgs/applications/editors/kile/default.nix | 2 +-
pkgs/applications/graphics/gnuclad/default.nix | 2 +-
pkgs/applications/graphics/lightburn/default.nix | 2 +-
pkgs/applications/kde/bomber.nix | 2 +-
pkgs/applications/kde/granatier.nix | 2 +-
pkgs/applications/kde/kalzium.nix | 2 +-
pkgs/applications/kde/kapman.nix | 2 +-
pkgs/applications/kde/katomic.nix | 2 +-
pkgs/applications/kde/kblackbox.nix | 2 +-
pkgs/applications/kde/kblocks.nix | 2 +-
pkgs/applications/kde/kbounce.nix | 2 +-
pkgs/applications/kde/kdiamond.nix | 2 +-
pkgs/applications/kde/kfloppy.nix | 2 +-
pkgs/applications/kde/klettres.nix | 2 +-
pkgs/applications/kde/klines.nix | 2 +-
pkgs/applications/kde/kmag.nix | 2 +-
pkgs/applications/kde/kmines.nix | 2 +-
pkgs/applications/kde/knetwalk.nix | 2 +-
pkgs/applications/kde/knights.nix | 2 +-
pkgs/applications/kde/kollision.nix | 2 +-
pkgs/applications/kde/kreversi.nix | 2 +-
pkgs/applications/kde/kshisen.nix | 2 +-
pkgs/applications/kde/ksquares.nix | 2 +-
pkgs/applications/kde/kteatime.nix | 2 +-
pkgs/applications/kde/ktimer.nix | 2 +-
pkgs/applications/kde/kturtle.nix | 2 +-
pkgs/applications/kde/kwave.nix | 2 +-
pkgs/applications/misc/dockbarx/default.nix | 2 +-
pkgs/applications/misc/fsv/default.nix | 4 ++--
pkgs/applications/misc/grsync/default.nix | 2 +-
pkgs/applications/misc/icesl/default.nix | 2 +-
pkgs/applications/misc/libosmocore/default.nix | 2 +-
pkgs/applications/misc/mapproxy/default.nix | 2 +-
pkgs/applications/misc/obsidian/default.nix | 2 +-
pkgs/applications/misc/rsibreak/default.nix | 2 +-
pkgs/applications/misc/xmenu/default.nix | 2 +-
pkgs/applications/networking/cluster/jx/default.nix | 2 +-
pkgs/applications/networking/cluster/prow/default.nix | 2 +-
.../networking/instant-messengers/ferdi/default.nix | 2 +-
.../networking/instant-messengers/psi/default.nix | 2 +-
pkgs/applications/networking/mailreaders/aerc/default.nix | 2 +-
pkgs/applications/science/biology/dcm2niix/default.nix | 2 +-
pkgs/applications/science/biology/kallisto/default.nix | 2 +-
pkgs/applications/science/logic/coq2html/default.nix | 4 ++--
pkgs/applications/science/logic/ott/default.nix | 2 +-
.../science/machine-learning/labelimg/default.nix | 2 +-
pkgs/applications/science/math/bliss/default.nix | 2 +-
pkgs/applications/science/misc/openmodelica/default.nix | 2 +-
pkgs/applications/science/programming/scyther/default.nix | 2 +-
pkgs/applications/video/mjpg-streamer/default.nix | 2 +-
pkgs/applications/video/mkclean/default.nix | 2 +-
pkgs/applications/window-managers/leftwm/default.nix | 2 +-
pkgs/data/fonts/merriweather/default.nix | 2 +-
pkgs/desktops/lxde/core/lxrandr/default.nix | 2 +-
pkgs/development/compilers/fpc/lazarus.nix | 2 +-
pkgs/development/compilers/stalin/default.nix | 2 +-
pkgs/development/libraries/belr/default.nix | 2 +-
pkgs/development/libraries/bzrtp/default.nix | 2 +-
pkgs/development/libraries/duckdb/default.nix | 2 +-
pkgs/development/libraries/libstroke/default.nix | 2 +-
pkgs/development/libraries/libthreadar/default.nix | 3 ++-
pkgs/development/libraries/martyr/default.nix | 2 +-
pkgs/development/libraries/physics/qcdnum/default.nix | 2 +-
pkgs/development/libraries/pupnp/default.nix | 2 +-
pkgs/development/libraries/science/math/parmetis/default.nix | 2 +-
pkgs/development/libraries/sope/default.nix | 2 +-
pkgs/development/libraries/symengine/default.nix | 2 +-
pkgs/development/mobile/cocoapods/default.nix | 2 +-
pkgs/development/python-modules/buildbot/default.nix | 2 +-
pkgs/development/python-modules/docutils/default.nix | 2 +-
pkgs/development/python-modules/xdot/default.nix | 2 +-
pkgs/development/tools/analysis/coz/default.nix | 2 +-
pkgs/development/tools/analysis/pev/default.nix | 2 +-
pkgs/development/tools/build-managers/bloop/default.nix | 2 +-
pkgs/development/tools/deadcode/default.nix | 2 +-
pkgs/development/tools/errcheck/default.nix | 2 +-
pkgs/development/tools/impl/default.nix | 2 +-
pkgs/development/tools/jbake/default.nix | 2 +-
pkgs/development/tools/minizinc/default.nix | 2 +-
pkgs/development/tools/misc/cli11/default.nix | 2 +-
pkgs/development/tools/misc/swig/3.x.nix | 2 +-
pkgs/development/tools/nsis/default.nix | 2 +-
pkgs/development/tools/omniorb/default.nix | 2 +-
pkgs/development/tools/pgloader/default.nix | 2 +-
pkgs/development/tools/reftools/default.nix | 2 +-
pkgs/development/tools/xqilla/default.nix | 2 +-
pkgs/development/web/newman/default.nix | 2 +-
pkgs/games/chessx/default.nix | 2 +-
pkgs/games/lugaru/default.nix | 2 +-
pkgs/games/megaglest/default.nix | 2 +-
pkgs/games/pacvim/default.nix | 2 +-
pkgs/misc/frescobaldi/default.nix | 4 ++--
pkgs/misc/screensavers/betterlockscreen/default.nix | 2 +-
pkgs/os-specific/linux/cpuset/default.nix | 2 +-
pkgs/servers/hitch/default.nix | 2 +-
pkgs/servers/monitoring/longview/default.nix | 2 +-
pkgs/servers/news/leafnode/default.nix | 2 +-
pkgs/servers/openbgpd/default.nix | 2 +-
pkgs/servers/sql/postgresql/ext/pg_similarity.nix | 3 ++-
pkgs/servers/sql/postgresql/ext/pgtap.nix | 2 +-
pkgs/servers/web-apps/jirafeau/default.nix | 2 +-
pkgs/servers/web-apps/sogo/default.nix | 2 +-
pkgs/shells/es/default.nix | 2 +-
pkgs/tools/X11/x11spice/default.nix | 5 +----
pkgs/tools/admin/oxidized/default.nix | 2 +-
pkgs/tools/backup/dirvish/default.nix | 2 +-
pkgs/tools/compression/xz/default.nix | 2 +-
pkgs/tools/filesystems/httpfs/default.nix | 2 +-
pkgs/tools/graphics/optar/default.nix | 2 +-
pkgs/tools/misc/logstash/6.x.nix | 2 +-
pkgs/tools/misc/shallot/default.nix | 2 +-
pkgs/tools/misc/wootility/default.nix | 2 +-
pkgs/tools/networking/bukubrow/default.nix | 2 +-
pkgs/tools/networking/corerad/default.nix | 2 +-
pkgs/tools/networking/curlie/default.nix | 2 +-
pkgs/tools/networking/dnstracer/default.nix | 2 +-
pkgs/tools/networking/driftnet/default.nix | 2 +-
pkgs/tools/networking/goreplay/default.nix | 2 +-
pkgs/tools/networking/maxscale/default.nix | 2 +-
pkgs/tools/networking/ngrok-2/default.nix | 5 +----
pkgs/tools/networking/pmacct/default.nix | 2 +-
pkgs/tools/networking/ssldump/default.nix | 2 +-
pkgs/tools/package-management/morph/default.nix | 2 +-
pkgs/tools/security/acsccid/default.nix | 2 +-
pkgs/tools/security/fpm2/default.nix | 2 +-
pkgs/tools/security/notary/default.nix | 2 +-
pkgs/tools/security/sshguard/default.nix | 2 +-
pkgs/tools/system/daemon/default.nix | 2 +-
pkgs/tools/system/jump/default.nix | 2 +-
pkgs/tools/system/testdisk/default.nix | 2 +-
pkgs/tools/text/jsawk/default.nix | 2 +-
pkgs/tools/text/miller/default.nix | 2 +-
pkgs/tools/text/sift/default.nix | 2 +-
pkgs/tools/typesetting/asciidoctorj/default.nix | 4 +---
pkgs/tools/typesetting/ted/default.nix | 2 +-
139 files changed, 144 insertions(+), 150 deletions(-)
diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix
index 13c48fc12af3..adb6f6b74274 100644
--- a/pkgs/applications/audio/ecasound/default.nix
+++ b/pkgs/applications/audio/ecasound/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = [ alsaLib audiofile libjack2 liblo liboil libsamplerate libsndfile lilv lv2 ];
meta = {
- description = "Ecasound is a software package designed for multitrack audio processing";
+ description = "Software package designed for multitrack audio processing";
license = with stdenv.lib.licenses; [ gpl2 lgpl21 ];
homepage = "http://nosignal.fi/ecasound/";
};
diff --git a/pkgs/applications/audio/eflite/default.nix b/pkgs/applications/audio/eflite/default.nix
index f9a579512cab..30a35501771b 100644
--- a/pkgs/applications/audio/eflite/default.nix
+++ b/pkgs/applications/audio/eflite/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://eflite.sourceforge.net";
- description = "EFlite is a speech server for screen readers";
+ description = "Speech server for screen readers";
longDescription = ''
EFlite is a speech server for Emacspeak and other screen
readers that allows them to interface with Festival Lite,
diff --git a/pkgs/applications/audio/picoloop/default.nix b/pkgs/applications/audio/picoloop/default.nix
index 7f6773f5e514..69052988f26f 100644
--- a/pkgs/applications/audio/picoloop/default.nix
+++ b/pkgs/applications/audio/picoloop/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "Picoloop is a synth and a stepsequencer (a clone of the famous nanoloop)";
+ description = "A synth and a stepsequencer (a clone of the famous nanoloop)";
homepage = "https://github.com/yoyz/picoloop";
platforms = platforms.linux;
license = licenses.bsd3;
diff --git a/pkgs/applications/blockchains/sumokoin.nix b/pkgs/applications/blockchains/sumokoin.nix
index ad65da057aec..beb294d2dfe0 100644
--- a/pkgs/applications/blockchains/sumokoin.nix
+++ b/pkgs/applications/blockchains/sumokoin.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with lib; {
- description = "Sumokoin is a fork of Monero and a truely fungible cryptocurrency";
+ description = "A fork of Monero and a truely fungible cryptocurrency";
homepage = "https://www.sumokoin.org/";
license = licenses.bsd3;
maintainers = with maintainers; [ fpletz ];
diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix
index fa25252fc6f8..1f1e43d196ce 100644
--- a/pkgs/applications/editors/kile/default.nix
+++ b/pkgs/applications/editors/kile/default.nix
@@ -52,7 +52,7 @@ mkDerivation rec {
propagatedUserEnvPkgs = [ konsole ];
meta = {
- description = "Kile is a user friendly TeX/LaTeX authoring tool for the KDE desktop environment";
+ description = "User-friendly TeX/LaTeX authoring tool for the KDE desktop environment";
homepage = "https://www.kde.org/applications/office/kile/";
maintainers = with lib.maintainers; [ fridh ];
license = lib.licenses.gpl2Plus;
diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix
index d27c2636e25e..c36d576cc8e2 100644
--- a/pkgs/applications/graphics/gnuclad/default.nix
+++ b/pkgs/applications/graphics/gnuclad/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = "https://launchpad.net/gnuclad";
- description = "gnuclad tries to help the environment by creating trees. It's primary use will be generating cladogram trees for the GNU/Linux distro timeline project";
+ description = "gnuclad tries to help the environment by creating trees. Its primary use will be generating cladogram trees for the GNU/Linux distro timeline project";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ mog ];
platforms = platforms.linux;
diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix
index a5a255338e8a..da5caeff3a00 100644
--- a/pkgs/applications/graphics/lightburn/default.nix
+++ b/pkgs/applications/graphics/lightburn/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- description = "LightBurn is layout, editing, and control software for your laser cutter";
+ description = "Layout, editing, and control software for your laser cutter";
homepage = "https://lightburnsoftware.com/";
license = stdenv.lib.licenses.unfree;
maintainers = with stdenv.lib.maintainers; [ q3k ];
diff --git a/pkgs/applications/kde/bomber.nix b/pkgs/applications/kde/bomber.nix
index c3f477802591..f42a6a01871b 100644
--- a/pkgs/applications/kde/bomber.nix
+++ b/pkgs/applications/kde/bomber.nix
@@ -7,7 +7,7 @@ mkDerivation {
name = "bomber";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.bomber";
- description = "Bomber is a single player arcade game";
+ description = "A single player arcade game";
longDescription = ''
Bomber is a single player arcade game. The player is invading various
cities in a plane that is decreasing in height.
diff --git a/pkgs/applications/kde/granatier.nix b/pkgs/applications/kde/granatier.nix
index f0b7cde5b2cc..c02fa0fef2e7 100644
--- a/pkgs/applications/kde/granatier.nix
+++ b/pkgs/applications/kde/granatier.nix
@@ -7,7 +7,7 @@ mkDerivation {
name = "granatier";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.granatier";
- description = "Granatier is a clone of the classic Bomberman game";
+ description = "Clone of the classic Bomberman game";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
diff --git a/pkgs/applications/kde/kalzium.nix b/pkgs/applications/kde/kalzium.nix
index 5bb51a6b4e1d..cf579caa9cc8 100644
--- a/pkgs/applications/kde/kalzium.nix
+++ b/pkgs/applications/kde/kalzium.nix
@@ -4,7 +4,7 @@ mkDerivation {
name = "kalzium";
meta = with lib; {
homepage = "https://kde.org/applications/en/utilities/org.kde.kalzium";
- description = "Kalzium is a program that shows you the Periodic Table of Elements";
+ description = "Program that shows you the Periodic Table of Elements";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
diff --git a/pkgs/applications/kde/kapman.nix b/pkgs/applications/kde/kapman.nix
index 68af796dda4b..5f4cc40138c0 100644
--- a/pkgs/applications/kde/kapman.nix
+++ b/pkgs/applications/kde/kapman.nix
@@ -4,7 +4,7 @@ mkDerivation {
name = "kapman";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.kapman";
- description = "Kapman is a clone of the well known game Pac-Man";
+ description = "Clone of the well known game Pac-Man";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
diff --git a/pkgs/applications/kde/katomic.nix b/pkgs/applications/kde/katomic.nix
index a1d0f12b6a1d..2690cfc05897 100644
--- a/pkgs/applications/kde/katomic.nix
+++ b/pkgs/applications/kde/katomic.nix
@@ -4,7 +4,7 @@ mkDerivation {
name = "katomic";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.katomic";
- description = "KAtomic is a fun educational game built around molecular geometry";
+ description = "Fun educational game built around molecular geometry";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
diff --git a/pkgs/applications/kde/kblackbox.nix b/pkgs/applications/kde/kblackbox.nix
index 669c089df809..ce0d8e36b91b 100644
--- a/pkgs/applications/kde/kblackbox.nix
+++ b/pkgs/applications/kde/kblackbox.nix
@@ -4,7 +4,7 @@ mkDerivation {
name = "kblackbox";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.kblackbox";
- description = "KBlackbox is a game of hide and seek played on a grid of boxes";
+ description = "Game of hide and seek played on a grid of boxes";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
diff --git a/pkgs/applications/kde/kblocks.nix b/pkgs/applications/kde/kblocks.nix
index 1dedabb2a082..a11a6e257440 100644
--- a/pkgs/applications/kde/kblocks.nix
+++ b/pkgs/applications/kde/kblocks.nix
@@ -4,7 +4,7 @@ mkDerivation {
name = "kblocks";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.kblocks";
- description = "KBlocks is the classic falling blocks game";
+ description = "Classic falling blocks game";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
diff --git a/pkgs/applications/kde/kbounce.nix b/pkgs/applications/kde/kbounce.nix
index a24d21551807..b67e3ce02173 100644
--- a/pkgs/applications/kde/kbounce.nix
+++ b/pkgs/applications/kde/kbounce.nix
@@ -4,7 +4,7 @@ mkDerivation {
name = "kbounce";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.kbounce";
- description = "KBounce is a single player arcade game with the elements of puzzle";
+ description = "Single player arcade game with the elements of puzzle";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
diff --git a/pkgs/applications/kde/kdiamond.nix b/pkgs/applications/kde/kdiamond.nix
index 26cd731beaf5..6c124f9450ea 100644
--- a/pkgs/applications/kde/kdiamond.nix
+++ b/pkgs/applications/kde/kdiamond.nix
@@ -4,7 +4,7 @@ mkDerivation {
name = "kdiamond";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.kdiamond";
- description = "KDiamond is a single player puzzle game";
+ description = "A single player puzzle game";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
diff --git a/pkgs/applications/kde/kfloppy.nix b/pkgs/applications/kde/kfloppy.nix
index 525520c159bd..a8747047f42f 100644
--- a/pkgs/applications/kde/kfloppy.nix
+++ b/pkgs/applications/kde/kfloppy.nix
@@ -4,7 +4,7 @@ mkDerivation {
name = "kfloppy";
meta = with lib; {
homepage = "https://kde.org/applications/en/utilities/org.kde.kfloppy";
- description = "KFloppy is a utility to format 3.5\" and 5.25\" floppy disks";
+ description = "Utility to format 3.5\" and 5.25\" floppy disks";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
diff --git a/pkgs/applications/kde/klettres.nix b/pkgs/applications/kde/klettres.nix
index e8e0a0aa59ab..aaddceb7bd6d 100644
--- a/pkgs/applications/kde/klettres.nix
+++ b/pkgs/applications/kde/klettres.nix
@@ -4,7 +4,7 @@ mkDerivation {
name = "klettres";
meta = with lib; {
homepage = "https://kde.org/applications/en/utilities/org.kde.klettres";
- description = "KLettres is an application specially designed to help the user to learn an alphabet";
+ description = "An application specially designed to help the user to learn an alphabet";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
diff --git a/pkgs/applications/kde/klines.nix b/pkgs/applications/kde/klines.nix
index c6ad883dd63d..7fadf409bd3d 100644
--- a/pkgs/applications/kde/klines.nix
+++ b/pkgs/applications/kde/klines.nix
@@ -4,7 +4,7 @@ mkDerivation {
name = "klines";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.klines";
- description = "KLines is a simple but highly addictive one player game";
+ description = "A simple but highly addictive one player game";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
diff --git a/pkgs/applications/kde/kmag.nix b/pkgs/applications/kde/kmag.nix
index 701d8dbf130a..fdac690cf22f 100644
--- a/pkgs/applications/kde/kmag.nix
+++ b/pkgs/applications/kde/kmag.nix
@@ -4,7 +4,7 @@ mkDerivation {
name = "kmag";
meta = with lib; {
homepage = "https://kde.org/applications/en/utilities/org.kde.kmag";
- description = "KMag is a small utility for Linux to magnify a part of the screen";
+ description = "A small Linux utility to magnify a part of the screen";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
diff --git a/pkgs/applications/kde/kmines.nix b/pkgs/applications/kde/kmines.nix
index 9314cca4a23f..edf3114244b9 100644
--- a/pkgs/applications/kde/kmines.nix
+++ b/pkgs/applications/kde/kmines.nix
@@ -4,7 +4,7 @@ mkDerivation {
name = "kmines";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.kmines";
- description = "KMines is a classic Minesweeper game";
+ description = "A classic Minesweeper game";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
diff --git a/pkgs/applications/kde/knetwalk.nix b/pkgs/applications/kde/knetwalk.nix
index 88d08b56bb1d..f34bb84f0a06 100644
--- a/pkgs/applications/kde/knetwalk.nix
+++ b/pkgs/applications/kde/knetwalk.nix
@@ -4,7 +4,7 @@ mkDerivation {
name = "knetwalk";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.knetwalk";
- description = "KNetWalk is a single player logic game";
+ description = "A single player logic game";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
diff --git a/pkgs/applications/kde/knights.nix b/pkgs/applications/kde/knights.nix
index ee5c37e2e948..8b71493ff186 100644
--- a/pkgs/applications/kde/knights.nix
+++ b/pkgs/applications/kde/knights.nix
@@ -4,7 +4,7 @@ mkDerivation {
name = "knights";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.knights";
- description = "KNights is a chess game";
+ description = "A chess game";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
diff --git a/pkgs/applications/kde/kollision.nix b/pkgs/applications/kde/kollision.nix
index 3c0c814cd15a..6cb9995459a4 100644
--- a/pkgs/applications/kde/kollision.nix
+++ b/pkgs/applications/kde/kollision.nix
@@ -4,7 +4,7 @@ mkDerivation {
name = "kollision";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.kollision";
- description = "Kollision is a casual game";
+ description = "A casual game";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
diff --git a/pkgs/applications/kde/kreversi.nix b/pkgs/applications/kde/kreversi.nix
index 77ac4f05c8a8..9f4be46738be 100644
--- a/pkgs/applications/kde/kreversi.nix
+++ b/pkgs/applications/kde/kreversi.nix
@@ -4,7 +4,7 @@ mkDerivation {
name = "kreversi";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.kreversi";
- description = "KReversi is a simple one player strategy game played against the computer";
+ description = "A simple one player strategy game played against the computer";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
diff --git a/pkgs/applications/kde/kshisen.nix b/pkgs/applications/kde/kshisen.nix
index 7909ed8b2a38..5be17bb8ee08 100644
--- a/pkgs/applications/kde/kshisen.nix
+++ b/pkgs/applications/kde/kshisen.nix
@@ -4,7 +4,7 @@ mkDerivation {
name = "kshisen";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.kshisen";
- description = "KShisen is a solitaire-like game played using the standard set of Mahjong tiles";
+ description = "A solitaire-like game played using the standard set of Mahjong tiles";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
diff --git a/pkgs/applications/kde/ksquares.nix b/pkgs/applications/kde/ksquares.nix
index 94a639a0d370..12d989befe19 100644
--- a/pkgs/applications/kde/ksquares.nix
+++ b/pkgs/applications/kde/ksquares.nix
@@ -4,7 +4,7 @@ mkDerivation {
name = "ksquares";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.ksquares";
- description = "KSquares is a game of Dots and Boxes";
+ description = "A game of Dots and Boxes";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
diff --git a/pkgs/applications/kde/kteatime.nix b/pkgs/applications/kde/kteatime.nix
index a69cb991acc0..812a13aa118b 100644
--- a/pkgs/applications/kde/kteatime.nix
+++ b/pkgs/applications/kde/kteatime.nix
@@ -4,7 +4,7 @@ mkDerivation {
name = "kteatime";
meta = with lib; {
homepage = "https://kde.org/applications/en/utilities/org.kde.kteatime";
- description = "KTeaTime is a handy timer for steeping tea";
+ description = "A handy timer for steeping tea";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
diff --git a/pkgs/applications/kde/ktimer.nix b/pkgs/applications/kde/ktimer.nix
index aa755f35ce43..bdb8f2c687b1 100644
--- a/pkgs/applications/kde/ktimer.nix
+++ b/pkgs/applications/kde/ktimer.nix
@@ -4,7 +4,7 @@ mkDerivation {
name = "ktimer";
meta = with lib; {
homepage = "https://kde.org/applications/en/utilities/org.kde.ktimer";
- description = "KTimer is a little tool to execute programs after some time";
+ description = "A little tool to execute programs after some time";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
diff --git a/pkgs/applications/kde/kturtle.nix b/pkgs/applications/kde/kturtle.nix
index e16c86dc1362..c495b16fef79 100644
--- a/pkgs/applications/kde/kturtle.nix
+++ b/pkgs/applications/kde/kturtle.nix
@@ -4,7 +4,7 @@ mkDerivation {
name = "kturtle";
meta = with lib; {
homepage = "https://kde.org/applications/en/utilities/org.kde.kturtle";
- description = "KTurtle is an educational programming environment for learning how to program";
+ description = "An educational programming environment for learning how to program";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
diff --git a/pkgs/applications/kde/kwave.nix b/pkgs/applications/kde/kwave.nix
index 349787d000b5..78a3d9ab4a54 100644
--- a/pkgs/applications/kde/kwave.nix
+++ b/pkgs/applications/kde/kwave.nix
@@ -5,7 +5,7 @@ mkDerivation {
name = "kwave";
meta = with lib; {
homepage = "https://kde.org/applications/en/multimedia/org.kde.kwave";
- description = "KWave is a simple media player";
+ description = "A simple media player";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix
index 97510bc3b457..463f7db6b0c3 100644
--- a/pkgs/applications/misc/dockbarx/default.nix
+++ b/pkgs/applications/misc/dockbarx/default.nix
@@ -30,7 +30,7 @@ pythonPackages.buildPythonApplication rec {
meta = with stdenv.lib; {
homepage = "https://launchpad.net/dockbar/";
- description = "DockBarX is a lightweight taskbar / panel replacement for Linux which works as a stand-alone dock";
+ description = "Lightweight taskbar / panel replacement for Linux which works as a stand-alone dock";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = [ maintainers.volth ];
diff --git a/pkgs/applications/misc/fsv/default.nix b/pkgs/applications/misc/fsv/default.nix
index 8b6898958d3c..ff556621f9ae 100644
--- a/pkgs/applications/misc/fsv/default.nix
+++ b/pkgs/applications/misc/fsv/default.nix
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
version = "0.9-1";
src = fetchFromGitHub {
- owner = "mcuelenaere";
+ owner = "mcuelenaere";
repo = "fsv";
rev = "${pname}-${version}";
sha256 = "0n09jd7yqj18mx6zqbg7kab4idg5llr15g6avafj74fpg1h7iimj";
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ file gtk2 libGLU gtkglarea ];
meta = with stdenv.lib; {
- description = "fsv is a file system visualizer in cyberspace";
+ description = "File system visualizer in cyberspace";
longDescription = ''
fsv (pronounced eff-ess-vee) is a file system visualizer in cyberspace.
It lays out files and directories in three dimensions, geometrically
diff --git a/pkgs/applications/misc/grsync/default.nix b/pkgs/applications/misc/grsync/default.nix
index 8d17ff09204f..e1c9902c6ae7 100644
--- a/pkgs/applications/misc/grsync/default.nix
+++ b/pkgs/applications/misc/grsync/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
- description = "Grsync is used to synchronize folders, files and make backups";
+ description = "Synchronize folders, files and make backups";
homepage = "http://www.opbyte.it/grsync/";
license = licenses.gpl1;
platforms = platforms.linux;
diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix
index edcc5a58ad52..b3e7e53774d7 100644
--- a/pkgs/applications/misc/icesl/default.nix
+++ b/pkgs/applications/misc/icesl/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
- description = "IceSL is a GPU-accelerated procedural modeler and slicer for 3D printing";
+ description = "GPU-accelerated procedural modeler and slicer for 3D printing";
homepage = "http://shapeforge.loria.fr/icesl/index.html";
license = licenses.inria-icesl;
platforms = [ "i686-linux" "x86_64-linux" ];
diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix
index 2bd8bfa99bcd..8b36d384e153 100644
--- a/pkgs/applications/misc/libosmocore/default.nix
+++ b/pkgs/applications/misc/libosmocore/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
- description = "libosmocore";
+ description = "Set of Osmocom core libraries";
homepage = "https://github.com/osmocom/libosmocore";
license = licenses.gpl2Plus;
platforms = platforms.linux;
diff --git a/pkgs/applications/misc/mapproxy/default.nix b/pkgs/applications/misc/mapproxy/default.nix
index 5676aef23607..41ae683548d0 100644
--- a/pkgs/applications/misc/mapproxy/default.nix
+++ b/pkgs/applications/misc/mapproxy/default.nix
@@ -56,7 +56,7 @@ buildPythonApplication rec {
# https://github.com/NixOS/nixpkgs/pull/56480
doCheck = false;
meta = with lib; {
- description = "MapProxy is an open source proxy for geospatial data";
+ description = "Open source proxy for geospatial data";
homepage = "https://mapproxy.org/";
license = licenses.asl20;
maintainers = with maintainers; [ rakesh4g ];
diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix
index 0f929439e4ff..8d6669917e79 100644
--- a/pkgs/applications/misc/obsidian/default.nix
+++ b/pkgs/applications/misc/obsidian/default.nix
@@ -65,7 +65,7 @@ in stdenv.mkDerivation rec {
meta = with lib; {
description =
- "Obsidian is a powerful knowledge base that works on top of a local folder of plain text Markdown files";
+ "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
homepage = "https://obsidian.md";
license = licenses.obsidian;
maintainers = with maintainers; [ conradmearns zaninime ];
diff --git a/pkgs/applications/misc/rsibreak/default.nix b/pkgs/applications/misc/rsibreak/default.nix
index 432cbfb9b693..9f765793dc9a 100644
--- a/pkgs/applications/misc/rsibreak/default.nix
+++ b/pkgs/applications/misc/rsibreak/default.nix
@@ -20,7 +20,7 @@ in mkDerivation rec {
propagatedBuildInputs = [ knotifyconfig kidletime kwindowsystem ktextwidgets kcrash ];
meta = with lib; {
- description = "RSIBreak takes care of your health and regularly breaks your work to avoid repetitive strain injury (RSI)";
+ description = "Takes care of your health and regularly breaks your work to avoid repetitive strain injury (RSI)";
license = licenses.gpl2;
homepage = "https://www.kde.org/applications/utilities/rsibreak/";
maintainers = with maintainers; [ vandenoever ];
diff --git a/pkgs/applications/misc/xmenu/default.nix b/pkgs/applications/misc/xmenu/default.nix
index 0904d1d048fc..ecbb205c98e9 100644
--- a/pkgs/applications/misc/xmenu/default.nix
+++ b/pkgs/applications/misc/xmenu/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
postPatch = "sed -i \"s:/usr/local:$out:\" config.mk";
meta = with stdenv.lib; {
- description = "XMenu is a menu utility for X";
+ description = "A menu utility for X";
homepage = "https://github.com/phillbush/xmenu";
license = licenses.publicDomain;
maintainers = with maintainers; [ neonfuz ];
diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix
index 6fbec331802a..72b365d01b47 100644
--- a/pkgs/applications/networking/cluster/jx/default.nix
+++ b/pkgs/applications/networking/cluster/jx/default.nix
@@ -35,7 +35,7 @@ buildGoModule rec {
'';
meta = with lib; {
- description = "JX is a command line tool for installing and using Jenkins X";
+ description = "Command line tool for installing and using Jenkins X";
homepage = "https://jenkins-x.io";
longDescription = ''
Jenkins X provides automated CI+CD for Kubernetes with Preview
diff --git a/pkgs/applications/networking/cluster/prow/default.nix b/pkgs/applications/networking/cluster/prow/default.nix
index 60e79ed6690a..b1ea88a11a33 100644
--- a/pkgs/applications/networking/cluster/prow/default.nix
+++ b/pkgs/applications/networking/cluster/prow/default.nix
@@ -52,7 +52,7 @@ buildGoModule rec {
];
meta = with lib; {
- description = "Prow is a Kubernetes based CI/CD system";
+ description = "A Kubernetes based CI/CD system";
longDescription = ''
Prow is a Kubernetes based CI/CD system. Jobs can be triggered by various
types of events and report their status to many different services. In
diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix
index e0f56e2783d0..190050d8327b 100644
--- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ferdi/default.nix
@@ -9,7 +9,7 @@ mkFranzDerivation rec {
sha256 = "0i24vcnq4iz5amqmn2fgk92ff9x9y7fg8jhc3g6ksvmcfly7af3k";
};
meta = with stdenv.lib; {
- description = "Ferdi allows you to combine your favorite messaging services into one application";
+ description = "Combine your favorite messaging services into one application";
homepage = "https://getferdi.com/";
license = licenses.free;
maintainers = [ maintainers.davidtwco ];
diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix
index c1984a218c8a..9f841f50dac3 100644
--- a/pkgs/applications/networking/instant-messengers/psi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
];
enableParallelBuilding = true;
meta = with stdenv.lib; {
- description = "Psi, an XMPP (Jabber) client";
+ description = "An XMPP (Jabber) client";
maintainers = [ maintainers.raskin ];
license = licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix
index 9a607b54b9cc..45d41839a1ca 100644
--- a/pkgs/applications/networking/mailreaders/aerc/default.nix
+++ b/pkgs/applications/networking/mailreaders/aerc/default.nix
@@ -54,7 +54,7 @@ buildGoModule rec {
'';
meta = with stdenv.lib; {
- description = "aerc is an email client for your terminal";
+ description = "An email client for your terminal";
homepage = "https://aerc-mail.org/";
maintainers = with maintainers; [ tadeokondrak ];
license = licenses.mit;
diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix
index 59b173ac98cd..cfd1206f2314 100644
--- a/pkgs/applications/science/biology/dcm2niix/default.nix
+++ b/pkgs/applications/science/biology/dcm2niix/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libyamlcpp ];
meta = with stdenv.lib; {
- description = "dcm2niix DICOM to NIfTI converter";
+ description = "DICOM to NIfTI converter";
longDescription = ''
dcm2niix is a designed to convert neuroimaging data from the
DICOM format to the NIfTI format.
diff --git a/pkgs/applications/science/biology/kallisto/default.nix b/pkgs/applications/science/biology/kallisto/default.nix
index 5a1bb187886b..014ae14cc794 100644
--- a/pkgs/applications/science/biology/kallisto/default.nix
+++ b/pkgs/applications/science/biology/kallisto/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = false;
meta = with stdenv.lib; {
- description = "Kallisto is a program for quantifying abundances of transcripts from RNA-Seq data";
+ description = "Program for quantifying abundances of transcripts from RNA-Seq data";
homepage = "https://pachterlab.github.io/kallisto";
license = licenses.bsd2;
platforms = platforms.linux;
diff --git a/pkgs/applications/science/logic/coq2html/default.nix b/pkgs/applications/science/logic/coq2html/default.nix
index 2e56eda893e9..e53e8e7392c0 100644
--- a/pkgs/applications/science/logic/coq2html/default.nix
+++ b/pkgs/applications/science/logic/coq2html/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, ocaml }:
-let
+let
version = "20170720";
in
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
'';
meta = with stdenv.lib; {
- description = "coq2html is an HTML documentation generator for Coq source files";
+ description = "HTML documentation generator for Coq source files";
longDescription = ''
coq2html is an HTML documentation generator for Coq source files. It is
an alternative to the standard coqdoc documentation generator
diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix
index ecc253a64d98..48ad63eaa993 100644
--- a/pkgs/applications/science/logic/ott/default.nix
+++ b/pkgs/applications/science/logic/ott/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
postInstall = "opaline -prefix $out";
meta = {
- description = "Ott: tool for the working semanticist";
+ description = "A tool for the working semanticist";
longDescription = ''
Ott is a tool for writing definitions of programming languages and
calculi. It takes as input a definition of a language syntax and
diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix
index 05c56b0b0958..18c304e83165 100644
--- a/pkgs/applications/science/machine-learning/labelimg/default.nix
+++ b/pkgs/applications/science/machine-learning/labelimg/default.nix
@@ -28,7 +28,7 @@
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
'';
meta = with stdenv.lib; {
- description = "LabelImg is a graphical image annotation tool and label object bounding boxes in images";
+ description = "A graphical image annotation tool and label object bounding boxes in images";
homepage = "https://github.com/tzutalin/labelImg";
license = licenses.mit;
platforms = platforms.linux;
diff --git a/pkgs/applications/science/math/bliss/default.nix b/pkgs/applications/science/math/bliss/default.nix
index 52b05646a70d..9ab90134aad4 100644
--- a/pkgs/applications/science/math/bliss/default.nix
+++ b/pkgs/applications/science/math/bliss/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "bliss is an open source tool for computing automorphism groups and canonical forms of graphs. It has both a command line user interface as well as C++ and C programming language APIs";
+ description = "An open source tool for computing automorphism groups and canonical forms of graphs. It has both a command line user interface as well as C++ and C programming language APIs";
homepage = "http://www.tcs.hut.fi/Software/bliss/";
license = licenses.lgpl3;
platforms = [ "i686-linux" "x86_64-linux" ];
diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix
index 50d4dcc1a9ff..268ae53401f5 100644
--- a/pkgs/applications/science/misc/openmodelica/default.nix
+++ b/pkgs/applications/science/misc/openmodelica/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
'';
meta = with stdenv.lib; {
- description = "OpenModelica is an open-source Modelica-based modeling and simulation environment";
+ description = "An open-source Modelica-based modeling and simulation environment";
homepage = "https://openmodelica.org";
license = licenses.gpl3;
maintainers = with maintainers; [ smironov ];
diff --git a/pkgs/applications/science/programming/scyther/default.nix b/pkgs/applications/science/programming/scyther/default.nix
index d1e948fe187b..ca6b57de611d 100644
--- a/pkgs/applications/science/programming/scyther/default.nix
+++ b/pkgs/applications/science/programming/scyther/default.nix
@@ -13,7 +13,7 @@ let
};
meta = with lib; {
- description = "Scyther is a tool for the automatic verification of security protocols";
+ description = "A tool for the automatic verification of security protocols";
homepage = "https://www.cs.ox.ac.uk/people/cas.cremers/scyther/";
license = licenses.gpl2;
maintainers = with maintainers; [ infinisil ];
diff --git a/pkgs/applications/video/mjpg-streamer/default.nix b/pkgs/applications/video/mjpg-streamer/default.nix
index d1efae4a9244..b6856f1a18e3 100644
--- a/pkgs/applications/video/mjpg-streamer/default.nix
+++ b/pkgs/applications/video/mjpg-streamer/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
homepage = "https://github.com/jacksonliam/mjpg-streamer";
- description = "MJPG-streamer takes JPGs from Linux-UVC compatible webcams, filesystem or other input plugins and streams them as M-JPEG via HTTP to webbrowsers, VLC and other software";
+ description = "Takes JPGs from Linux-UVC compatible webcams, filesystem or other input plugins and streams them as M-JPEG via HTTP to webbrowsers, VLC and other software";
platforms = platforms.linux;
license = licenses.gpl2;
maintainers = with maintainers; [ gebner ];
diff --git a/pkgs/applications/video/mkclean/default.nix b/pkgs/applications/video/mkclean/default.nix
index 6bb1bcc5d8a6..36cd2206070c 100644
--- a/pkgs/applications/video/mkclean/default.nix
+++ b/pkgs/applications/video/mkclean/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "mkclean is a command line tool to clean and optimize Matroska (.mkv / .mka / .mks / .mk3d) and WebM (.webm / .weba) files that have already been muxed";
+ description = "Command line tool to clean and optimize Matroska (.mkv / .mka / .mks / .mk3d) and WebM (.webm / .weba) files that have already been muxed";
homepage = "https://www.matroska.org";
license = licenses.bsdOriginal;
maintainers = with maintainers; [ chrisaw ];
diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix
index 06ebd7e0e924..e2b3e4a55a4a 100644
--- a/pkgs/applications/window-managers/leftwm/default.nix
+++ b/pkgs/applications/window-managers/leftwm/default.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
'';
meta = with stdenv.lib; {
- description = "Leftwm - A tiling window manager for the adventurer";
+ description = "A tiling window manager for the adventurer";
homepage = "https://github.com/leftwm/leftwm";
license = licenses.mit;
platforms = platforms.linux;
diff --git a/pkgs/data/fonts/merriweather/default.nix b/pkgs/data/fonts/merriweather/default.nix
index 1768c44bc03c..d1b3359df26e 100644
--- a/pkgs/data/fonts/merriweather/default.nix
+++ b/pkgs/data/fonts/merriweather/default.nix
@@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation rec {
meta = with lib; {
homepage = "https://github.com/SorkinType/Merriweather";
- description = "Merriweather was designed to be a text face that is pleasant to read on screens";
+ description = "A text face designed to be pleasant to read on screens";
license = licenses.ofl;
platforms = platforms.all;
maintainers = with maintainers; [ emily ];
diff --git a/pkgs/desktops/lxde/core/lxrandr/default.nix b/pkgs/desktops/lxde/core/lxrandr/default.nix
index 9df84b6b1e23..ab109f3c6d45 100644
--- a/pkgs/desktops/lxde/core/lxrandr/default.nix
+++ b/pkgs/desktops/lxde/core/lxrandr/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libX11 (if withGtk3 then gtk3 else gtk2) xrandr ];
meta = with stdenv.lib; {
- description = "LXRandR is the standard screen manager of LXDE";
+ description = "Standard screen manager of LXDE";
homepage = "https://lxde.org/";
license = stdenv.lib.licenses.gpl2;
maintainers = with maintainers; [ rawkode ];
diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix
index 9f50ea9abba2..713033057911 100644
--- a/pkgs/development/compilers/fpc/lazarus.nix
+++ b/pkgs/development/compilers/fpc/lazarus.nix
@@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "Lazarus graphical IDE for the FreePascal language";
+ description = "Graphical IDE for the FreePascal language";
homepage = "https://www.lazarus.freepascal.org";
license = licenses.gpl2Plus ;
maintainers = with maintainers; [ raskin ];
diff --git a/pkgs/development/compilers/stalin/default.nix b/pkgs/development/compilers/stalin/default.nix
index 430bc251b4bd..e37b207b4f2e 100644
--- a/pkgs/development/compilers/stalin/default.nix
+++ b/pkgs/development/compilers/stalin/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://www.ece.purdue.edu/~qobi/software.html";
license = stdenv.lib.licenses.gpl2Plus;
- description = "Stalin, an optimizing Scheme compiler";
+ description = "An optimizing Scheme compiler";
maintainers = [ ];
platforms = ["i686-linux"]; # doesn't want to work on 64-bit platforms
diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix
index 90067e493a15..546949d9f21c 100644
--- a/pkgs/development/libraries/belr/default.nix
+++ b/pkgs/development/libraries/belr/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DENABLE_STATIC=NO" ];
meta = with stdenv.lib; {
- description = "Belr is Belledonne Communications' language recognition library";
+ description = "Belledonne Communications' language recognition library";
homepage = "https://gitlab.linphone.org/BC/public/belr";
license = licenses.gpl3;
platforms = platforms.all;
diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix
index d54539d9f25a..4fe53a5d629d 100644
--- a/pkgs/development/libraries/bzrtp/default.nix
+++ b/pkgs/development/libraries/bzrtp/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type";
meta = with stdenv.lib; {
- description = "BZRTP is an opensource implementation of ZRTP keys exchange protocol";
+ description = "An opensource implementation of ZRTP keys exchange protocol";
homepage = "https://gitlab.linphone.org/BC/public/bzrtp";
# They have switched to GPLv3 on git HEAD so probably the next release will
# be GPL3.
diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix
index dde0806add4a..9b1adb7e2358 100644
--- a/pkgs/development/libraries/duckdb/default.nix
+++ b/pkgs/development/libraries/duckdb/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = "https://github.com/cwida/duckdb";
- description = "DuckDB is an embeddable SQL OLAP Database Management System";
+ description = "Embeddable SQL OLAP Database Management System";
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ costrouc ];
diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix
index 534ad7afc716..e97b96d71d09 100644
--- a/pkgs/development/libraries/libstroke/default.nix
+++ b/pkgs/development/libraries/libstroke/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
'';
meta = {
- description = "Libstroke, a library for simple gesture recognition";
+ description = "A library for simple gesture recognition";
homepage = "https://web.archive.org/web/20161204100704/http://etla.net/libstroke/";
license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/development/libraries/libthreadar/default.nix b/pkgs/development/libraries/libthreadar/default.nix
index ed19fab6d994..96c0418f74c8 100644
--- a/pkgs/development/libraries/libthreadar/default.nix
+++ b/pkgs/development/libraries/libthreadar/default.nix
@@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://libthreadar.sourceforge.net/";
- description = ''
+ description = "A C++ library that provides several classes to manipulate threads";
+ longDescription = ''
Libthreadar is a C++ library providing a small set of C++ classes to manipulate
threads in a very simple and efficient way from your C++ code.
'';
diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix
index 4254bfe82ea2..51fd6962e704 100644
--- a/pkgs/development/libraries/martyr/default.nix
+++ b/pkgs/development/libraries/martyr/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- description = "Martyr is a Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state";
+ description = "Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state";
homepage = "http://martyr.sourceforge.net/";
license = stdenv.lib.licenses.lgpl21;
};
diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/development/libraries/physics/qcdnum/default.nix
index c12526223938..1c17b318c9dc 100644
--- a/pkgs/development/libraries/physics/qcdnum/default.nix
+++ b/pkgs/development/libraries/physics/qcdnum/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = {
- description = "QCDNUM is a very fast QCD evolution program written in FORTRAN77";
+ description = "A very fast QCD evolution program written in FORTRAN77";
license = stdenv.lib.licenses.gpl3;
homepage = "https://www.nikhef.nl/~h24/qcdnum/index.html";
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix
index 192ed56d4562..4930b222d03c 100644
--- a/pkgs/development/libraries/pupnp/default.nix
+++ b/pkgs/development/libraries/pupnp/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "fortify" ];
meta = {
- description = "libupnp, an open source UPnP development kit for Linux";
+ description = "An open source UPnP development kit for Linux";
longDescription = ''
The Linux SDK for UPnP Devices (libupnp) provides developers
diff --git a/pkgs/development/libraries/science/math/parmetis/default.nix b/pkgs/development/libraries/science/math/parmetis/default.nix
index 97023d07c7f3..8f24356c7336 100644
--- a/pkgs/development/libraries/science/math/parmetis/default.nix
+++ b/pkgs/development/libraries/science/math/parmetis/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs, meshes, and for computing fill-reducing orderings of sparse matrices";
+ description = "An MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs, meshes, and for computing fill-reducing orderings of sparse matrices";
homepage = "http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview";
platforms = platforms.all;
license = licenses.unfree;
diff --git a/pkgs/development/libraries/sope/default.nix b/pkgs/development/libraries/sope/default.nix
index 59205a949e48..b24b0b9bcd4b 100644
--- a/pkgs/development/libraries/sope/default.nix
+++ b/pkgs/development/libraries/sope/default.nix
@@ -41,7 +41,7 @@ gnustep.stdenv.mkDerivation rec {
'';
meta = {
- description = "SOPE is an extensive set of frameworks which form a complete Web application server environment";
+ description = "An extensive set of frameworks which form a complete Web application server environment";
license = licenses.publicDomain;
homepage = "https://github.com/inverse-inc/sope";
platforms = platforms.linux;
diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix
index 524958e51a2c..6ab463bea1dc 100644
--- a/pkgs/development/libraries/symengine/default.nix
+++ b/pkgs/development/libraries/symengine/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "SymEngine is a fast symbolic manipulation library";
+ description = "A fast symbolic manipulation library";
homepage = "https://github.com/symengine/symengine";
platforms = platforms.unix ++ platforms.windows;
license = licenses.bsd3;
diff --git a/pkgs/development/mobile/cocoapods/default.nix b/pkgs/development/mobile/cocoapods/default.nix
index 2ab285b17306..8559ff5c74ca 100644
--- a/pkgs/development/mobile/cocoapods/default.nix
+++ b/pkgs/development/mobile/cocoapods/default.nix
@@ -13,7 +13,7 @@ bundlerApp {
passthru.updateScript = toString ./update;
meta = with lib; {
- description = "CocoaPods manages dependencies for your Xcode projects";
+ description = "Manages dependencies for your Xcode projects";
homepage = "https://github.com/CocoaPods/CocoaPods";
license = licenses.mit;
platforms = platforms.darwin;
diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix
index 595f97bcb8fa..55ff34b25208 100644
--- a/pkgs/development/python-modules/buildbot/default.nix
+++ b/pkgs/development/python-modules/buildbot/default.nix
@@ -103,7 +103,7 @@ let
meta = with lib; {
homepage = "https://buildbot.net/";
- description = "Buildbot is an open-source continuous integration framework for automating software build, test, and release processes";
+ description = "An open-source continuous integration framework for automating software build, test, and release processes";
maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ];
license = licenses.gpl2;
};
diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix
index 8c1fb3720ca1..e24a00564be8 100644
--- a/pkgs/development/python-modules/docutils/default.nix
+++ b/pkgs/development/python-modules/docutils/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
'';
meta = {
- description = "Docutils -- Python Documentation Utilities";
+ description = "Python Documentation Utilities";
homepage = "http://docutils.sourceforge.net/";
maintainers = with lib.maintainers; [ AndersonTorres ];
};
diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix
index 990e74d25498..6a4d7f01cc11 100644
--- a/pkgs/development/python-modules/xdot/default.nix
+++ b/pkgs/development/python-modules/xdot/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gtk3 ];
meta = with lib; {
- description = "xdot.py is an interactive viewer for graphs written in Graphviz's dot";
+ description = "An interactive viewer for graphs written in Graphviz's dot";
homepage = "https://github.com/jrfonseca/xdot.py";
license = licenses.lgpl3Plus;
};
diff --git a/pkgs/development/tools/analysis/coz/default.nix b/pkgs/development/tools/analysis/coz/default.nix
index 09bb44dc55f0..42b47a9a8fd8 100644
--- a/pkgs/development/tools/analysis/coz/default.nix
+++ b/pkgs/development/tools/analysis/coz/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://github.com/plasma-umass/coz";
- description = "Coz: Causal Profiling";
+ description = "Profiler based on casual profiling";
license = stdenv.lib.licenses.bsd2;
maintainers = with stdenv.lib.maintainers; [ zimbatm ];
};
diff --git a/pkgs/development/tools/analysis/pev/default.nix b/pkgs/development/tools/analysis/pev/default.nix
index cf09d249a9a7..c7e2e27bece4 100644
--- a/pkgs/development/tools/analysis/pev/default.nix
+++ b/pkgs/development/tools/analysis/pev/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
installFlags = [ "prefix=$(out)" ];
meta = with stdenv.lib; {
- description = "pev is a full-featured, open source, multiplatform command line toolkit to work with PE (Portable Executables) binaries";
+ description = "A full-featured, open source, multiplatform command line toolkit to work with PE (Portable Executables) binaries";
homepage = "http://pev.sourceforge.net/";
license = licenses.gpl2;
platforms = platforms.linux;
diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix
index 45612182ed96..61a6b4bed4c0 100644
--- a/pkgs/development/tools/build-managers/bloop/default.nix
+++ b/pkgs/development/tools/build-managers/bloop/default.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = "https://scalacenter.github.io/bloop/";
license = licenses.asl20;
- description = "Bloop is a Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way";
+ description = "A Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way";
platforms = [ "x86_64-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ tomahna ];
};
diff --git a/pkgs/development/tools/deadcode/default.nix b/pkgs/development/tools/deadcode/default.nix
index 516eeff2091f..014acc89e1f7 100644
--- a/pkgs/development/tools/deadcode/default.nix
+++ b/pkgs/development/tools/deadcode/default.nix
@@ -22,7 +22,7 @@ buildGoPackage rec {
};
meta = with lib; {
- description = "deadcode is a very simple utility which detects unused declarations in a Go package";
+ description = "Very simple utility which detects unused declarations in a Go package";
homepage = "https://github.com/remyoudompheng/go-misc/tree/master/deadcode";
license = licenses.bsd3;
maintainers = with maintainers; [ kalbasit ];
diff --git a/pkgs/development/tools/errcheck/default.nix b/pkgs/development/tools/errcheck/default.nix
index 01dc924c811d..2df473ac5960 100644
--- a/pkgs/development/tools/errcheck/default.nix
+++ b/pkgs/development/tools/errcheck/default.nix
@@ -20,7 +20,7 @@ buildGoPackage rec {
goDeps = ./deps.nix;
meta = with lib; {
- description = "errcheck is a program for checking for unchecked errors in go programs";
+ description = "Program for checking for unchecked errors in go programs";
homepage = "https://github.com/kisielk/errcheck";
license = licenses.mit;
maintainers = with maintainers; [ kalbasit ];
diff --git a/pkgs/development/tools/impl/default.nix b/pkgs/development/tools/impl/default.nix
index 327226fe7a1e..825aa0c1fa6b 100644
--- a/pkgs/development/tools/impl/default.nix
+++ b/pkgs/development/tools/impl/default.nix
@@ -20,7 +20,7 @@ buildGoPackage rec {
goDeps = ./deps.nix;
meta = with lib; {
- description = "impl generates method stubs for implementing an interface";
+ description = "Generate method stubs for implementing an interface";
homepage = "https://github.com/josharian/impl";
license = licenses.mit;
maintainers = with maintainers; [ kalbasit ];
diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix
index ad127b94960f..44d537f97626 100644
--- a/pkgs/development/tools/jbake/default.nix
+++ b/pkgs/development/tools/jbake/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = with stdenv.lib; {
- description = "JBake is a Java based, open source, static site/blog generator for developers & designers";
+ description = "Java based, open source, static site/blog generator for developers & designers";
homepage = "https://jbake.org/";
license = licenses.mit;
maintainers = with maintainers; [ moaxcp ];
diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix
index bf182a1ae418..1d01ef97f401 100644
--- a/pkgs/development/tools/minizinc/default.nix
+++ b/pkgs/development/tools/minizinc/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
homepage = "https://www.minizinc.org/";
- description = "MiniZinc is a medium-level constraint modelling language";
+ description = "A medium-level constraint modelling language";
longDescription = ''
MiniZinc is a medium-level constraint modelling
diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix
index 0d058ef1f881..25ec42eac8e0 100644
--- a/pkgs/development/tools/misc/cli11/default.nix
+++ b/pkgs/development/tools/misc/cli11/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
- description = "CLI11 is a command line parser for C++11";
+ description = "Command line parser for C++11";
homepage = "https://github.com/CLIUtils/CLI11";
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ nand0p ];
diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix
index 75b0113b4977..853a240ffc35 100644
--- a/pkgs/development/tools/misc/swig/3.x.nix
+++ b/pkgs/development/tools/misc/swig/3.x.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages";
+ description = "An interface compiler that connects C/C++ code to higher-level languages";
homepage = "http://swig.org/";
# Different types of licenses available: http://www.swig.org/Release/LICENSE .
license = licenses.gpl3Plus;
diff --git a/pkgs/development/tools/nsis/default.nix b/pkgs/development/tools/nsis/default.nix
index 33be56c539dc..303ea6a00fe8 100644
--- a/pkgs/development/tools/nsis/default.nix
+++ b/pkgs/development/tools/nsis/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
installTargets = [ "install-compiler" ];
meta = with stdenv.lib; {
- description = "NSIS is a free scriptable win32 installer/uninstaller system that doesn't suck and isn't huge";
+ description = "A free scriptable win32 installer/uninstaller system that doesn't suck and isn't huge";
homepage = "https://nsis.sourceforge.io/";
license = licenses.zlib;
platforms = platforms.linux;
diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix
index 350407098a41..2ab8fa23dde0 100644
--- a/pkgs/development/tools/omniorb/default.nix
+++ b/pkgs/development/tools/omniorb/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
meta = with stdenv.lib; {
- description = "omniORB is a robust high performance CORBA ORB for C++ and Python. It is freely available under the terms of the GNU Lesser General Public License (for the libraries), and GNU General Public License (for the tools). omniORB is largely CORBA 2.6 compliant";
+ description = "A robust high performance CORBA ORB for C++ and Python. It is freely available under the terms of the GNU Lesser General Public License (for the libraries), and GNU General Public License (for the tools). omniORB is largely CORBA 2.6 compliant";
homepage = "http://omniorb.sourceforge.net/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ smironov ];
diff --git a/pkgs/development/tools/pgloader/default.nix b/pkgs/development/tools/pgloader/default.nix
index 94ba95b2d92f..6d4bcaadd118 100644
--- a/pkgs/development/tools/pgloader/default.nix
+++ b/pkgs/development/tools/pgloader/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = "https://pgloader.io/";
- description = "pgloader loads data into PostgreSQL and allows you to implement Continuous Migration from your current database to PostgreSQL";
+ description = "Loads data into PostgreSQL and allows you to implement Continuous Migration from your current database to PostgreSQL";
maintainers = with maintainers; [ mguentner ];
license = licenses.postgresql;
platforms = platforms.all;
diff --git a/pkgs/development/tools/reftools/default.nix b/pkgs/development/tools/reftools/default.nix
index 440d2f961337..a31108f33812 100644
--- a/pkgs/development/tools/reftools/default.nix
+++ b/pkgs/development/tools/reftools/default.nix
@@ -23,7 +23,7 @@ buildGoModule rec {
};
meta = with lib; {
- description = "reftools - refactoring tools for Go";
+ description = "Refactoring tools for Go";
homepage = "https://github.com/davidrjenni/reftools";
license = licenses.bsd2;
maintainers = with maintainers; [ kalbasit ];
diff --git a/pkgs/development/tools/xqilla/default.nix b/pkgs/development/tools/xqilla/default.nix
index 7d8029ee1f14..e97a6f1cdb78 100644
--- a/pkgs/development/tools/xqilla/default.nix
+++ b/pkgs/development/tools/xqilla/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-xerces=${xercesc}" ];
meta = with stdenv.lib; {
- description = "XQilla is an XQuery and XPath 2 library and command line utility written in C++, implemented on top of the Xerces-C library";
+ description = "An XQuery and XPath 2 library and command line utility written in C++, implemented on top of the Xerces-C library";
license = licenses.asl20 ;
maintainers = with maintainers; [ obadz ];
platforms = platforms.all;
diff --git a/pkgs/development/web/newman/default.nix b/pkgs/development/web/newman/default.nix
index ed4041ab76f0..6aa2413677c5 100644
--- a/pkgs/development/web/newman/default.nix
+++ b/pkgs/development/web/newman/default.nix
@@ -12,7 +12,7 @@ in
nodePackages.newman.override {
meta = with lib; {
homepage = "https://www.getpostman.com";
- description = "Newman is a command-line collection runner for Postman";
+ description = "A command-line collection runner for Postman";
maintainers = with maintainers; [ freezeboy ];
license = licenses.asl20;
};
diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix
index 0ff05556cdbb..5b3be969cf1e 100644
--- a/pkgs/games/chessx/default.nix
+++ b/pkgs/games/chessx/default.nix
@@ -48,7 +48,7 @@ mkDerivation rec {
meta = with stdenv.lib; {
homepage = "http://chessx.sourceforge.net/";
- description = "ChessX allows you to browse and analyse chess games";
+ description = "Browse and analyse chess games";
license = licenses.gpl2;
maintainers = [ maintainers.luispedro ];
platforms = platforms.linux;
diff --git a/pkgs/games/lugaru/default.nix b/pkgs/games/lugaru/default.nix
index 6620074418d1..d938c0316525 100644
--- a/pkgs/games/lugaru/default.nix
+++ b/pkgs/games/lugaru/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DSYSTEM_INSTALL=ON" ];
meta = {
- description = "Lugaru HD: Third person ninja rabbit fighting game";
+ description = "Third person ninja rabbit fighting game";
homepage = "https://osslugaru.gitlab.io";
maintainers = [ maintainers.genesis ];
platforms = platforms.linux;
diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix
index c34ca5dee957..b7ab42ed7307 100644
--- a/pkgs/games/megaglest/default.nix
+++ b/pkgs/games/megaglest/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
'';
meta = {
- description = "MegaGlest is an entertaining free (freeware and free software) and open source cross-platform 3D real-time strategy (RTS) game";
+ description = "An entertaining free (freeware and free software) and open source cross-platform 3D real-time strategy (RTS) game";
license = stdenv.lib.licenses.gpl3;
homepage = "http://megaglest.org/";
maintainers = [ stdenv.lib.maintainers.matejc ];
diff --git a/pkgs/games/pacvim/default.nix b/pkgs/games/pacvim/default.nix
index 4692c360378a..6e28753b4f31 100644
--- a/pkgs/games/pacvim/default.nix
+++ b/pkgs/games/pacvim/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
homepage = "https://github.com/jmoon018/PacVim";
- description = "PacVim is a game that teaches you vim commands";
+ description = "A game that teaches you vim commands";
maintainers = with maintainers; [ infinisil ];
license = licenses.lgpl3;
platforms = platforms.unix;
diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix
index 830d5bea36a0..82a3aa8c7bef 100644
--- a/pkgs/misc/frescobaldi/default.nix
+++ b/pkgs/misc/frescobaldi/default.nix
@@ -29,9 +29,9 @@ buildPythonApplication rec {
meta = with lib; {
homepage = "https://frescobaldi.org/";
- description = ''Frescobaldi is a LilyPond sheet music text editor'';
+ description = "A LilyPond sheet music text editor";
longDescription = ''
- Powerful text editor with syntax highlighting and automatic completion,
+ Powerful text editor with syntax highlighting and automatic completion,
Music view with advanced Point & Click, Midi player to proof-listen
LilyPond-generated MIDI files, Midi capturing to enter music,
Powerful Score Wizard to quickly setup a music score, Snippet Manager
diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix
index 735a2cd3b76f..f090156a85c0 100644
--- a/pkgs/misc/screensavers/betterlockscreen/default.nix
+++ b/pkgs/misc/screensavers/betterlockscreen/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "Betterlockscreen is a simple minimal lock screen which allows you to cache images with different filters and lockscreen with blazing speed";
+ description = "A simple minimal lock screen which allows you to cache images with different filters and lockscreen with blazing speed";
homepage = "https://github.com/pavanjadhaw/betterlockscreen";
license = licenses.mit;
platforms = platforms.linux;
diff --git a/pkgs/os-specific/linux/cpuset/default.nix b/pkgs/os-specific/linux/cpuset/default.nix
index 57cffe5f9e08..90352a944d5b 100644
--- a/pkgs/os-specific/linux/cpuset/default.nix
+++ b/pkgs/os-specific/linux/cpuset/default.nix
@@ -19,7 +19,7 @@ python2Packages.buildPythonApplication rec {
};
meta = with stdenv.lib; {
- description = "Cpuset is a Python application that forms a wrapper around the standard Linux filesystem calls to make using the cpusets facilities in the Linux kernel easier";
+ description = "Python application that forms a wrapper around the standard Linux filesystem calls to make using the cpusets facilities in the Linux kernel easier";
homepage = "https://github.com/wykurz/cpuset";
license = licenses.gpl2;
maintainers = with maintainers; [ wykurz ];
diff --git a/pkgs/servers/hitch/default.nix b/pkgs/servers/hitch/default.nix
index 89aa63f35bdc..d049317c031a 100644
--- a/pkgs/servers/hitch/default.nix
+++ b/pkgs/servers/hitch/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
passthru.tests.hitch = nixosTests.hitch;
meta = with stdenv.lib; {
- description = "Hitch is a libev-based high performance SSL/TLS proxy by Varnish Software";
+ description = "Libev-based high performance SSL/TLS proxy by Varnish Software";
homepage = "https://hitch-tls.org/";
license = licenses.bsd2;
maintainers = [ maintainers.jflanglois ];
diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix
index c5c284b7f02f..10f0f248a805 100644
--- a/pkgs/servers/monitoring/longview/default.nix
+++ b/pkgs/servers/monitoring/longview/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = "https://www.linode.com/longview";
- description = "Longview collects all of your system-level metrics and sends them to Linode";
+ description = "Collects all of your system-level metrics and sends them to Linode";
license = licenses.gpl2Plus;
maintainers = [ maintainers.rvl ];
inherit version;
diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix
index 76ce8d2d5733..4095b95ad96e 100644
--- a/pkgs/servers/news/leafnode/default.nix
+++ b/pkgs/servers/news/leafnode/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
meta = {
homepage = "http://leafnode.sourceforge.net/";
- description = "Leafnode implements a store & forward NNTP proxy";
+ description = "Implementation of a store & forward NNTP proxy";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
};
diff --git a/pkgs/servers/openbgpd/default.nix b/pkgs/servers/openbgpd/default.nix
index d753cb47a688..7ca71c127754 100644
--- a/pkgs/servers/openbgpd/default.nix
+++ b/pkgs/servers/openbgpd/default.nix
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "OpenBGPD is a FREE implementation of the Border Gateway Protocol, Version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol";
+ description = "A free implementation of the Border Gateway Protocol, Version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol";
license = licenses.isc;
homepage = "http://www.openbgpd.org/";
maintainers = with maintainers; [ kloenk ];
diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix
index 301160ce1324..70cbb656e0af 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation {
'';
meta = {
- description = ''
+ description = "An extension to support similarity queries on PostgreSQL";
+ longDescription = ''
pg_similarity is an extension to support similarity queries on PostgreSQL. The implementation
is tightly integrated in the RDBMS in the sense that it defines operators so instead of the traditional
operators (= and <>) you can use ~~~ and ~!~ (any of these operators represents a similarity function).
diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix
index d86c70984019..69f46ba3e905 100644
--- a/pkgs/servers/sql/postgresql/ext/pgtap.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "pgTAP is a unit testing framework for PostgreSQL";
+ description = "A unit testing framework for PostgreSQL";
longDescription = ''
pgTAP is a unit testing framework for PostgreSQL written in PL/pgSQL and PL/SQL.
It includes a comprehensive collection of TAP-emitting assertion functions,
diff --git a/pkgs/servers/web-apps/jirafeau/default.nix b/pkgs/servers/web-apps/jirafeau/default.nix
index e0b119da6d86..1f3dd2e90124 100644
--- a/pkgs/servers/web-apps/jirafeau/default.nix
+++ b/pkgs/servers/web-apps/jirafeau/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "Jirafeau is a web site permitting to upload a file in a simple way and give an unique link to it";
+ description = "Website permitting upload of a file in a simple way and giving a unique link to it";
license = licenses.agpl3;
homepage = "https://gitlab.com/mojo42/Jirafeau";
platforms = platforms.all;
diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix
index 2e97ab31725e..aa2a9fc92588 100644
--- a/pkgs/servers/web-apps/sogo/default.nix
+++ b/pkgs/servers/web-apps/sogo/default.nix
@@ -67,7 +67,7 @@ with lib; gnustep.stdenv.mkDerivation rec {
'';
meta = {
- description = "SOGo is a very fast and scalable modern collaboration suite (groupware)";
+ description = "A very fast and scalable modern collaboration suite (groupware)";
license = with licenses; [ gpl2 lgpl21 ];
homepage = "https://sogo.nu/";
platforms = platforms.linux;
diff --git a/pkgs/shells/es/default.nix b/pkgs/shells/es/default.nix
index 761846843fea..992fdc93dcb3 100644
--- a/pkgs/shells/es/default.nix
+++ b/pkgs/shells/es/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
configureFlags = [ "--with-readline" ];
meta = with stdenv.lib; {
- description = "Es is an extensible shell";
+ description = "An extensible shell with higher order functions";
longDescription =
''
Es is an extensible shell. The language was derived
diff --git a/pkgs/tools/X11/x11spice/default.nix b/pkgs/tools/X11/x11spice/default.nix
index 23af2ac44ca6..33bc9110848e 100644
--- a/pkgs/tools/X11/x11spice/default.nix
+++ b/pkgs/tools/X11/x11spice/default.nix
@@ -24,10 +24,7 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = "-lpthread";
meta = with stdenv.lib; {
- description = ''
- x11spice will enable a running X11 desktop to be available
- via a Spice server
- '';
+ description = "Enable a running X11 desktop to be available via a Spice server";
homepage = "https://gitlab.freedesktop.org/spice/x11spice";
platforms = platforms.linux;
license = licenses.gpl3;
diff --git a/pkgs/tools/admin/oxidized/default.nix b/pkgs/tools/admin/oxidized/default.nix
index 01129c5afb10..022b304a8459 100644
--- a/pkgs/tools/admin/oxidized/default.nix
+++ b/pkgs/tools/admin/oxidized/default.nix
@@ -11,7 +11,7 @@ bundlerApp {
passthru.updateScript = bundlerUpdateScript "oxidized";
meta = with lib; {
- description = "Oxidized is a network device configuration backup tool. It's a RANCID replacement!";
+ description = "A network device configuration backup tool. It's a RANCID replacement!";
homepage = "https://github.com/ytti/oxidized";
license = licenses.asl20;
maintainers = with maintainers; [ willibutz nicknovitski ];
diff --git a/pkgs/tools/backup/dirvish/default.nix b/pkgs/tools/backup/dirvish/default.nix
index 9b138d48f213..c762da1a5fcb 100644
--- a/pkgs/tools/backup/dirvish/default.nix
+++ b/pkgs/tools/backup/dirvish/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "Dirvish is a fast, disk based, rotating network backup system";
+ description = "Fast, disk based, rotating network backup system";
homepage = "http://dirvish.org/";
license = stdenv.lib.licenses.osl2;
platforms = platforms.linux;
diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix
index 5cf88288d813..0b6082bb5780 100644
--- a/pkgs/tools/compression/xz/default.nix
+++ b/pkgs/tools/compression/xz/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = "https://tukaani.org/xz/";
- description = "XZ, general-purpose data compression software, successor of LZMA";
+ description = "A general-purpose data compression software, successor of LZMA";
longDescription =
'' XZ Utils is free general-purpose data compression software with high
diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/tools/filesystems/httpfs/default.nix
index d97b05abb6c7..23edb8175799 100644
--- a/pkgs/tools/filesystems/httpfs/default.nix
+++ b/pkgs/tools/filesystems/httpfs/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- description = "HTTPFS2, a FUSE-based HTTP file system for Linux";
+ description = "FUSE-based HTTP filesystem for Linux";
homepage = "http://httpfs.sourceforge.net/";
diff --git a/pkgs/tools/graphics/optar/default.nix b/pkgs/tools/graphics/optar/default.nix
index 4eee8acb9798..3061a5cebaf9 100644
--- a/pkgs/tools/graphics/optar/default.nix
+++ b/pkgs/tools/graphics/optar/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
'';
meta = with stdenv.lib; {
- description = "Optar stands for OPTical ARchiver - it's a codec for encoding data on paper";
+ description = "OPTical ARchiver - it's a codec for encoding data on paper";
homepage = "http://ronja.twibright.com/optar/";
license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg ];
diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix
index ec8106e922ae..52e74e5babf5 100644
--- a/pkgs/tools/misc/logstash/6.x.nix
+++ b/pkgs/tools/misc/logstash/6.x.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems";
+ description = "A data pipeline that helps you process logs and other event data from a variety of systems";
homepage = "https://www.elastic.co/products/logstash";
license = if enableUnfree then licenses.elastic else licenses.asl20;
platforms = platforms.unix;
diff --git a/pkgs/tools/misc/shallot/default.nix b/pkgs/tools/misc/shallot/default.nix
index e8ab6168541c..84e241b7a2c9 100644
--- a/pkgs/tools/misc/shallot/default.nix
+++ b/pkgs/tools/misc/shallot/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- description = "Shallot allows you to create customized .onion addresses for your hidden service";
+ description = "Allows you to create customized .onion addresses for your hidden service";
license = stdenv.lib.licenses.mit;
homepage = "https://github.com/katmagic/Shallot";
diff --git a/pkgs/tools/misc/wootility/default.nix b/pkgs/tools/misc/wootility/default.nix
index cc192951ca84..a79f414a3591 100644
--- a/pkgs/tools/misc/wootility/default.nix
+++ b/pkgs/tools/misc/wootility/default.nix
@@ -35,7 +35,7 @@ appimageTools.wrapType2 rec {
meta = with lib; {
homepage = "https://wooting.io/wootility";
- description = "Wootility is customization and management software for Wooting keyboards";
+ description = "A customization and management software for Wooting keyboards";
platforms = [ "x86_64-linux" ];
license = "unknown";
maintainers = with maintainers; [ davidtwco ];
diff --git a/pkgs/tools/networking/bukubrow/default.nix b/pkgs/tools/networking/bukubrow/default.nix
index b8f2d70848d5..ed8a6088db07 100644
--- a/pkgs/tools/networking/bukubrow/default.nix
+++ b/pkgs/tools/networking/bukubrow/default.nix
@@ -39,7 +39,7 @@ in rustPlatform.buildRustPackage rec {
'';
meta = with stdenv.lib; {
- description = "Bukubrow is a WebExtension for Buku, a command-line bookmark manager";
+ description = "A WebExtension for Buku, a command-line bookmark manager";
homepage = "https://github.com/SamHH/bukubrow-host";
license = licenses.gpl3;
maintainers = with maintainers; [ infinisil ];
diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix
index 4ab266e54959..38331163c122 100644
--- a/pkgs/tools/networking/corerad/default.nix
+++ b/pkgs/tools/networking/corerad/default.nix
@@ -33,7 +33,7 @@ buildGoModule rec {
meta = with stdenv.lib; {
homepage = "https://github.com/mdlayher/corerad";
- description = "CoreRAD extensible and observable IPv6 NDP RA daemon";
+ description = "Extensible and observable IPv6 NDP RA daemon";
license = licenses.asl20;
maintainers = with maintainers; [ mdlayher ];
};
diff --git a/pkgs/tools/networking/curlie/default.nix b/pkgs/tools/networking/curlie/default.nix
index f8147cb16115..542bb888bfe5 100644
--- a/pkgs/tools/networking/curlie/default.nix
+++ b/pkgs/tools/networking/curlie/default.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
doCheck = false;
meta = with lib; {
- description = "Curlie is a frontend to curl that adds the ease of use of httpie, without compromising on features and performance";
+ description = "Frontend to curl that adds the ease of use of httpie, without compromising on features and performance";
homepage = "https://curlie.io/";
maintainers = with maintainers; [ ma27 ];
license = licenses.mit;
diff --git a/pkgs/tools/networking/dnstracer/default.nix b/pkgs/tools/networking/dnstracer/default.nix
index b0369ec80bd4..558e0dca9034 100644
--- a/pkgs/tools/networking/dnstracer/default.nix
+++ b/pkgs/tools/networking/dnstracer/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lresolv";
meta = with stdenv.lib; {
- description = "Dnstracer determines where a given Domain Name Server (DNS) gets its information from, and follows the chain of DNS servers back to the servers which know the data";
+ description = "Determines where a given Domain Name Server (DNS) gets its information from, and follows the chain of DNS servers back to the servers which know the data";
homepage = "http://www.mavetju.org/unix/general.php";
license = licenses.bsd2;
maintainers = with maintainers; [ andir ];
diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix
index 441019103716..7a5ceda96694 100644
--- a/pkgs/tools/networking/driftnet/default.nix
+++ b/pkgs/tools/networking/driftnet/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
};
meta = {
- description = "Driftnet watches network traffic, and picks out and displays JPEG and GIF images for display";
+ description = "Watches network traffic, and picks out and displays JPEG and GIF images for display";
homepage = "https://github.com/deiv/driftnet";
maintainers = with maintainers; [ offline ];
platforms = platforms.linux;
diff --git a/pkgs/tools/networking/goreplay/default.nix b/pkgs/tools/networking/goreplay/default.nix
index 86548bf99597..0859472a446f 100644
--- a/pkgs/tools/networking/goreplay/default.nix
+++ b/pkgs/tools/networking/goreplay/default.nix
@@ -19,7 +19,7 @@ buildGoPackage rec {
meta = {
homepage = "https://github.com/buger/goreplay";
license = stdenv.lib.licenses.lgpl3Only;
- description = "GoReplay is an open-source tool for capturing and replaying live HTTP traffic";
+ description = "Open-source tool for capturing and replaying live HTTP traffic";
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ lovek323 ];
};
diff --git a/pkgs/tools/networking/maxscale/default.nix b/pkgs/tools/networking/maxscale/default.nix
index 48590a9e3059..9036e07e7f3f 100644
--- a/pkgs/tools/networking/maxscale/default.nix
+++ b/pkgs/tools/networking/maxscale/default.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = ''MaxScale database proxy extends MariaDB Server's high availability'';
+ description = "MaxScale database proxy extends MariaDB Server's high availability";
homepage = "https://mariadb.com/products/technology/maxscale";
license = licenses.bsl11;
platforms = platforms.linux;
diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok-2/default.nix
index d9c1acc374c0..3c1e0f498fba 100644
--- a/pkgs/tools/networking/ngrok-2/default.nix
+++ b/pkgs/tools/networking/ngrok-2/default.nix
@@ -35,10 +35,7 @@ stdenv.mkDerivation {
passthru.updateScript = ./update.sh;
meta = {
- description = "ngrok";
- longDescription = ''
- Allows you to expose a web server running on your local machine to the internet.
- '';
+ description = "Allows you to expose a web server running on your local machine to the internet";
homepage = "https://ngrok.com/";
license = licenses.unfree;
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
diff --git a/pkgs/tools/networking/pmacct/default.nix b/pkgs/tools/networking/pmacct/default.nix
index 2bb6f373727d..4ef3cd6345e5 100644
--- a/pkgs/tools/networking/pmacct/default.nix
+++ b/pkgs/tools/networking/pmacct/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
++ optional withMysql "--enable-mysql";
meta = with stdenv.lib; {
- description = "pmacct is a small set of multi-purpose passive network monitoring tools";
+ description = "A small set of multi-purpose passive network monitoring tools";
longDescription = ''
pmacct is a small set of multi-purpose passive network monitoring tools
[NetFlow IPFIX sFlow libpcap BGP BMP RPKI IGP Streaming Telemetry]
diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix
index b492b5a226ba..d7578c4adda8 100644
--- a/pkgs/tools/networking/ssldump/default.nix
+++ b/pkgs/tools/networking/ssldump/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
"--with-openssl-lib=${openssl}/lib"
"--with-openssl-inc=${openssl}/include" ];
meta = {
- description = "ssldump is an SSLv3/TLS network protocol analyzer";
+ description = "An SSLv3/TLS network protocol analyzer";
homepage = "http://ssldump.sourceforge.net";
license = "BSD-style";
maintainers = with stdenv.lib.maintainers; [ aycanirican ];
diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix
index 1a75fa43d4e8..61e4a897f48d 100644
--- a/pkgs/tools/package-management/morph/default.nix
+++ b/pkgs/tools/package-management/morph/default.nix
@@ -35,7 +35,7 @@ buildGoPackage rec {
outputs = [ "out" "lib" ];
meta = with lib; {
- description = "Morph is a NixOS host manager written in Golang";
+ description = "A NixOS host manager written in Golang";
license = licenses.mit;
homepage = "https://github.com/dbcdk/morph";
maintainers = with maintainers; [adamt johanot];
diff --git a/pkgs/tools/security/acsccid/default.nix b/pkgs/tools/security/acsccid/default.nix
index 3e61b124fef3..53842cbb1fc4 100644
--- a/pkgs/tools/security/acsccid/default.nix
+++ b/pkgs/tools/security/acsccid/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "acsccid is a PC/SC driver for Linux/Mac OS X and it supports ACS CCID smart card readers";
+ description = "A PC/SC driver for Linux/Mac OS X and it supports ACS CCID smart card readers";
longDescription = ''
acsccid is a PC/SC driver for Linux/Mac OS X and it supports ACS CCID smart card
readers. This library provides a PC/SC IFD handler implementation and
diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/tools/security/fpm2/default.nix
index aff4e1ee1ec4..2f297ffd6b79 100644
--- a/pkgs/tools/security/fpm2/default.nix
+++ b/pkgs/tools/security/fpm2/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gnupg gtk2 libxml2 intltool ];
meta = {
- description = "FPM2 is GTK2 port from Figaro's Password Manager originally developed by John Conneely, with some new enhancements";
+ description = "GTK2 port from Figaro's Password Manager originally developed by John Conneely, with some new enhancements";
homepage = "https://als.regnet.cz/fpm2/";
license = licenses.gpl2;
platforms = platforms.linux;
diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix
index 15797fc86650..020f37c836ba 100644
--- a/pkgs/tools/security/notary/default.nix
+++ b/pkgs/tools/security/notary/default.nix
@@ -36,7 +36,7 @@ buildGoPackage rec {
'';
meta = with stdenv.lib; {
- description = "Notary is a project that allows anyone to have trust over arbitrary collections of data";
+ description = "A project that allows anyone to have trust over arbitrary collections of data";
longDescription = ''
The Notary project comprises a server and a client for running and
interacting with trusted collections. See the service architecture
diff --git a/pkgs/tools/security/sshguard/default.nix b/pkgs/tools/security/sshguard/default.nix
index 6c2298f6729f..6bae0fddc23d 100644
--- a/pkgs/tools/security/sshguard/default.nix
+++ b/pkgs/tools/security/sshguard/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--sysconfdir=/etc" ];
meta = with stdenv.lib; {
- description = "SSHGuard protects hosts from brute-force attacks";
+ description = "Protects hosts from brute-force attacks";
longDescription = ''
SSHGuard can read log messages from various input sources. Log messages are parsed, line-by-line, for recognized patterns.
If an attack, such as several login failures within a few seconds, is detected, the offending IP is blocked.
diff --git a/pkgs/tools/system/daemon/default.nix b/pkgs/tools/system/daemon/default.nix
index fb06247f9843..6763b476f303 100644
--- a/pkgs/tools/system/daemon/default.nix
+++ b/pkgs/tools/system/daemon/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
buildInputs = [ perl ];
meta = {
- description = "Daemon turns other process into daemons";
+ description = "Turns other processes into daemons";
longDescription = ''
Daemon turns other process into daemons. There are many tasks that need
to be performed to correctly set up a daemon process. This can be tedious.
diff --git a/pkgs/tools/system/jump/default.nix b/pkgs/tools/system/jump/default.nix
index d8e838dd3607..d91df3232c8a 100644
--- a/pkgs/tools/system/jump/default.nix
+++ b/pkgs/tools/system/jump/default.nix
@@ -28,7 +28,7 @@ buildGoModule rec {
'';
meta = with lib; {
- description = "Jump helps you navigate faster by learning your habits";
+ description = "Navigate directories faster by learning your habits";
longDescription = ''
Jump integrates with the shell and learns about your
navigational habits by keeping track of the directories you visit. It
diff --git a/pkgs/tools/system/testdisk/default.nix b/pkgs/tools/system/testdisk/default.nix
index 223d1102e0d4..bbece24bf655 100644
--- a/pkgs/tools/system/testdisk/default.nix
+++ b/pkgs/tools/system/testdisk/default.nix
@@ -46,7 +46,7 @@ assert enableQt -> qwt != null;
meta = with stdenv.lib; {
homepage = "https://www.cgsecurity.org/wiki/Main_Page";
downloadPage = "https://www.cgsecurity.org/wiki/TestDisk_Download";
- description = "Testdisk / Photorec - Data recovery utilities";
+ description = "Data recovery utilities";
longDescription = ''
TestDisk is a powerful free data recovery software. It was primarily
designed to help recover lost partitions and/or make non-booting disks
diff --git a/pkgs/tools/text/jsawk/default.nix b/pkgs/tools/text/jsawk/default.nix
index 51075c2ce174..a9b9e7884021 100644
--- a/pkgs/tools/text/jsawk/default.nix
+++ b/pkgs/tools/text/jsawk/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
'';
meta = {
- description = "Jsawk is like awk, but for JSON";
+ description = "Like awk, but for JSON";
homepage = "https://github.com/micha/jsawk";
license = stdenv.lib.licenses.publicDomain;
maintainers = with stdenv.lib.maintainers; [ puffnfresh ];
diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix
index bf082abadbce..3bacd53c7136 100644
--- a/pkgs/tools/text/miller/default.nix
+++ b/pkgs/tools/text/miller/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook flex libtool ];
meta = with stdenv.lib; {
- description = "Miller is like awk, sed, cut, join, and sort for name-indexed data such as CSV, TSV, and tabular JSON";
+ description = "Like awk, sed, cut, join, and sort for name-indexed data such as CSV, TSV, and tabular JSON";
homepage = "http://johnkerl.org/miller/";
license = licenses.bsd2;
maintainers = with maintainers; [ mstarzyk ];
diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/tools/text/sift/default.nix
index 5a36de5f7202..dc025f17a78b 100644
--- a/pkgs/tools/text/sift/default.nix
+++ b/pkgs/tools/text/sift/default.nix
@@ -17,7 +17,7 @@ buildGoPackage rec {
goDeps = ./deps.nix;
meta = with lib; {
- description = "sift is a fast and powerful alternative to grep";
+ description = "A fast and powerful alternative to grep";
homepage = "https://sift-tool.org";
maintainers = [ maintainers.carlsverre ];
license = licenses.gpl3;
diff --git a/pkgs/tools/typesetting/asciidoctorj/default.nix b/pkgs/tools/typesetting/asciidoctorj/default.nix
index 800ac692ff51..08351dd6f3e9 100644
--- a/pkgs/tools/typesetting/asciidoctorj/default.nix
+++ b/pkgs/tools/typesetting/asciidoctorj/default.nix
@@ -19,9 +19,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = ''
- AsciidoctorJ is the official library for running Asciidoctor on the JVM.
- '';
+ description = "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
diff --git a/pkgs/tools/typesetting/ted/default.nix b/pkgs/tools/typesetting/ted/default.nix
index 25e9dce242f3..6d7ef3348613 100644
--- a/pkgs/tools/typesetting/ted/default.nix
+++ b/pkgs/tools/typesetting/ted/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig zlib pcre xorg.xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper makeWrapper ];
meta = with stdenv.lib; {
- description = "Ted, an easy rich text processor";
+ description = "An easy rich text processor";
longDescription = ''
Ted is a text processor running under X Windows on Unix/Linux systems.
Ted was developed as a standard easy light weight word processor, having
From 3088dcb148e8110aa6102e8c3a2c7ee5af1348f1 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 27 Oct 2020 14:29:02 -0400
Subject: [PATCH 321/590] linux: 5.9-rc8 -> 5.10-rc1
---
pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
pkgs/os-specific/linux/kernel/manual-config.nix | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index b056568b1663..29f1aad2e485 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -3,15 +3,15 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.9-rc8";
- extraMeta.branch = "5.9";
+ version = "5.10-rc1";
+ extraMeta.branch = "5.10";
# modDirVersion needs to be x.y.z, will always add .0
modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg;
src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
- sha256 = "0yhjanmrg0cjmdn7yq8nx0h7q3aq9cimqhn9k4nis1a976p8wpgw";
+ sha256 = "1s4ywf93xrlkjjq3c4142qhmsvx3kl0xwkbc09ss6gln8lwqnga8";
};
# Should the testing kernels ever be built on Hydra?
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 92dc334135ad..7a91705b617c 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -233,10 +233,10 @@ let
rm -fR drivers
# Keep all headers
- find . -type f -name '*.h' -print0 | xargs -0 chmod u-w
+ find . -type f -name '*.h' -print0 | xargs -0 -r chmod u-w
# Keep linker scripts (they are required for out-of-tree modules on aarch64)
- find . -type f -name '*.lds' -print0 | xargs -0 chmod u-w
+ find . -type f -name '*.lds' -print0 | xargs -0 -r chmod u-w
# Keep root and arch-specific Makefiles
chmod u-w Makefile
@@ -246,7 +246,7 @@ let
chmod u-w -R scripts
# Delete everything not kept
- find . -type f -perm -u=w -print0 | xargs -0 rm
+ find . -type f -perm -u=w -print0 | xargs -0 -r rm
# Delete empty directories
find -empty -type d -delete
From 3f9dfc12f37dc20ef38e584127bc4d8c1c288a21 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 27 Oct 2020 20:00:03 +0100
Subject: [PATCH 322/590] blueman: 2.1.3 -> 2.1.4
Fixes: CVE-2020-15238
https://github.com/blueman-project/blueman/security/advisories/GHSA-jpc9-mgw6-2xwx
---
pkgs/tools/bluetooth/blueman/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index aa8693b365a0..ac50f3667c4e 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -9,11 +9,11 @@ let
in stdenv.mkDerivation rec {
pname = "blueman";
- version = "2.1.3";
+ version = "2.1.4";
src = fetchurl {
url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz";
- sha256 = "1pngqbwapbvywhkmflapqvs0wa0af7d1a87wy56l5hg2r462xl1v";
+ sha256 = "1nk46s1s8yrlqv37sc7la05nnn7sdgqhkrcdm98qin34llwkv70x";
};
nativeBuildInputs = [
From 91b55655edf763da49e90a837a14ef8fee7b6812 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Tue, 27 Oct 2020 20:05:34 +0100
Subject: [PATCH 323/590] nginxMainline: 1.19.3 -> 1.19.4
---
pkgs/servers/http/nginx/mainline.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix
index 934506c45ca9..7b7de1a00f4a 100644
--- a/pkgs/servers/http/nginx/mainline.nix
+++ b/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
{ callPackage, ... }@args:
callPackage ./generic.nix args {
- version = "1.19.3";
- sha256 = "1w4dkq7bl5gyix3x0ap3d9lndh7zyvc3mscl693d4ybql57vgrci";
+ version = "1.19.4";
+ sha256 = "03h0hhrbfy3asla9gki2cp97zjn7idxbp5lk9xi0snlh4xlm9pv1";
}
From a857d5c4b2c3d90c35a346b8d7d335e21b9e9652 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Tue, 27 Oct 2020 19:53:00 +0000
Subject: [PATCH 324/590] deno: remove test bin and lib
---
pkgs/development/web/deno/default.nix | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix
index 45606151e28d..22e7d93188e5 100644
--- a/pkgs/development/web/deno/default.nix
+++ b/pkgs/development/web/deno/default.nix
@@ -54,6 +54,9 @@ rustPlatform.buildRustPackage rec {
# TODO: Move to enhanced installShellCompletion when merged: PR #83630
postInstall = ''
+ # remove test plugin and test server
+ rm -rf $out/lib $out/bin/test_server
+
$out/bin/deno completions bash > deno.bash
$out/bin/deno completions fish > deno.fish
$out/bin/deno completions zsh > _deno
From cb5811070306ccb558113fdec0068ccf9d9568b6 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Mon, 14 Sep 2020 11:25:41 +0000
Subject: [PATCH 325/590] deno: 1.3.3 -> 1.4.0
---
pkgs/development/web/deno/default.nix | 6 +++---
pkgs/development/web/deno/deps.nix | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix
index 22e7d93188e5..89d365015d7f 100644
--- a/pkgs/development/web/deno/default.nix
+++ b/pkgs/development/web/deno/default.nix
@@ -18,16 +18,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "deno";
- version = "1.3.3";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
- sha256 = "0jbnx23f1323sh1rfx8rza2pzr4li4199wblrl4vw4zp5hj4qnkm";
+ sha256 = "0552sz7b4r99wi92r18n877wdz06wl3gj09hjkdld599ml7yhn3q";
fetchSubmodules = true;
};
- cargoSha256 = "08zi3ynbi44rdgid9qalgsb5g8dcwclr6ynwxvhi8r0v5i7swwrx";
+ cargoSha256 = "0ki5ndkmwn9af620njndp6zy9kirn6j6gvv8bh0z9433sk4prgmi";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/development/web/deno/deps.nix b/pkgs/development/web/deno/deps.nix
index f6baca6fb016..ccff7ef35a21 100644
--- a/pkgs/development/web/deno/deps.nix
+++ b/pkgs/development/web/deno/deps.nix
@@ -2,11 +2,11 @@
{}:
rec {
rustyV8Lib = {
- version = "0.9.1";
+ version = "0.10.0";
sha256s = {
- x86_64-linux = "07zph4x3k659ywld27b60as7j06bdbab2ws1pf67iwg7w6h7iash";
- aarch64-linux = "0w9mbsdpkrla3ayaswpdjhiqs74h23qi2sv9355h138pw431ymnx";
- x86_64-darwin = "091kzdg431lvkvcy0401di3if53pii0isk5ipfpsvic82kr7vaqk";
+ x86_64-linux = "0m40a4w0a985vvm6a8xjy6jh5032hmra2r8dl9jasi2v62g5pcaq";
+ aarch64-linux = "1d80svhhk0x2qa9qaal4vdpq84sq0y90f1spgk62jgaja77zb8fj";
+ x86_64-darwin = "1rrlza780pqklspvywz6di0933j5pyrp6bpxswsrzpx1cv0bjmx7";
};
};
}
From 2b354c77e9c61943a2865dc177777943b9655906 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Tue, 27 Oct 2020 17:02:38 +0000
Subject: [PATCH 326/590] deno: 1.4.0 -> 1.5.0
---
pkgs/development/web/deno/default.nix | 6 +++---
pkgs/development/web/deno/deps.nix | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix
index 89d365015d7f..b932e1b550cf 100644
--- a/pkgs/development/web/deno/default.nix
+++ b/pkgs/development/web/deno/default.nix
@@ -18,16 +18,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "deno";
- version = "1.4.0";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
- sha256 = "0552sz7b4r99wi92r18n877wdz06wl3gj09hjkdld599ml7yhn3q";
+ sha256 = "1kl3s5kv3wwh4br6zf0f56bffzjwhgzga93zg39mqry8jvwxp6dx";
fetchSubmodules = true;
};
- cargoSha256 = "0ki5ndkmwn9af620njndp6zy9kirn6j6gvv8bh0z9433sk4prgmi";
+ cargoSha256 = "1m3wd2gjy2b8a3x9wm49n9z02165afv4c3n13pnqsxcqmd9a764f";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/development/web/deno/deps.nix b/pkgs/development/web/deno/deps.nix
index ccff7ef35a21..09c7b3973d9a 100644
--- a/pkgs/development/web/deno/deps.nix
+++ b/pkgs/development/web/deno/deps.nix
@@ -2,11 +2,11 @@
{}:
rec {
rustyV8Lib = {
- version = "0.10.0";
+ version = "0.12.0";
sha256s = {
- x86_64-linux = "0m40a4w0a985vvm6a8xjy6jh5032hmra2r8dl9jasi2v62g5pcaq";
- aarch64-linux = "1d80svhhk0x2qa9qaal4vdpq84sq0y90f1spgk62jgaja77zb8fj";
- x86_64-darwin = "1rrlza780pqklspvywz6di0933j5pyrp6bpxswsrzpx1cv0bjmx7";
+ x86_64-linux = "18pim960fh18wrdkhirlj4hnnbxrk172r7yksdn2k5z9lgccighg";
+ aarch64-linux = "0d1c8kcz44n1mqprspnshzbqlqw7mq7vryxpmd49gw3fvhcy66y7";
+ x86_64-darwin = "1pc2dfq8p1a8dahkc4g8r6b9zwnvds60zc2lgbf8cj5n0ijd06y1";
};
};
}
From 4166a767de33bf1abb22d099698eba83bcf4769a Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Tue, 27 Oct 2020 21:11:22 +0100
Subject: [PATCH 327/590] doc: improve 20.09 release notes
---
nixos/doc/manual/release-notes/rl-2009.xml | 151 +++++++++---------
.../modules/services/web-apps/engelsystem.nix | 2 +-
pkgs/servers/web-apps/engelsystem/default.nix | 2 +-
3 files changed, 75 insertions(+), 80 deletions(-)
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index f7a0936ce150..89cb11b56643 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -50,7 +50,7 @@
</listitem>
<listitem>
<para>
- Desktop Enironments:
+ Desktop Environments:
</para>
<itemizedlist>
<listitem>
@@ -65,7 +65,7 @@
</listitem>
<listitem>
<para>
- gnome3: 3.34 -> 3.36, see its <link xlink:href="https://help.gnome.org/misc/release-notes/3.36/">release notes</link>.
+ gnome3: 3.34 -> 3.36, see its <link xlink:href="https://help.gnome.org/misc/release-notes/3.36/">release notes</link>
</para>
</listitem>
<listitem>
@@ -75,7 +75,7 @@
</listitem>
<listitem>
<para>
- NixOS now distributes an official <link xlink:href="https://nixos.org/download.html#nixos-iso">GNOME ISO</link>.
+ NixOS now distributes an official <link xlink:href="https://nixos.org/download.html#nixos-iso">GNOME ISO</link>
</para>
</listitem>
</itemizedlist>
@@ -89,28 +89,28 @@
<listitem>
<para>
- Agda ecosystem was heavily reworked (see more details below).
+ Agda ecosystem was heavily reworked (see more details below)
</para>
</listitem>
<listitem>
<para>
- PHP now defaults to PHP 7.4, updated from 7.3.
+ PHP now defaults to PHP 7.4, updated from 7.3
</para>
</listitem>
<listitem>
<para>
- PHP 7.2 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 20.09 release.
+ PHP 7.2 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 20.09 release
</para>
</listitem>
<listitem>
<para>
- Python 3 now defaults to Python 3.8 instead of 3.7.
+ Python 3 now defaults to Python 3.8 instead of 3.7
</para>
</listitem>
<listitem>
<para>
- Python 3.5 has reached its upstream EOL at the end of September 2020: it
- has been removed from the list of available packages.
+ Python 3.5 reached its upstream EOL at the end of September 2020: it
+ has been removed from the list of available packages
</para>
</listitem>
</itemizedlist>
@@ -156,7 +156,7 @@
</listitem>
<listitem>
<para>
- There is a new module for Podman(<varname>virtualisation.podman</varname>), a drop-in replacement for the Docker command line.
+ There is a new module for Podman (<varname>virtualisation.podman</varname>), a drop-in replacement for the Docker command line.
</para>
</listitem>
<listitem>
@@ -191,7 +191,7 @@
</listitem>
<listitem>
<para>
- Support for built-in LCDs in various pieces of Logitech hardware (keyboards and USB speakers). <varname>hardware.logitech.lcd.enable</varname> enables support for all hardware supported by the g15daemon project.
+ Support for built-in LCDs in various pieces of Logitech hardware (keyboards and USB speakers). <varname>hardware.logitech.lcd.enable</varname> enables support for all hardware supported by the <link xlink:href="https://sourceforge.net/projects/g15daemon/">g15daemon project</link>.
</para>
</listitem>
<listitem>
@@ -200,7 +200,7 @@
allows to restrict non-default entries in the boot menu to one or more
users. The users and passwords are defined via the option
<option>boot.loader.grub.users</option>.
- Note: Password support is only avaiable in GRUB version 2.
+ Note: Password support is only available in GRUB version 2.
</para>
</listitem>
</itemizedlist>
@@ -257,27 +257,27 @@
<itemizedlist>
<listitem>
<para>
- <xref linkend="opt-hardware.system76.firmware-daemon.enable" /> adds easy support of system76 firmware.
+ <xref linkend="opt-hardware.system76.firmware-daemon.enable" /> adds easy support of system76 firmware
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-hardware.uinput.enable" /> loads uinput kernel module.
+ <xref linkend="opt-hardware.uinput.enable" /> loads uinput kernel module
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-hardware.video.hidpi.enable" /> enable good defaults for HiDPI displays.
+ <xref linkend="opt-hardware.video.hidpi.enable" /> enable good defaults for HiDPI displays
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-hardware.wooting.enable" /> support for Wooting keyboards.
+ <xref linkend="opt-hardware.wooting.enable" /> support for Wooting keyboards
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-hardware.xpadneo.enable" /> xpadneo driver for Xbox One wireless controllers.
+ <xref linkend="opt-hardware.xpadneo.enable" /> xpadneo driver for Xbox One wireless controllers
</para>
</listitem>
</itemizedlist>
@@ -289,12 +289,12 @@
<itemizedlist>
<listitem>
<para>
- <xref linkend="opt-programs.hamster.enable" /> enable hamster time tracking.
+ <xref linkend="opt-programs.hamster.enable" /> enable hamster time tracking
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-programs.steam.enable" /> adds easy enablement of steam and related system configuration.
+ <xref linkend="opt-programs.steam.enable" /> adds easy enablement of steam and related system configuration
</para>
</listitem>
</itemizedlist>
@@ -306,12 +306,12 @@
<itemizedlist>
<listitem>
<para>
- <xref linkend="opt-security.doas.enable" /> alternative to sudo, allows non-root users to execute commands as root.
+ <xref linkend="opt-security.doas.enable" /> alternative to sudo, allows non-root users to execute commands as root
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-security.tpm2.enable" /> add Trusted Platform Module 2 support.
+ <xref linkend="opt-security.tpm2.enable" /> add Trusted Platform Module 2 support
</para>
</listitem>
</itemizedlist>
@@ -323,7 +323,7 @@
<itemizedlist>
<listitem>
<para>
- <xref linkend="opt-boot.initrd.network.openvpn.enable" /> Start an OpenVPN client during initrd boot.
+ <xref linkend="opt-boot.initrd.network.openvpn.enable" /> start an OpenVPN client during initrd boot
</para>
</listitem>
</itemizedlist>
@@ -335,17 +335,17 @@
<itemizedlist>
<listitem>
<para>
- <xref linkend="opt-boot.enableContainers" /> Use nixos-containers.
+ <xref linkend="opt-boot.enableContainers" /> use nixos-containers
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-virtualisation.oci-containers.containers" /> Run OCI (Docker) containers.
+ <xref linkend="opt-virtualisation.oci-containers.containers" /> run OCI (Docker) containers
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-virtualisation.podman.enable" /> Daemonless container engine.
+ <xref linkend="opt-virtualisation.podman.enable" /> daemonless container engine
</para>
</listitem>
</itemizedlist>
@@ -358,242 +358,237 @@
<itemizedlist>
<listitem>
<para>
- <xref linkend="opt-services.ankisyncd.enable" /> Anki sync server.
+ <xref linkend="opt-services.ankisyncd.enable" /> Anki sync server
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.bazarr.enable" /> subtitle manager for Sonarr and Radarr.
+ <xref linkend="opt-services.bazarr.enable" /> Subtitle manager for Sonarr and Radarr
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.biboumi.enable" /> Biboumi XMPP gateway to IRC.
+ <xref linkend="opt-services.biboumi.enable" /> Biboumi XMPP gateway to IRC
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.blockbook-frontend" /> Blockbook-frontend, a service for the Trezor wallet.
+ <xref linkend="opt-services.blockbook-frontend" /> Blockbook-frontend, a service for the Trezor wallet
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.cage.enable" /> Wayland cage service.
+ <xref linkend="opt-services.cage.enable" /> Wayland cage service
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.convos.enable" /> IRC daemon, which can be accessed throught the browser.
+ <xref linkend="opt-services.convos.enable" /> IRC daemon, which can be accessed throught the browser
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.engelsystem.enable" /> Tool for coordinating helpers and shifts on large events.
+ <xref linkend="opt-services.engelsystem.enable" /> Tool for coordinating volunteers and shifts on large events
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.espanso.enable" /> text-expander written in rust.
+ <xref linkend="opt-services.espanso.enable" /> text-expander written in rust
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.foldingathome.enable" /> Folding@home client.
+ <xref linkend="opt-services.foldingathome.enable" /> Folding@home client
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.foldingathome.enable" /> Folding@home client.
+ <xref linkend="opt-services.gerrit.enable" /> Web-based team code collaboration tool
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.gerrit.enable" /> Web-based team code collaboration tool.
+ <xref linkend="opt-services.go-neb.enable" /> Matrix bot
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.go-neb.enable" /> Matrix bot.
+ <xref linkend="opt-services.hardware.xow.enable" /> xow as a systemd service
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.hardware.xow.enable" /> xow as a systemd service.
+ <xref linkend="opt-services.hercules-ci-agent.enable" /> Hercules CI build agent
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.hercules-ci-agent.enable" /> Hercules CI build agent.
+ <xref linkend="opt-services.jicofo.enable" /> Jitsi Conference Focus, component of Jitsi Meet
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.jicofo.enable" /> Jitsi Conference Focus, component of Jitsi Meet.
+ <xref linkend="opt-services.jirafeau.enable" /> A web file repository
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.jirafeau.enable" /> a web file repository.
+ <xref linkend="opt-services.jitsi-meet.enable" /> Secure, simple and scalable video conferences
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.jitsi-meet.enable" /> secure, simple and scalable video conferences.
+ <xref linkend="opt-services.jitsi-videobridge.enable" /> Jitsi Videobridge, a WebRTC compatible router
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.jitsi-videobridge.enable" /> Jitsi Videobridge, a WebRTC compatible router.
+ <xref linkend="opt-services.jupyterhub.enable" /> Jupyterhub development server
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.jupyterhub.enable" /> Jupyterhub development server.
+ <xref linkend="opt-services.k3s.enable" /> Lightweight Kubernetes distribution
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.k3s.enable" /> lightweight kubernetes distribution.
+ <xref linkend="opt-services.magic-wormhole-mailbox-server.enable" /> Magic Wormhole Mailbox Server
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.magic-wormhole-mailbox-server.enable" /> Magic Wormhole Mailbox Server.
+ <xref linkend="opt-services.malcontent.enable" /> Parental Control support
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.malcontent.enable" /> parental control support.
+ <xref linkend="opt-services.matrix-appservice-discord.enable" /> Matrix and Discord bridge
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.matrix-appservice-discord.enable" /> Matrix and Discord bridge.
+ <xref linkend="opt-services.mautrix-telegram.enable" /> Matrix-Telegram puppeting/relaybot bridge
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.mautrix-telegram.enable" /> Matrix-Telegram puppeting/relaybot bridge.
+ <xref linkend="opt-services.mirakurun.enable" /> Japanese DTV Tuner Server Service
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.mirakurun.enable" /> Japanese DTV Tuner Server Service.
+ <xref linkend="opt-services.molly-brown.enable" /> Molly-Brown Gemini server
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.molly-brown.enable" /> Molly-Brown Gemini server.
+ <xref linkend="opt-services.mullvad-vpn.enable" /> Mullvad VPN daemon
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.mullvad-vpn.enable" /> Mullvad VPN daemon.
+ <xref linkend="opt-services.ncdns.enable" /> Namecoin to DNS bridge
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.ncdns.enable" /> Namecoin to DNS bridge.
+ <xref linkend="opt-services.nextdns.enable" /> NextDNS to DoH Proxy service
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.nextdns.enable" /> NextDNS to DoH Proxy service.
+ <xref linkend="opt-services.nix-store-gcs-proxy" /> Google storage bucket to be used as a nix store
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.nix-store-gcs-proxy" /> Enable a Google storage bucket to be used as a nix store.
+ <xref linkend="opt-services.onedrive.enable" /> OneDrive sync service
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.onedrive.enable" /> OneDrive sync service.
+ <xref linkend="opt-services.pinnwand.enable" /> Pastebin-like service
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.pinnwand.enable" /> Pastebin-like service.
+ <xref linkend="opt-services.pixiecore.enable" /> Manage network booting of machines
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.pixiecore.enable" /> manage network booting of machines.
+ <xref linkend="opt-services.privacyidea.enable" /> Privacy authentication server
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.privacyidea.enable" /> Privacy authentication server.
+ <xref linkend="opt-services.quorum.enable" /> Quorum blockchain daemon
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.quorum.enable" /> Quorum blockchain daemon.
+ <xref linkend="opt-services.robustirc-bridge.enable" /> RobustIRC bridge
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.robustirc-bridge.enable" /> RobustIRC bridge.
+ <xref linkend="opt-services.rss-bridge.enable" /> Generate RSS and Atom feeds
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.rss-bridge.enable" /> generate RSS and Atom feeds.
+ <xref linkend="opt-services.rtorrent.enable" /> rTorrent service
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.rtorrent.enable" /> rTorrent service.
+ <xref linkend="opt-services.smartdns.enable" /> SmartDNS DNS server
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.smartdns.enable" /> SmartDNS DNS server.
+ <xref linkend="opt-services.sogo.enable" /> SOGo groupware
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.sogo.enable" /> SOGo groupware.
+ <xref linkend="opt-services.teeworlds.enable" /> Teeworlds game server
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.teeworlds.enable" /> Teeworlds game server.
+ <xref linkend="opt-services.torque.mom.enable" /> torque computing node
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.torque.mom.enable" /> torque computing node.
+ <xref linkend="opt-services.torque.server.enable" /> torque server
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.torque.server.enable" /> enable torque server.
+ <xref linkend="opt-services.tuptime.enable" /> A total uptime service
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.tuptime.enable" /> a total uptime service.
+ <xref linkend="opt-services.urserver.enable" /> X11 remote server
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.urserver.enable" /> X11 remote server.
+ <xref linkend="opt-services.wasabibackend.enable" /> Wasabi backend service
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.wasabibackend.enable" /> Wasabi backend service.
+ <xref linkend="opt-services.yubikey-agent.enable" /> Yubikey agent
</para>
</listitem>
<listitem>
<para>
- <xref linkend="opt-services.yubikey-agent.enable" /> Yubikey agent.
- </para>
- </listitem>
- <listitem>
- <para>
- <xref linkend="opt-services.zigbee2mqtt.enable" /> Zigbee to MQTT bridge.
+ <xref linkend="opt-services.zigbee2mqtt.enable" /> Zigbee to MQTT bridge
</para>
</listitem>
</itemizedlist>
@@ -1791,7 +1786,7 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0";
</orderedlist>
<para>
- I, Jonathan Ringer, would also like to personally thank @WORLDofPEACE for their help in mentoring me on the release process. Special thanks also goes to Thomas Tuegel for helping immensely with stabilizing Qt, kde, and Plasma5; I would also like to thank Robert Scott for his numerous fixes and pull request reviews.
+ I, Jonathan Ringer, would also like to personally thank @WORLDofPEACE for their help in mentoring me on the release process. Special thanks also goes to Thomas Tuegel for helping immensely with stabilizing Qt, KDE, and Plasma5; I would also like to thank Robert Scott for his numerous fixes and pull request reviews.
</para>
</section>
diff --git a/nixos/modules/services/web-apps/engelsystem.nix b/nixos/modules/services/web-apps/engelsystem.nix
index 899582a20304..2e755ae9d523 100644
--- a/nixos/modules/services/web-apps/engelsystem.nix
+++ b/nixos/modules/services/web-apps/engelsystem.nix
@@ -10,7 +10,7 @@ in {
default = false;
example = true;
description = ''
- Whether to enable engelsystem, an online tool for coordinating helpers
+ Whether to enable engelsystem, an online tool for coordinating volunteers
and shifts on large events.
'';
type = lib.types.bool;
diff --git a/pkgs/servers/web-apps/engelsystem/default.nix b/pkgs/servers/web-apps/engelsystem/default.nix
index 8ef6a9afa0e8..ad3a69958005 100644
--- a/pkgs/servers/web-apps/engelsystem/default.nix
+++ b/pkgs/servers/web-apps/engelsystem/default.nix
@@ -43,7 +43,7 @@ in stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description =
- "Coordinate your helpers in teams, assign them to work shifts or let them decide for themselves when and where they want to help with what";
+ "Coordinate your volunteers in teams, assign them to work shifts or let them decide for themselves when and where they want to help with what";
license = licenses.gpl2;
homepage = "https://engelsystem.de";
maintainers = with maintainers; [ kloenk ];
From a0cc1243cce7be519927069714a8ce7369998a0a Mon Sep 17 00:00:00 2001
From: "Markus S. Wamser" <github-dev@mail2013.wamser.eu>
Date: Tue, 27 Oct 2020 20:46:25 +0100
Subject: [PATCH 328/590] doc: 20.09 release notes: remove duplicate service
list entry
opt-services.foldingathome.enable was listed twice
---
nixos/doc/manual/release-notes/rl-2009.xml | 5 -----
1 file changed, 5 deletions(-)
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index f7a0936ce150..13ca8a69c7df 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -401,11 +401,6 @@
<xref linkend="opt-services.foldingathome.enable" /> Folding@home client.
</para>
</listitem>
- <listitem>
- <para>
- <xref linkend="opt-services.foldingathome.enable" /> Folding@home client.
- </para>
- </listitem>
<listitem>
<para>
<xref linkend="opt-services.gerrit.enable" /> Web-based team code collaboration tool.
From d29ad75a5c8b1a449a11625f6c201e4ebfbf160a Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Tue, 27 Oct 2020 13:54:39 -0700
Subject: [PATCH 329/590] ccls: 0.20190823 -> 0.20201025
---
pkgs/development/tools/misc/ccls/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/tools/misc/ccls/default.nix b/pkgs/development/tools/misc/ccls/default.nix
index ba57ef561f3e..16365a462a94 100644
--- a/pkgs/development/tools/misc/ccls/default.nix
+++ b/pkgs/development/tools/misc/ccls/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "ccls";
- version = "0.20190823.6";
+ version = "0.20201025";
src = fetchFromGitHub {
owner = "MaskRay";
repo = "ccls";
rev = version;
- sha256 = "11h5nwk4qqshf3i8yr4bxpnvmidrhkzd0zxhf1xqv8cv6r08k47f";
+ sha256 = "13v00q1bz8g0ckw1sv0zyicbc44irc00vhwxdv3vvwlvylm7s21p";
};
nativeBuildInputs = [ cmake ];
From e129f4152222823bdfbae405e68f098b097c256e Mon Sep 17 00:00:00 2001
From: Nicolas Martin <penguwin@penguwin.eu>
Date: Tue, 27 Oct 2020 15:33:16 +0100
Subject: [PATCH 330/590] glow: 1.0.2 -> 1.1.0
---
pkgs/applications/editors/glow/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix
index 0bb8b4eb18ac..1dc140f3e095 100644
--- a/pkgs/applications/editors/glow/default.nix
+++ b/pkgs/applications/editors/glow/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "glow";
- version = "1.0.2";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = "glow";
rev = "v${version}";
- sha256 ="0jyl5ln7c2naawmw7bljzrldr96xyb5rbis6y6blmyghr0vx07zb";
+ sha256 = "016psbm93ni81k87i9gx3cjr59j1fmpq5x8vz0ydabczzdshd1py";
};
- vendorSha256 = "0z3r8fvpy36ybgb18sr0lril1sg8z7s99xv1a6g1v3zdnj3zimav";
+ vendorSha256 = "0gvlbj8b5sqk93ahg4b2krwrmr8ljz7cah77fxaxcd98apap0pw6";
doCheck = false;
From 47183f25a0805ef83d8bd3bfe9d9700cebf59ed6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 27 Oct 2020 08:25:17 +0100
Subject: [PATCH 331/590] ocamlPackages.mirage-block: init at 2.0.1
---
.../ocaml-modules/mirage-block/default.nix | 24 +++++++++++++++++++
pkgs/top-level/ocaml-packages.nix | 2 ++
2 files changed, 26 insertions(+)
create mode 100644 pkgs/development/ocaml-modules/mirage-block/default.nix
diff --git a/pkgs/development/ocaml-modules/mirage-block/default.nix b/pkgs/development/ocaml-modules/mirage-block/default.nix
new file mode 100644
index 000000000000..fc9a6b6f06b5
--- /dev/null
+++ b/pkgs/development/ocaml-modules/mirage-block/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchurl, buildDunePackage
+, cstruct, lwt, mirage-device
+}:
+
+buildDunePackage rec {
+ pname = "mirage-block";
+ version = "2.0.1";
+
+ useDune2 = true;
+
+ src = fetchurl {
+ url = "https://github.com/mirage/mirage-block/releases/download/v${version}/mirage-block-v${version}.tbz";
+ sha256 = "1wp8wmixaz9i2sbvq6nkx903lbnpdgb2w404pz1wk8kcg9p3ilcc";
+ };
+
+ propagatedBuildInputs = [ cstruct lwt mirage-device ];
+
+ meta = {
+ description = "Block signatures and implementations for MirageOS";
+ homepage = "https://github.com/mirage/mirage-block";
+ 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 9b0dff7c70e3..55658e70af9a 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-block = callPackage ../development/ocaml-modules/mirage-block { };
+
mirage-bootvar-unix = callPackage ../development/ocaml-modules/mirage-bootvar-unix { };
mirage-clock = callPackage ../development/ocaml-modules/mirage-clock { };
From ac97a9a46d559e0990000735a56650b21aeb4fe4 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Tue, 27 Oct 2020 16:07:52 +0100
Subject: [PATCH 332/590] ocamlPackages.mirage-block: refactor `meta` attribute
set
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
pkgs/development/ocaml-modules/mirage-block/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/ocaml-modules/mirage-block/default.nix b/pkgs/development/ocaml-modules/mirage-block/default.nix
index fc9a6b6f06b5..28eb4d6b28ed 100644
--- a/pkgs/development/ocaml-modules/mirage-block/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-block/default.nix
@@ -15,10 +15,10 @@ buildDunePackage rec {
propagatedBuildInputs = [ cstruct lwt mirage-device ];
- meta = {
+ meta = with lib; {
description = "Block signatures and implementations for MirageOS";
homepage = "https://github.com/mirage/mirage-block";
- license = lib.licenses.isc;
- maintainers = [ lib.maintainers.vbgl ];
+ license = licenses.isc;
+ maintainers = with maintainers; [ vbgl ];
};
}
From 22ac8b79b0fcc197018855a901350d2217acd1ab Mon Sep 17 00:00:00 2001
From: hyperfekt <git@hyperfekt.net>
Date: Mon, 26 Oct 2020 22:00:25 +0100
Subject: [PATCH 333/590] nym: 0.7.0 -> 0.8.1
The tests requiring network access are no longer called by the root
package.
---
pkgs/applications/networking/nym/default.nix | 29 ++++++++------------
1 file changed, 12 insertions(+), 17 deletions(-)
diff --git a/pkgs/applications/networking/nym/default.nix b/pkgs/applications/networking/nym/default.nix
index 4dfe1dc54929..d85266f68d6e 100644
--- a/pkgs/applications/networking/nym/default.nix
+++ b/pkgs/applications/networking/nym/default.nix
@@ -9,16 +9,25 @@
rustPlatform.buildRustPackage rec {
pname = "nym";
- version = "0.7.0";
+ version = "0.8.1";
src = fetchFromGitHub {
owner = "nymtech";
repo = "nym";
rev = "v${version}";
- sha256 = "05bxrpqwwf9spydac0q8sly65q8f1nk13i5fy3p5adr1phzxdnr8";
+ sha256 = "0wzk9qzjyax73lfjbbag412vw1fgk2wmhhry5hdlvdbkim42m5bn";
};
- cargoSha256 = "0mh8cwia86bm68b0wcrmnsq1af5cp6kj1j81nwxb03awnqpxc34n";
+ # fix outdated Cargo.lock
+ cargoPatches = [ (writeText "fix-nym-cargo-lock.patch" ''
+ --- a/Cargo.lock
+ +++ b/Cargo.lock
+ @@ -1826 +1826 @@
+ -version = "0.8.0"
+ +version = "0.8.1"
+ '') ];
+
+ cargoSha256 = "0zr5nzmglmvn6xfqgvipbzy8nw5cl3nf7zjmghkqdwi6zj9p9272";
nativeBuildInputs = [ pkgconfig ];
@@ -26,20 +35,6 @@ rustPlatform.buildRustPackage rec {
checkType = "debug";
- /*
- Nym's test presence::converting_mixnode_presence_into_topology_mixnode::it_returns_resolved_ip_on_resolvable_hostname tries to resolve nymtech.net.
- Since there is no external DNS resolution available in the build sandbox, we point cargo and its children (that's what we remove the 'unsetenv' call for) to a hosts file in which we statically resolve nymtech.net.
- */
- preCheck = ''
- export LD_PRELOAD=${libredirect.overrideAttrs (drv: {
- postPatch = "sed -i -e /unsetenv/d libredirect.c";
- })}/lib/libredirect.so
- export NIX_REDIRECTS=/etc/hosts=${writeText "nym_resolve_test_hosts" "127.0.0.1 nymtech.net"}
- '';
-
- postCheck = "unset NIX_REDIRECTS LD_PRELOAD";
-
-
passthru.updateScript = ./update.sh;
meta = with lib; {
From f08a5cc832809dd28ac95be1cf94db19c8f53ba6 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 25 Oct 2020 13:57:04 -0700
Subject: [PATCH 334/590] python2Packages.pc-ble-driver: disable for python2
---
pkgs/development/python-modules/pc-ble-driver-py/default.nix | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/pkgs/development/python-modules/pc-ble-driver-py/default.nix
index 6250b5a2202d..64430ca7e1f0 100644
--- a/pkgs/development/python-modules/pc-ble-driver-py/default.nix
+++ b/pkgs/development/python-modules/pc-ble-driver-py/default.nix
@@ -1,9 +1,10 @@
-{ stdenv, fetchFromGitHub, cmake, git, swig, boost, udev, pc-ble-driver
+{ stdenv, fetchFromGitHub, cmake, git, swig, boost, udev, pc-ble-driver, pythonOlder
, buildPythonPackage, enum34, wrapt, future, setuptools, scikit-build }:
buildPythonPackage rec {
pname = "pc-ble-driver-py";
version = "0.14.2";
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "NordicSemiconductor";
From 5074b8e4730b40476de49b5b78acf7d190b146db Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Mon, 28 Sep 2020 23:04:52 +0000
Subject: [PATCH 335/590] postgresqlPackages.periods: 1.1 -> 1.2
---
pkgs/servers/sql/postgresql/ext/periods.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/sql/postgresql/ext/periods.nix b/pkgs/servers/sql/postgresql/ext/periods.nix
index cf859a4bde05..c2277019f89b 100644
--- a/pkgs/servers/sql/postgresql/ext/periods.nix
+++ b/pkgs/servers/sql/postgresql/ext/periods.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "periods";
- version = "1.1";
+ version = "1.2";
src = fetchFromGitHub {
owner = "xocolatl";
repo = pname;
rev = "v${version}";
- sha256 = "0gdnlbh7kp7c0kvsrri2kxdbmm2qgib1qqpl37203z6c3fk45kfh";
+ sha256 = "13aix61qzlb7cs042dz4x0z4sc2xayg4nzi2cks46zibxm5i4gzm";
};
buildInputs = [ postgresql ];
From c7f2086af5f87b11fd7d9d7763799cd0ec1d8ed1 Mon Sep 17 00:00:00 2001
From: Alexandre Macabies <web+oss@zopieux.com>
Date: Sun, 25 Oct 2020 18:26:51 +0100
Subject: [PATCH 336/590] nxdomain: init at 1.0.1
---
pkgs/tools/networking/nxdomain/default.nix | 29 ++++++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 ++
2 files changed, 31 insertions(+)
create mode 100644 pkgs/tools/networking/nxdomain/default.nix
diff --git a/pkgs/tools/networking/nxdomain/default.nix b/pkgs/tools/networking/nxdomain/default.nix
new file mode 100644
index 000000000000..073ac48b8d34
--- /dev/null
+++ b/pkgs/tools/networking/nxdomain/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildPythonApplication, fetchPypi, dnspython, pytestCheckHook }:
+
+buildPythonApplication rec {
+ pname = "nxdomain";
+ version = "1.0.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1z9iffggqq2kw6kpnj30shi98cg0bkvkwpglmhnkgwac6g55n2zn";
+ };
+
+ propagatedBuildInputs = [ dnspython ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ postCheck = ''
+ echo example.org > simple.list
+ python -m nxdomain --format dnsmasq --out dnsmasq.conf --simple ./simple.list
+ grep -q 'address=/example.org/' dnsmasq.conf
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/zopieux/nxdomain";
+ description = "A domain (ad) block list creator";
+ platforms = platforms.all;
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ zopieux ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9efc75240c02..318a4347210f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5902,6 +5902,8 @@ in
nwdiag = with python3Packages; toPythonApplication nwdiag;
+ nxdomain = python3.pkgs.callPackage ../tools/networking/nxdomain { };
+
nxpmicro-mfgtools = callPackage ../development/tools/misc/nxpmicro-mfgtools { };
nyancat = callPackage ../tools/misc/nyancat { };
From 092aa94ca729de84df9cb9a29406c854fa879024 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 20 Oct 2020 09:03:20 +1000
Subject: [PATCH 337/590] buildGoModule: use optionalString
---
.../go-modules/generic/default.nix | 33 ++++++++-----------
1 file changed, 14 insertions(+), 19 deletions(-)
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 9efaa8608323..1549c83234a8 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -47,10 +47,6 @@ let
removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}'';
- deleteFlag = lib.boolToString deleteVendor;
-
- vendCommand = if runVend then "${vend}/bin/vend" else "false";
-
go-modules = if vendorSha256 != null then go.stdenv.mkDerivation (let modArgs = {
name = "${name}-go-modules";
@@ -81,27 +77,26 @@ let
buildPhase = args.modBuildPhase or ''
runHook preBuild
-
- if [ ${deleteFlag} == "true" ]; then
- if [ ! -d vendor ]; then
- echo "vendor folder does not exist, 'deleteVendor' is not needed"
- exit 10
- else
- rm -rf vendor
- fi
+ '' + lib.optionalString (deleteVendor == true) ''
+ if [ ! -d vendor ]; then
+ echo "vendor folder does not exist, 'deleteVendor' is not needed"
+ exit 10
+ else
+ rm -rf vendor
fi
-
+ '' + ''
if [ -d vendor ]; then
echo "vendor folder exists, please set 'vendorSha256 = null;' in your expression"
exit 10
fi
- if [ ${vendCommand} != "false" ]; then
- echo running vend to rewrite vendor folder
- ${vendCommand}
- else
- go mod vendor
- fi
+ ${if runVend then ''
+ echo "running 'vend' to rewrite vendor folder"
+ ${vend}/bin/vend
+ '' else ''
+ go mod vendor
+ ''}
+
mkdir -p vendor
runHook postBuild
From 023abd4ffbb123961d355c79105a91652933ac97 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 28 Oct 2020 01:18:33 +1000
Subject: [PATCH 338/590] fzf: 0.23.1 -> 0.24.0
https://github.com/junegunn/fzf/releases/tag/0.24.0
---
pkgs/tools/misc/fzf/default.nix | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 88000c0ba2c6..86819d77a9e4 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fzf";
- version = "0.23.1";
+ version = "0.24.0";
src = fetchFromGitHub {
owner = "junegunn";
repo = pname;
rev = version;
- sha256 = "1x55y96i4b3gk9l2zlwb6ifsk8nxzfny3b73ly89g7kifwkb543k";
+ sha256 = "0a1jhlkv6z5msw8p3wccy3axwpdvpnri6qps9fmvz57gfm9a3jmr";
};
- vendorSha256 = "0bd4fk15i292377mv5w57gzxjp21f0rcf1py9gd6v99rx1pviq66";
+ vendorSha256 = "0dd0qm1fxp3jnlrhfaas8fw87cj7rygaac35a9nk3xh2xsk7q35p";
outputs = [ "out" "man" ];
@@ -19,6 +19,8 @@ buildGoModule rec {
buildInputs = [ ncurses ];
+ buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
+
# The vim plugin expects a relative path to the binary; patch it to abspath.
patchPhase = ''
sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/fzf.vim
From 02de51f120c1d48b333878d47a83eb736a06c0b8 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 27 Oct 2020 18:30:53 +0800
Subject: [PATCH 339/590] rubber: put man and info pages in the right directory
---
pkgs/tools/typesetting/rubber/default.nix | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/tools/typesetting/rubber/default.nix
index a9ac2690b66d..f3f036ce50eb 100644
--- a/pkgs/tools/typesetting/rubber/default.nix
+++ b/pkgs/tools/typesetting/rubber/default.nix
@@ -9,18 +9,18 @@ python3Packages.buildPythonApplication rec {
sha256 = "178dmrp0mza5gqjiqgk6dqs0c10s0c517pk6k9pjbam86vf47a1p";
};
- nativeBuildInputs = [ texinfo ];
-
- # I couldn't figure out how to pass the proper parameter to disable pdf generation, so we
- # use sed to change the default
- preBuild = ''
- sed -i -r 's/pdf\s+= True/pdf = False/g' setup.py
+ # I'm sure there is a better way to pass these parameters to the build script...
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace 'pdf = True' 'pdf = False' \
+ --replace '$base/man' 'share/man' \
+ --replace '$base/info' 'share/info' \
+ --replace '$base/share' 'share'
'';
- # the check scripts forces python2. If we need to use python3 at some point, we should use
- # the correct python
+ nativeBuildInputs = [ texinfo ];
+
checkPhase = ''
- sed -i 's|python=python3|python=${python3Packages.python.interpreter}|' tests/run.sh
cd tests && ${stdenv.shell} run.sh
'';
From c8147bd56c4c594508f632f9cfb40cba689aea99 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 28 Oct 2020 00:24:36 +0000
Subject: [PATCH 340/590] you-get: 0.4.1456 -> 0.4.1475
---
pkgs/tools/misc/you-get/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix
index 8314dc2c9a35..155081db36a1 100644
--- a/pkgs/tools/misc/you-get/default.nix
+++ b/pkgs/tools/misc/you-get/default.nix
@@ -2,7 +2,7 @@
buildPythonApplication rec {
pname = "you-get";
- version = "0.4.1456";
+ version = "0.4.1475";
# Tests aren't packaged, but they all hit the real network so
# probably aren't suitable for a build environment anyway.
@@ -10,7 +10,7 @@ buildPythonApplication rec {
src = fetchPypi {
inherit pname version;
- sha256 = "14miw5gmj571584rmdzjxf88icmb1psrsfbwpabn8blz8l5aq6bv";
+ sha256 = "432c04170bb5f4881ca6af9c802b6c90e81759811487b8d7918762dcd674697f";
};
meta = with stdenv.lib; {
From 3963954fc81c8271a7bd93897a99933e89fbb6c8 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 27 Oct 2020 17:50:39 -0700
Subject: [PATCH 341/590] nixos/docs/rl-2009.xml: grafana: description, example
agreement
---
nixos/doc/manual/release-notes/rl-2009.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 13ca8a69c7df..84491c7306d9 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -728,7 +728,7 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION;
It can still be enabled by providing <literal>phantomJsSupport = true</literal> to the package instantiation:
<programlisting>{
services.grafana.package = pkgs.grafana.overrideAttrs (oldAttrs: rec {
- phantomJsSupport = false;
+ phantomJsSupport = true;
});
}</programlisting>
</para>
From da11534a4ec96b57de4d882d04a0bbe4117767fd Mon Sep 17 00:00:00 2001
From: MetaDark <kira.bruneau@gmail.com>
Date: Mon, 26 Oct 2020 18:00:04 -0400
Subject: [PATCH 342/590] pythonPackages.debugpy: 1.0.0 -> 1.1.0
---
pkgs/development/python-modules/debugpy/default.nix | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix
index 52f23f437a60..5f10b7897e96 100644
--- a/pkgs/development/python-modules/debugpy/default.nix
+++ b/pkgs/development/python-modules/debugpy/default.nix
@@ -18,13 +18,13 @@
buildPythonPackage rec {
pname = "debugpy";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "Microsoft";
repo = pname;
rev = "v${version}";
- sha256 = "1cxwbq97n5pfmq0hji1ybbc6i1jg5bjy830dq23zqxbwxxwjx98m";
+ sha256 = "1f6a62hg82fn9ddrl6g11x2h27zng8jmrlfbnnra6q590i5v1ixr";
};
patches = [
@@ -45,6 +45,13 @@ buildPythonPackage rec {
./fix-test-pythonpath.patch
];
+ postPatch = ''
+ # Use nixpkgs version instead of versioneer
+ substituteInPlace setup.py \
+ --replace "cmds = versioneer.get_cmdclass()" "cmds = {}" \
+ --replace "version=versioneer.get_version()" "version='${version}'"
+ '';
+
# Remove pre-compiled "attach" libraries and recompile for host platform
# Compile flags taken from linux_and_mac/compile_linux.sh & linux_and_mac/compile_mac.sh
preBuild = ''(
From 0bd06ce0dea5e2b62af4b538272d7f4811613571 Mon Sep 17 00:00:00 2001
From: Maxime Guerreiro <maxime.guerreiro@gmail.com>
Date: Wed, 28 Oct 2020 03:34:52 +0100
Subject: [PATCH 343/590] nodejs-14_x: 14.14.0 -> 14.15.0
https://github.com/nodejs/node/releases/tag/v14.15.0
---
pkgs/development/web/nodejs/v14.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix
index 6c0d445476b3..820deb5884db 100644
--- a/pkgs/development/web/nodejs/v14.nix
+++ b/pkgs/development/web/nodejs/v14.nix
@@ -8,6 +8,6 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "14.14.0";
- sha256 = "1rphkl3lqg0rzgg0r58bfv1hjw3rg96qvqcilk2927kbpps3bs84";
+ version = "14.15.0";
+ sha256 = "0fzv05f8rnc0s1a11k0cqfpgv9yawfbdd8qcl8zr25kv5ridhdip";
}
From 83d9ca82681fb73ed2b145ce2fc88b70a88667ff Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 28 Oct 2020 04:20:00 +0000
Subject: [PATCH 344/590] nodejs-10_x: 10.22.1 -> 10.23.0
https://github.com/nodejs/node/releases/tag/v10.23.0
---
pkgs/development/web/nodejs/v10.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix
index 1fa463892042..74253e97334d 100644
--- a/pkgs/development/web/nodejs/v10.nix
+++ b/pkgs/development/web/nodejs/v10.nix
@@ -1,13 +1,13 @@
{ callPackage, openssl, icu, python2, enableNpm ? true }:
let
- buildNodejs = callPackage ./nodejs.nix {
+ buildNodejs = callPackage ./nodejs.nix {
inherit openssl icu;
python = python2;
};
in
buildNodejs {
inherit enableNpm;
- version = "10.22.1";
- sha256 = "0pr569qiabr4m7k38s7rwi3iyzrc5jmx19z2z0k7n4xfvhjlfzzl";
+ version = "10.23.0";
+ sha256 = "07vlqr0493a569i0npwgkxk5wa4vc7j68jsivchg08y2slwn0dgx";
}
From 8d1c9bcdf9749cb3205926153cd21c45a7a3f90c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 28 Oct 2020 04:20:00 +0000
Subject: [PATCH 345/590] archiver: 3.3.2 -> 3.4.0
https://github.com/mholt/archiver/releases/tag/v3.4.0
---
pkgs/applications/misc/archiver/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/applications/misc/archiver/default.nix
index fed1dc48470e..aec0b9d51186 100644
--- a/pkgs/applications/misc/archiver/default.nix
+++ b/pkgs/applications/misc/archiver/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "archiver";
- version = "3.3.2";
+ version = "3.4.0";
src = fetchFromGitHub {
owner = "mholt";
repo = pname;
rev = "v${version}";
- sha256 = "1fi86g27c660g3mv9c5rfm0mmvh5q08704c19xnvrpwlg65glqrz";
+ sha256 = "16jawybywqfkp68035bnf206a2w4khjw239saa429a21lxrfyk4a";
};
- vendorSha256 = "1rqhra3rfarq8f750zszkrm0jcsxa4sjbfpmcdlj5z000df699zq";
+ vendorSha256 = "0m89ibj3dm58j49d99dhkn0ryivnianxz7lkpkvhs0cdbzzc02az";
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=unknown" ];
From 34ab3fbaa207730de53f2751d53e508932da7458 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 28 Oct 2020 05:17:55 +0000
Subject: [PATCH 346/590] python37Packages.apprise: 0.8.7 -> 0.8.9
---
pkgs/development/python-modules/apprise/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix
index 4dac5602b370..5c260692887a 100644
--- a/pkgs/development/python-modules/apprise/default.nix
+++ b/pkgs/development/python-modules/apprise/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "apprise";
- version = "0.8.7";
+ version = "0.8.9";
src = fetchPypi {
inherit pname version;
- sha256 = "18a65c5917bf7f2d48bb557bf0879e49c5293b4c0e9809328387ae09338ae37b";
+ sha256 = "024db00c6a80dbc8c9038b2de211c9fd32963046612882f3f54ad78930f3e0f7";
};
nativeBuildInputs = [ Babel ];
From ef45e1161ed164eb477d9d46968e46f3c4e2e996 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 21 Oct 2020 07:19:58 +0200
Subject: [PATCH 347/590] =?UTF-8?q?ocamlPackages.ezjsonm:=200.6.0=20?=
=?UTF-8?q?=E2=86=92=201.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkgs/development/ocaml-modules/cow/default.nix | 1 +
pkgs/development/ocaml-modules/ezjsonm/default.nix | 14 ++++++++------
.../development/ocaml-modules/mustache/default.nix | 1 +
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/pkgs/development/ocaml-modules/cow/default.nix b/pkgs/development/ocaml-modules/cow/default.nix
index 787854f8e416..13ee99804d8c 100644
--- a/pkgs/development/ocaml-modules/cow/default.nix
+++ b/pkgs/development/ocaml-modules/cow/default.nix
@@ -2,6 +2,7 @@
, uri, xmlm, omd, ezjsonm }:
buildDunePackage rec {
+ useDune2 = true;
minimumOCamlVersion = "4.02.3";
version = "2.4.0";
diff --git a/pkgs/development/ocaml-modules/ezjsonm/default.nix b/pkgs/development/ocaml-modules/ezjsonm/default.nix
index 781af8a4c98b..269288ef3cd9 100644
--- a/pkgs/development/ocaml-modules/ezjsonm/default.nix
+++ b/pkgs/development/ocaml-modules/ezjsonm/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchzip, buildDunePackage, jsonm, hex, sexplib }:
+{ stdenv, fetchurl, buildDunePackage, jsonm, hex, sexplib0 }:
buildDunePackage rec {
pname = "ezjsonm";
- version = "0.6.0";
+ version = "1.2.0";
- src = fetchzip {
- url = "https://github.com/mirage/${pname}/archive/${version}.tar.gz";
- sha256 = "18g64lhai0bz65b9fil12vlgfpwa9b5apj7x6d7n4zzm18qfazvj";
+ useDune2 = true;
+
+ src = fetchurl {
+ url = "https://github.com/mirage/ezjsonm/releases/download/v${version}/ezjsonm-v${version}.tbz";
+ sha256 = "1q6cf63cc614lr141rzhm2w4rhi1snfqai6fmkhvfjs84hfbw2w7";
};
- propagatedBuildInputs = [ jsonm hex sexplib ];
+ propagatedBuildInputs = [ jsonm hex sexplib0 ];
meta = {
description = "An easy interface on top of the Jsonm library";
diff --git a/pkgs/development/ocaml-modules/mustache/default.nix b/pkgs/development/ocaml-modules/mustache/default.nix
index 267aa17e9e42..005e26926d1a 100644
--- a/pkgs/development/ocaml-modules/mustache/default.nix
+++ b/pkgs/development/ocaml-modules/mustache/default.nix
@@ -3,6 +3,7 @@
buildDunePackage rec {
pname = "mustache";
version = "3.1.0";
+ useDune2 = true;
src = fetchFromGitHub {
owner = "rgrinberg";
repo = "ocaml-mustache";
From 91a190aa77ad59aa4dfc37038c0a29885988bdbb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 28 Oct 2020 05:28:48 +0000
Subject: [PATCH 348/590] python37Packages.chalice: 1.21.2 -> 1.21.3
---
pkgs/development/python-modules/chalice/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix
index 619c059d3856..f985da36d17a 100644
--- a/pkgs/development/python-modules/chalice/default.nix
+++ b/pkgs/development/python-modules/chalice/default.nix
@@ -22,11 +22,11 @@
buildPythonPackage rec {
pname = "chalice";
- version = "1.21.2";
+ version = "1.21.3";
src = fetchPypi {
inherit pname version;
- sha256 = "72efc25672ce7535c0e26bbe7157d7bd31ab12ed3f5221a64367548ca2daa265";
+ sha256 = "0b44514cdbafab08b18e21f59fc016cead0b78f5f5fdf14eccd993c469130b39";
};
checkInputs = [ watchdog pytest hypothesis mock ];
From a8025a31299081a41d87e2816ffae07f5597d656 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 28 Oct 2020 06:32:34 +0000
Subject: [PATCH 349/590] python37Packages.snowflake-connector-python: 2.3.3 ->
2.3.4
---
.../python-modules/snowflake-connector-python/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix
index f33d2639db56..6f271e1758aa 100644
--- a/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix
@@ -25,12 +25,12 @@
buildPythonPackage rec {
pname = "snowflake-connector-python";
- version = "2.3.3";
+ version = "2.3.4";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "18w6ibpibqj3v136jjfklbax1l4y80v8mfk19apxlaprf6wvwpwy";
+ sha256 = "5a072ee61ef156e5938e04447f0b99248b87ef262e498b5e5002f5b579cd7fb2";
};
propagatedBuildInputs = [
From 1ecbf98eee1658b8c0c77279cdec82ba93a683f0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 28 Oct 2020 06:20:44 +0000
Subject: [PATCH 350/590] python37Packages.cchardet: 2.1.6 -> 2.1.7
---
pkgs/development/python-modules/cchardet/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/cchardet/default.nix b/pkgs/development/python-modules/cchardet/default.nix
index 5256d6050490..b93ea9c3bd78 100644
--- a/pkgs/development/python-modules/cchardet/default.nix
+++ b/pkgs/development/python-modules/cchardet/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "cchardet";
- version = "2.1.6";
+ version = "2.1.7";
src = fetchPypi {
inherit pname version;
- sha256 = "1cs6y59qhbal8fgbyjk2lpjykh8kfjhq16clfssylsddb4hgnsmp";
+ sha256 = "c428b6336545053c2589f6caf24ea32276c6664cb86db817e03a94c60afa0eaf";
};
checkInputs = [ nose ];
From 533965957eaf8b7a23433ec178c09faa11a682a2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 28 Oct 2020 06:01:37 +0000
Subject: [PATCH 351/590] python37Packages.py-multibase: 1.0.1 -> 1.0.3
---
pkgs/development/python-modules/py-multibase/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/py-multibase/default.nix b/pkgs/development/python-modules/py-multibase/default.nix
index c304e68fd8dd..b229361917f6 100644
--- a/pkgs/development/python-modules/py-multibase/default.nix
+++ b/pkgs/development/python-modules/py-multibase/default.nix
@@ -10,12 +10,12 @@
}:
buildPythonPackage rec {
pname = "py-multibase";
- version = "1.0.1";
+ version = "1.0.3";
disabled = isPy27;
src = fetchPypi {
inherit pname version ;
- sha256 = "6ed706ea321b487ba82e4172a9c82d61dacd675c865f576a937a94bca1a23443";
+ sha256 = "d28a20efcbb61eec28f55827a0bf329c7cea80fffd933aecaea6ae8431267fe4";
};
postPatch = ''
From 1489c07cb7614b3da1fddfb4c501cd6943b3a52b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 28 Oct 2020 09:39:08 +0100
Subject: [PATCH 352/590] teams: work around screen sharing bug
---
.../networking/instant-messengers/teams/default.nix | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix
index f116bf1e86d3..f1a2c137ad29 100644
--- a/pkgs/applications/networking/instant-messengers/teams/default.nix
+++ b/pkgs/applications/networking/instant-messengers/teams/default.nix
@@ -50,6 +50,10 @@ stdenv.mkDerivation rec {
--replace /usr/bin/ $out/bin/
ln -s $out/opt/teams/teams $out/bin/
+
+ # Work-around screen sharing bug
+ # https://docs.microsoft.com/en-us/answers/questions/42095/sharing-screen-not-working-anymore-bug.html
+ rm $out/opt/teams/resources/app.asar.unpacked/node_modules/slimcore/bin/rect-overlay
'';
dontAutoPatchelf = true;
From eaa8dfab5b2b971db859cd57da2d5571c0c32276 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 28 Oct 2020 10:40:04 +0000
Subject: [PATCH 353/590] python37Packages.dropbox: 10.6.0 -> 10.7.0
---
pkgs/development/python-modules/dropbox/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix
index 1898be45f822..07d13c74c8db 100644
--- a/pkgs/development/python-modules/dropbox/default.nix
+++ b/pkgs/development/python-modules/dropbox/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "dropbox";
- version = "10.6.0";
+ version = "10.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "8a7c80eb70ec677a149173154a98cf1fa461c6b0e1a1d833c90e40a735eda2cd";
+ sha256 = "08c1e0bbc16499e0138431e34777c35ea086734ff15ee5067b0df3424df2a9ec";
};
# Set DROPBOX_TOKEN environment variable to a valid token.
From 192b436b1cd3c0c2f30927b9e2eb156fbadf1cc8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 28 Oct 2020 10:59:34 +0000
Subject: [PATCH 354/590] python37Packages.pysmb: 1.2.4 -> 1.2.5
---
pkgs/development/python-modules/pysmb/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pysmb/default.nix b/pkgs/development/python-modules/pysmb/default.nix
index ad59da259e5f..4a2e3e06966e 100644
--- a/pkgs/development/python-modules/pysmb/default.nix
+++ b/pkgs/development/python-modules/pysmb/default.nix
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "pysmb";
- version = "1.2.4";
+ version = "1.2.5";
src = fetchPypi {
inherit pname version;
format = "setuptools";
extension = "zip";
- sha256 = "0937cb44936805d403e8e678d7042feb6d85da950a7019e8ae6842a0720fb00c";
+ sha256 = "7aedd5e003992c6c78b41a0da4bf165359a46ea25ab2a9a1594d13f471ad7287";
};
propagatedBuildInputs = [
From 6d6ed15508905e9a7678091d65a0cdb469ff529d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 28 Oct 2020 11:21:17 +0000
Subject: [PATCH 355/590] python37Packages.eve: 1.1.3 -> 1.1.4
---
pkgs/development/python-modules/eve/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix
index aca872975060..c50cc2aeb827 100644
--- a/pkgs/development/python-modules/eve/default.nix
+++ b/pkgs/development/python-modules/eve/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "Eve";
- version = "1.1.3";
+ version = "1.1.4";
src = fetchPypi {
inherit pname version;
- sha256 = "ef335d13b798bc901636643f11455bab8b8698ddfe3a0b67bc251af1fd809b21";
+ sha256 = "3a057277bba7144a0c15ab8c737dc8a1002e87e7284847aa011ce122e353418e";
};
propagatedBuildInputs = [
From 5a7a1cad43ace8bc7e662feb20bde0dc2b5f5271 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 28 Oct 2020 11:26:47 +0000
Subject: [PATCH 356/590] python37Packages.holoviews: 1.13.4 -> 1.13.5
---
pkgs/development/python-modules/holoviews/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix
index 287216cc949a..4d9da17bd3a9 100644
--- a/pkgs/development/python-modules/holoviews/default.nix
+++ b/pkgs/development/python-modules/holoviews/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "holoviews";
- version = "1.13.4";
+ version = "1.13.5";
src = fetchPypi {
inherit pname version;
- sha256 = "34dc09dfb557f79515a011a72b343daf31b5e5d67403a008dded59bab658267c";
+ sha256 = "3f8a00ce1cc67a388a3a949441accd7e7e9ca9960ba16b49ee96a50305105a01";
};
propagatedBuildInputs = [
From 17a9d2187d139353e41334a98c497e09e962b1cc Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Wed, 28 Oct 2020 12:33:55 +0100
Subject: [PATCH 357/590] vix: init at 0.1.2
---
pkgs/tools/misc/vix/default.nix | 24 ++++++++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 ++
2 files changed, 26 insertions(+)
create mode 100644 pkgs/tools/misc/vix/default.nix
diff --git a/pkgs/tools/misc/vix/default.nix b/pkgs/tools/misc/vix/default.nix
new file mode 100644
index 000000000000..7e93cd5d67ec
--- /dev/null
+++ b/pkgs/tools/misc/vix/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, SDL }:
+
+stdenv.mkDerivation {
+ pname = "vix";
+ version = "0.1.2";
+
+ src = fetchFromGitHub {
+ owner = "BatchDrake";
+ repo = "vix";
+ rev = "824b6755157a0f7430a0be0af454487d1492204d";
+ sha256 = "1y0a2sajkrsg36px21b8lgx1irf0pyj7hccyd6k806bm4zhgxw1z";
+ };
+
+ nativeBuildInputs = [ autoreconfHook ];
+
+ buildInputs = [ SDL ];
+
+ meta = with stdenv.lib; {
+ description = "Visual Interface heXadecimal dump ";
+ homepage = "http://actinid.org/vix/";
+ license = licenses.gpl3;
+ maintainers = [ maintainers.ehmry ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47edc0f30f22..1a81c1fcf146 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7774,6 +7774,8 @@ in
viu = callPackage ../tools/graphics/viu { };
+ vix = callPackage ../tools/misc/vix { };
+
vnc2flv = callPackage ../tools/video/vnc2flv {};
vncrec = callPackage ../tools/video/vncrec { };
From 4c7982a2c5371a8c94ad7fbdd15464d9cdecb08d Mon Sep 17 00:00:00 2001
From: stovemeerkat <marvin.heinzelmann@t-online.de>
Date: Wed, 28 Oct 2020 13:02:30 +0100
Subject: [PATCH 358/590] metabase: 0.36.4 -> 0.37.0.2
---
pkgs/servers/metabase/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix
index 2298ecc84ce0..6d75011575ad 100644
--- a/pkgs/servers/metabase/default.nix
+++ b/pkgs/servers/metabase/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "metabase";
- version = "0.36.4";
+ version = "0.37.0.2";
src = fetchurl {
url = "http://downloads.metabase.com/v${version}/metabase.jar";
- sha256 = "1k6f22ii9vga8j9jxipl1r55msxgag0lbkjxw7vf285z1hdhwylq";
+ sha256 = "7f95f9823bdf567d4044925e9f14c820a6b4a176624ec027d911cac33813bf96";
};
nativeBuildInputs = [ makeWrapper ];
From 442ba6668fc3d8165d6cbc18255b089a7133221d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Wed, 28 Oct 2020 13:23:35 +0100
Subject: [PATCH 359/590] libtorch-bin: 1.6.0 -> 1.7.0
Changelog:
https://github.com/pytorch/pytorch/releases/tag/v1.7.0
---
.../libraries/science/math/libtorch/bin.nix | 4 ++--
.../science/math/libtorch/binary-hashes.nix | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix
index 3ae462705868..33229bbefc82 100644
--- a/pkgs/development/libraries/science/math/libtorch/bin.nix
+++ b/pkgs/development/libraries/science/math/libtorch/bin.nix
@@ -12,9 +12,9 @@
}:
let
- version = "1.6.0";
+ version = "1.7.0";
device = if cudaSupport then "cuda" else "cpu";
- srcs = import ./binary-hashes.nix;
+ srcs = import ./binary-hashes.nix version;
unavailable = throw "libtorch is not available for this platform";
in stdenv.mkDerivation {
inherit version;
diff --git a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
index 92a2e05e0ba3..6048fe8676b7 100644
--- a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
+++ b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
@@ -1,14 +1,14 @@
-{
+version: {
x86_64-darwin-cpu = {
- url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-1.6.0.zip";
- sha256 = "0d4n7la31qzl4s9pwvm07la7q6lhcwiww0yjpfz3kw6nvx84p22r";
+ url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-${version}.zip";
+ sha256 = "1912lklil0i7i10j1fm4qzcq96cc8c281l9fn5gfbwa2wwry0r59";
};
x86_64-linux-cpu = {
- url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-1.6.0%2Bcpu.zip";
- sha256 = "1975b4zvyihzh89vnwspw0vf9qr05sxj8939vcrlmv3gzvdspcxz";
+ url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcpu.zip";
+ sha256 = "0jdd7bjcy20xz2gfv8f61zdrbzxz5425bnqaaqgrwpzvd45ay8px";
};
x86_64-linux-cuda = {
- url = "https://download.pytorch.org/libtorch/cu102/libtorch-cxx11-abi-shared-with-deps-1.6.0.zip";
- sha256 = "127qnfyi1faqbm40sbnsyqxjhrqj82bzwqyz7c1hs2bm0zgrrpya";
+ url = "https://download.pytorch.org/libtorch/cu102/libtorch-cxx11-abi-shared-with-deps-${version}.zip";
+ sha256 = "1ag6lvf3a400ivqq4g9cxpmxzlfrga0y5ssjy0rfpw6i1xljibn6";
};
}
From 59645d2e422661a2efe6e138cc7c6d05dcb6aaee Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Wed, 28 Oct 2020 00:18:44 +0300
Subject: [PATCH 360/590] =?UTF-8?q?cloudcompare:=202.11.0=20=E2=86=92=202.?=
=?UTF-8?q?11.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkgs/applications/graphics/cloudcompare/default.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix
index 209a6a4753b1..26fabc364ba3 100644
--- a/pkgs/applications/graphics/cloudcompare/default.nix
+++ b/pkgs/applications/graphics/cloudcompare/default.nix
@@ -18,17 +18,17 @@
mkDerivation rec {
pname = "cloudcompare";
- version = "2.11.0";
+ version = "2.11.2";
src = fetchFromGitHub {
owner = "CloudCompare";
repo = "CloudCompare";
rev = "v${version}";
- sha256 = "02ahhhivgb9k1aygw1m35wdvhaizag1r98mb0r6zzrs5p4y64wlb";
+ sha256 = "0sb2h08iaf6zrf54sg6ql6wm63q5vq0kpd3gffdm26z8w6j6wv3s";
# As of writing includes (https://github.com/CloudCompare/CloudCompare/blob/a1c589c006fc325e8b560c77340809b9c7e7247a/.gitmodules):
# * libE57Format
# * PoissonRecon
- # In > 2.11 it will also contain
+ # In a future version it will also contain
# * CCCoreLib
fetchSubmodules = true;
};
@@ -53,7 +53,7 @@ mkDerivation rec {
];
cmakeFlags = [
- # TODO: This will become -DCCCORELIB_USE_TBB=ON in > 2.11.0, see
+ # TODO: This will become -DCCCORELIB_USE_TBB=ON in a future version, see
# https://github.com/CloudCompare/CloudCompare/commit/f5a0c9fd788da26450f3fa488b2cf0e4a08d255f
"-DCOMPILE_CC_CORE_LIB_WITH_TBB=ON"
"-DOPTION_USE_DXF_LIB=ON"
From 92041430d417bc5fa3d9b4e37b8e2ace05ebba52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Wed, 28 Oct 2020 14:03:59 +0100
Subject: [PATCH 361/590] python3Packages.pytorch-bin: 1.6.0 -> 1.7.0
Changelog:
https://github.com/pytorch/pytorch/releases/tag/v1.7.0
---
.../development/python-modules/pytorch/bin.nix | 18 ++++++++++++++++--
.../python-modules/pytorch/binary-hashes.nix | 10 +++++-----
2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/pkgs/development/python-modules/pytorch/bin.nix b/pkgs/development/python-modules/pytorch/bin.nix
index b1b662e95b3e..f073c408f709 100644
--- a/pkgs/development/python-modules/pytorch/bin.nix
+++ b/pkgs/development/python-modules/pytorch/bin.nix
@@ -11,17 +11,20 @@
, patchelf
, pyyaml
, requests
+, typing-extensions
}:
let
pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
platform = if stdenv.isDarwin then "darwin" else "linux";
- srcs = import ./binary-hashes.nix;
+ srcs = import ./binary-hashes.nix version;
unsupported = throw "Unsupported system";
+ version = "1.7.0";
in buildPythonPackage {
+ inherit version;
+
pname = "pytorch";
# Don't forget to update pytorch to the same version.
- version = "1.6.0";
format = "wheel";
@@ -39,6 +42,17 @@ in buildPythonPackage {
numpy
pyyaml
requests
+ typing-extensions
+ ];
+
+ # PyTorch are broken: the dataclasses wheel is required, but ships with
+ # Python >= 3.7. Our dataclasses derivation is incompatible with >= 3.7.
+ #
+ # https://github.com/pytorch/pytorch/issues/46930
+ #
+ # Should be removed with the next PyTorch version.
+ pipInstallFlags = [
+ "--no-deps"
];
postInstall = ''
diff --git a/pkgs/development/python-modules/pytorch/binary-hashes.nix b/pkgs/development/python-modules/pytorch/binary-hashes.nix
index 481dc6825c7d..afdde5057dbd 100644
--- a/pkgs/development/python-modules/pytorch/binary-hashes.nix
+++ b/pkgs/development/python-modules/pytorch/binary-hashes.nix
@@ -1,10 +1,10 @@
-{
+version: {
x86_64-linux-37 = {
- url = "https://download.pytorch.org/whl/cu102/torch-1.6.0-cp37-cp37m-linux_x86_64.whl";
- sha256 = "0xhwv68j8gvahfzcp43bqp2x71iwv6zjhkw2f1hb82xps40mrml7";
+ url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp37-cp37m-linux_x86_64.whl";
+ sha256 = "0cvafwzd44d7i2d0y01lyk75lhxffcf6c94cx0wla0cnhcg9mqlf";
};
x86_64-linux-38 = {
- url = "https://download.pytorch.org/whl/cu102/torch-1.6.0-cp38-cp38-linux_x86_64.whl";
- sha256 = "05m2l04wqzw5xvjam6zwvlmc3979cksl3hrdqc2aikrv4hz8fmsk";
+ url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp38-cp38-linux_x86_64.whl";
+ sha256 = "1vxswkb2gzp87sbb5ycvyvs8aw1szp3v2mwdn4mp47yarlnbx8r6";
};
}
From 2bb3a9da24ca60d9f5bed69f679a1ec50dbdf997 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 27 Oct 2020 22:38:58 -0300
Subject: [PATCH 362/590] A directory-category for terminal emulators
This is a mostly cosmetical commit, in the sense it doesn't change the contents
of any package, but reorganizes the overall Nixpkgs expressions.
Terminal emulators are an ubiquitous tool for any Unix user; even the beginners
are routinely familiarized to it. And, manifestly, there are many
implementations of terminal emulators out there, from those traditionally made
in C and C++ to those written in Haskell and Go.
Terminal emulators deserve more highlight. This commit does that by creating a
category for them.
---
doc/contributing/coding-conventions.xml | 10 +++
.../alacritty/default.nix | 0
.../aminal/default.nix | 0
.../cool-retro-term/default.nix | 0
.../eterm/default.nix | 0
.../evilvte/default.nix | 0
.../foot/default.nix | 0
.../guake/default.nix | 0
.../havoc/default.nix | 0
.../hyper/default.nix | 0
.../iterm2/default.nix | 0
.../iterm2/disable_updates.patch | 0
.../kitty/default.nix | 0
.../kitty/fix-paths.patch | 0
.../lilyterm/default.nix | 0
.../lxterminal/default.nix | 0
.../respect-xml-catalog-files-var.patch | 0
.../microcom/default.nix | 0
.../mlterm/default.nix | 0
.../mrxvt/default.nix | 0
.../nimmm/default.nix | 0
.../roxterm/default.nix | 0
.../rxvt-unicode-plugins/default.nix | 0
.../default.nix | 0
.../urxvt-bidi/default.nix | 0
.../urxvt-font-size/default.nix | 0
.../urxvt-perl/default.nix | 0
.../urxvt-perls/default.nix | 0
.../urxvt-resize-font/default.nix | 0
.../urxvt-tabbedex/default.nix | 0
.../urxvt-theme-switch/default.nix | 0
.../urxvt-vtwheel/default.nix | 0
.../rxvt-unicode/default.nix | 0
.../patches/256-color-resources.patch | 0
.../patches/9.06-font-width.patch | 0
.../rxvt-unicode/patches/makefile-phony.patch | 0
.../rxvt-unicode/wrapper.nix | 0
.../rxvt/default.nix | 0
.../sakura/default.nix | 0
.../st/default.nix | 0
.../{misc => terminal-emulators}/st/xst.nix | 0
.../stupidterm/default.nix | 0
.../terminator/default.nix | 0
.../terminus/default.nix | 0
.../termite/add_errno_header.patch | 0
.../termite/default.nix | 0
.../termite/remove_ldflags_macos.patch | 0
.../termite/url_regexp_trailing.patch | 0
.../termite/wrapper.nix | 0
.../termonad/default.nix | 0
.../tilda/default.nix | 0
.../tilix/default.nix | 0
.../wayst/default.nix | 0
.../wayst/utf8proc.patch | 0
.../x3270/default.nix | 0
.../xterm/default.nix | 0
.../xterm/sixel-256.support.patch | 0
.../xtermcontrol/default.nix | 0
.../yaft/default.nix | 0
pkgs/top-level/all-packages.nix | 76 +++++++++----------
60 files changed, 48 insertions(+), 38 deletions(-)
rename pkgs/applications/{misc => terminal-emulators}/alacritty/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/aminal/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/cool-retro-term/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/eterm/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/evilvte/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/foot/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/guake/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/havoc/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/hyper/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/iterm2/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/iterm2/disable_updates.patch (100%)
rename pkgs/applications/{misc => terminal-emulators}/kitty/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/kitty/fix-paths.patch (100%)
rename pkgs/applications/{misc => terminal-emulators}/lilyterm/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/lxterminal/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/lxterminal/respect-xml-catalog-files-var.patch (100%)
rename pkgs/applications/{misc => terminal-emulators}/microcom/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/mlterm/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/mrxvt/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/nimmm/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/roxterm/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/urxvt-bidi/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/urxvt-font-size/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/urxvt-perl/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/urxvt-perls/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/urxvt-resize-font/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/urxvt-tabbedex/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/urxvt-theme-switch/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/urxvt-vtwheel/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode/patches/256-color-resources.patch (100%)
rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode/patches/9.06-font-width.patch (100%)
rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode/patches/makefile-phony.patch (100%)
rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode/wrapper.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/rxvt/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/sakura/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/st/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/st/xst.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/stupidterm/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/terminator/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/terminus/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/termite/add_errno_header.patch (100%)
rename pkgs/applications/{misc => terminal-emulators}/termite/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/termite/remove_ldflags_macos.patch (100%)
rename pkgs/applications/{misc => terminal-emulators}/termite/url_regexp_trailing.patch (100%)
rename pkgs/applications/{misc => terminal-emulators}/termite/wrapper.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/termonad/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/tilda/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/tilix/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/wayst/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/wayst/utf8proc.patch (100%)
rename pkgs/applications/{misc => terminal-emulators}/x3270/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/xterm/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/xterm/sixel-256.support.patch (100%)
rename pkgs/applications/{misc => terminal-emulators}/xtermcontrol/default.nix (100%)
rename pkgs/applications/{misc => terminal-emulators}/yaft/default.nix (100%)
diff --git a/doc/contributing/coding-conventions.xml b/doc/contributing/coding-conventions.xml
index fcb6501f6159..e587275a6383 100644
--- a/doc/contributing/coding-conventions.xml
+++ b/doc/contributing/coding-conventions.xml
@@ -522,6 +522,16 @@ args.stdenv.mkDerivation (args // {
</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>
+ If it’s a <emphasis>terminal emulator</emphasis>:
+ </term>
+ <listitem>
+ <para>
+ <filename>applications/terminal-emulators</filename> (e.g. <filename>alacritty</filename> or <filename>rxvt</filename> or <filename>termite</filename>)
+ </para>
+ </listitem>
+ </varlistentry>
<varlistentry>
<term>
If it’s for <emphasis>video playback / editing</emphasis>:
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix
similarity index 100%
rename from pkgs/applications/misc/alacritty/default.nix
rename to pkgs/applications/terminal-emulators/alacritty/default.nix
diff --git a/pkgs/applications/misc/aminal/default.nix b/pkgs/applications/terminal-emulators/aminal/default.nix
similarity index 100%
rename from pkgs/applications/misc/aminal/default.nix
rename to pkgs/applications/terminal-emulators/aminal/default.nix
diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix
similarity index 100%
rename from pkgs/applications/misc/cool-retro-term/default.nix
rename to pkgs/applications/terminal-emulators/cool-retro-term/default.nix
diff --git a/pkgs/applications/misc/eterm/default.nix b/pkgs/applications/terminal-emulators/eterm/default.nix
similarity index 100%
rename from pkgs/applications/misc/eterm/default.nix
rename to pkgs/applications/terminal-emulators/eterm/default.nix
diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/terminal-emulators/evilvte/default.nix
similarity index 100%
rename from pkgs/applications/misc/evilvte/default.nix
rename to pkgs/applications/terminal-emulators/evilvte/default.nix
diff --git a/pkgs/applications/misc/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix
similarity index 100%
rename from pkgs/applications/misc/foot/default.nix
rename to pkgs/applications/terminal-emulators/foot/default.nix
diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix
similarity index 100%
rename from pkgs/applications/misc/guake/default.nix
rename to pkgs/applications/terminal-emulators/guake/default.nix
diff --git a/pkgs/applications/misc/havoc/default.nix b/pkgs/applications/terminal-emulators/havoc/default.nix
similarity index 100%
rename from pkgs/applications/misc/havoc/default.nix
rename to pkgs/applications/terminal-emulators/havoc/default.nix
diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/terminal-emulators/hyper/default.nix
similarity index 100%
rename from pkgs/applications/misc/hyper/default.nix
rename to pkgs/applications/terminal-emulators/hyper/default.nix
diff --git a/pkgs/applications/misc/iterm2/default.nix b/pkgs/applications/terminal-emulators/iterm2/default.nix
similarity index 100%
rename from pkgs/applications/misc/iterm2/default.nix
rename to pkgs/applications/terminal-emulators/iterm2/default.nix
diff --git a/pkgs/applications/misc/iterm2/disable_updates.patch b/pkgs/applications/terminal-emulators/iterm2/disable_updates.patch
similarity index 100%
rename from pkgs/applications/misc/iterm2/disable_updates.patch
rename to pkgs/applications/terminal-emulators/iterm2/disable_updates.patch
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix
similarity index 100%
rename from pkgs/applications/misc/kitty/default.nix
rename to pkgs/applications/terminal-emulators/kitty/default.nix
diff --git a/pkgs/applications/misc/kitty/fix-paths.patch b/pkgs/applications/terminal-emulators/kitty/fix-paths.patch
similarity index 100%
rename from pkgs/applications/misc/kitty/fix-paths.patch
rename to pkgs/applications/terminal-emulators/kitty/fix-paths.patch
diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/terminal-emulators/lilyterm/default.nix
similarity index 100%
rename from pkgs/applications/misc/lilyterm/default.nix
rename to pkgs/applications/terminal-emulators/lilyterm/default.nix
diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/terminal-emulators/lxterminal/default.nix
similarity index 100%
rename from pkgs/applications/misc/lxterminal/default.nix
rename to pkgs/applications/terminal-emulators/lxterminal/default.nix
diff --git a/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch b/pkgs/applications/terminal-emulators/lxterminal/respect-xml-catalog-files-var.patch
similarity index 100%
rename from pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch
rename to pkgs/applications/terminal-emulators/lxterminal/respect-xml-catalog-files-var.patch
diff --git a/pkgs/applications/misc/microcom/default.nix b/pkgs/applications/terminal-emulators/microcom/default.nix
similarity index 100%
rename from pkgs/applications/misc/microcom/default.nix
rename to pkgs/applications/terminal-emulators/microcom/default.nix
diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix
similarity index 100%
rename from pkgs/applications/misc/mlterm/default.nix
rename to pkgs/applications/terminal-emulators/mlterm/default.nix
diff --git a/pkgs/applications/misc/mrxvt/default.nix b/pkgs/applications/terminal-emulators/mrxvt/default.nix
similarity index 100%
rename from pkgs/applications/misc/mrxvt/default.nix
rename to pkgs/applications/terminal-emulators/mrxvt/default.nix
diff --git a/pkgs/applications/misc/nimmm/default.nix b/pkgs/applications/terminal-emulators/nimmm/default.nix
similarity index 100%
rename from pkgs/applications/misc/nimmm/default.nix
rename to pkgs/applications/terminal-emulators/nimmm/default.nix
diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/terminal-emulators/roxterm/default.nix
similarity index 100%
rename from pkgs/applications/misc/roxterm/default.nix
rename to pkgs/applications/terminal-emulators/roxterm/default.nix
diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/default.nix
similarity index 100%
rename from pkgs/applications/misc/rxvt-unicode-plugins/default.nix
rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/default.nix
diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
similarity index 100%
rename from pkgs/applications/misc/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-bidi/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix
similarity index 100%
rename from pkgs/applications/misc/rxvt-unicode-plugins/urxvt-bidi/default.nix
rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix
diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-font-size/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix
similarity index 100%
rename from pkgs/applications/misc/rxvt-unicode-plugins/urxvt-font-size/default.nix
rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix
diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perl/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix
similarity index 100%
rename from pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perl/default.nix
rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix
diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perls/default.nix
similarity index 100%
rename from pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix
rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perls/default.nix
diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-resize-font/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-resize-font/default.nix
similarity index 100%
rename from pkgs/applications/misc/rxvt-unicode-plugins/urxvt-resize-font/default.nix
rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-resize-font/default.nix
diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
similarity index 100%
rename from pkgs/applications/misc/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-theme-switch/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix
similarity index 100%
rename from pkgs/applications/misc/rxvt-unicode-plugins/urxvt-theme-switch/default.nix
rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix
diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix
similarity index 100%
rename from pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix
rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix
diff --git a/pkgs/applications/misc/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
similarity index 100%
rename from pkgs/applications/misc/rxvt-unicode/default.nix
rename to pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
diff --git a/pkgs/applications/misc/rxvt-unicode/patches/256-color-resources.patch b/pkgs/applications/terminal-emulators/rxvt-unicode/patches/256-color-resources.patch
similarity index 100%
rename from pkgs/applications/misc/rxvt-unicode/patches/256-color-resources.patch
rename to pkgs/applications/terminal-emulators/rxvt-unicode/patches/256-color-resources.patch
diff --git a/pkgs/applications/misc/rxvt-unicode/patches/9.06-font-width.patch b/pkgs/applications/terminal-emulators/rxvt-unicode/patches/9.06-font-width.patch
similarity index 100%
rename from pkgs/applications/misc/rxvt-unicode/patches/9.06-font-width.patch
rename to pkgs/applications/terminal-emulators/rxvt-unicode/patches/9.06-font-width.patch
diff --git a/pkgs/applications/misc/rxvt-unicode/patches/makefile-phony.patch b/pkgs/applications/terminal-emulators/rxvt-unicode/patches/makefile-phony.patch
similarity index 100%
rename from pkgs/applications/misc/rxvt-unicode/patches/makefile-phony.patch
rename to pkgs/applications/terminal-emulators/rxvt-unicode/patches/makefile-phony.patch
diff --git a/pkgs/applications/misc/rxvt-unicode/wrapper.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix
similarity index 100%
rename from pkgs/applications/misc/rxvt-unicode/wrapper.nix
rename to pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix
diff --git a/pkgs/applications/misc/rxvt/default.nix b/pkgs/applications/terminal-emulators/rxvt/default.nix
similarity index 100%
rename from pkgs/applications/misc/rxvt/default.nix
rename to pkgs/applications/terminal-emulators/rxvt/default.nix
diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/terminal-emulators/sakura/default.nix
similarity index 100%
rename from pkgs/applications/misc/sakura/default.nix
rename to pkgs/applications/terminal-emulators/sakura/default.nix
diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/terminal-emulators/st/default.nix
similarity index 100%
rename from pkgs/applications/misc/st/default.nix
rename to pkgs/applications/terminal-emulators/st/default.nix
diff --git a/pkgs/applications/misc/st/xst.nix b/pkgs/applications/terminal-emulators/st/xst.nix
similarity index 100%
rename from pkgs/applications/misc/st/xst.nix
rename to pkgs/applications/terminal-emulators/st/xst.nix
diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/terminal-emulators/stupidterm/default.nix
similarity index 100%
rename from pkgs/applications/misc/stupidterm/default.nix
rename to pkgs/applications/terminal-emulators/stupidterm/default.nix
diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/terminal-emulators/terminator/default.nix
similarity index 100%
rename from pkgs/applications/misc/terminator/default.nix
rename to pkgs/applications/terminal-emulators/terminator/default.nix
diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/terminal-emulators/terminus/default.nix
similarity index 100%
rename from pkgs/applications/misc/terminus/default.nix
rename to pkgs/applications/terminal-emulators/terminus/default.nix
diff --git a/pkgs/applications/misc/termite/add_errno_header.patch b/pkgs/applications/terminal-emulators/termite/add_errno_header.patch
similarity index 100%
rename from pkgs/applications/misc/termite/add_errno_header.patch
rename to pkgs/applications/terminal-emulators/termite/add_errno_header.patch
diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/terminal-emulators/termite/default.nix
similarity index 100%
rename from pkgs/applications/misc/termite/default.nix
rename to pkgs/applications/terminal-emulators/termite/default.nix
diff --git a/pkgs/applications/misc/termite/remove_ldflags_macos.patch b/pkgs/applications/terminal-emulators/termite/remove_ldflags_macos.patch
similarity index 100%
rename from pkgs/applications/misc/termite/remove_ldflags_macos.patch
rename to pkgs/applications/terminal-emulators/termite/remove_ldflags_macos.patch
diff --git a/pkgs/applications/misc/termite/url_regexp_trailing.patch b/pkgs/applications/terminal-emulators/termite/url_regexp_trailing.patch
similarity index 100%
rename from pkgs/applications/misc/termite/url_regexp_trailing.patch
rename to pkgs/applications/terminal-emulators/termite/url_regexp_trailing.patch
diff --git a/pkgs/applications/misc/termite/wrapper.nix b/pkgs/applications/terminal-emulators/termite/wrapper.nix
similarity index 100%
rename from pkgs/applications/misc/termite/wrapper.nix
rename to pkgs/applications/terminal-emulators/termite/wrapper.nix
diff --git a/pkgs/applications/misc/termonad/default.nix b/pkgs/applications/terminal-emulators/termonad/default.nix
similarity index 100%
rename from pkgs/applications/misc/termonad/default.nix
rename to pkgs/applications/terminal-emulators/termonad/default.nix
diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/terminal-emulators/tilda/default.nix
similarity index 100%
rename from pkgs/applications/misc/tilda/default.nix
rename to pkgs/applications/terminal-emulators/tilda/default.nix
diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/terminal-emulators/tilix/default.nix
similarity index 100%
rename from pkgs/applications/misc/tilix/default.nix
rename to pkgs/applications/terminal-emulators/tilix/default.nix
diff --git a/pkgs/applications/misc/wayst/default.nix b/pkgs/applications/terminal-emulators/wayst/default.nix
similarity index 100%
rename from pkgs/applications/misc/wayst/default.nix
rename to pkgs/applications/terminal-emulators/wayst/default.nix
diff --git a/pkgs/applications/misc/wayst/utf8proc.patch b/pkgs/applications/terminal-emulators/wayst/utf8proc.patch
similarity index 100%
rename from pkgs/applications/misc/wayst/utf8proc.patch
rename to pkgs/applications/terminal-emulators/wayst/utf8proc.patch
diff --git a/pkgs/applications/misc/x3270/default.nix b/pkgs/applications/terminal-emulators/x3270/default.nix
similarity index 100%
rename from pkgs/applications/misc/x3270/default.nix
rename to pkgs/applications/terminal-emulators/x3270/default.nix
diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix
similarity index 100%
rename from pkgs/applications/misc/xterm/default.nix
rename to pkgs/applications/terminal-emulators/xterm/default.nix
diff --git a/pkgs/applications/misc/xterm/sixel-256.support.patch b/pkgs/applications/terminal-emulators/xterm/sixel-256.support.patch
similarity index 100%
rename from pkgs/applications/misc/xterm/sixel-256.support.patch
rename to pkgs/applications/terminal-emulators/xterm/sixel-256.support.patch
diff --git a/pkgs/applications/misc/xtermcontrol/default.nix b/pkgs/applications/terminal-emulators/xtermcontrol/default.nix
similarity index 100%
rename from pkgs/applications/misc/xtermcontrol/default.nix
rename to pkgs/applications/terminal-emulators/xtermcontrol/default.nix
diff --git a/pkgs/applications/misc/yaft/default.nix b/pkgs/applications/terminal-emulators/yaft/default.nix
similarity index 100%
rename from pkgs/applications/misc/yaft/default.nix
rename to pkgs/applications/terminal-emulators/yaft/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a81c1fcf146..ad7eb42b128d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -669,7 +669,7 @@ in
albert = libsForQt5.callPackage ../applications/misc/albert {};
- alacritty = callPackage ../applications/misc/alacritty {
+ alacritty = callPackage ../applications/terminal-emulators/alacritty {
inherit (xorg) libXcursor libXxf86vm libXi;
inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL;
};
@@ -2976,7 +2976,7 @@ in
cpcfs = callPackage ../tools/filesystems/cpcfs { };
- cool-retro-term = libsForQt5.callPackage ../applications/misc/cool-retro-term { };
+ cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { };
coreutils = callPackage ../tools/misc/coreutils { };
coreutils-full = coreutils.override { minimal = false; };
@@ -3431,7 +3431,7 @@ in
wayland-utils = callPackage ../tools/wayland/wayland-utils { };
- wayst = callPackage ../applications/misc/wayst { };
+ wayst = callPackage ../applications/terminal-emulators/wayst { };
wev = callPackage ../tools/misc/wev { };
@@ -5477,7 +5477,7 @@ in
mgba = libsForQt5.callPackage ../misc/emulators/mgba { };
- microcom = callPackage ../applications/misc/microcom { };
+ microcom = callPackage ../applications/terminal-emulators/microcom { };
microserver = callPackage ../servers/microserver { };
@@ -5830,7 +5830,7 @@ in
nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {};
- nimmm = callPackage ../applications/misc/nimmm { };
+ nimmm = callPackage ../applications/terminal-emulators/nimmm { };
nitrogen = callPackage ../tools/X11/nitrogen {};
@@ -7445,7 +7445,7 @@ in
tikzit = libsForQt5.callPackage ../tools/typesetting/tikzit { };
- tilix = callPackage ../applications/misc/tilix { };
+ tilix = callPackage ../applications/terminal-emulators/tilix { };
tinc_pre = callPackage ../tools/networking/tinc/pre.nix {};
@@ -8160,7 +8160,7 @@ in
clipnotify = callPackage ../tools/misc/clipnotify { };
- x3270 = callPackage ../applications/misc/x3270 { };
+ x3270 = callPackage ../applications/terminal-emulators/x3270 { };
xclip = callPackage ../tools/misc/xclip { };
@@ -8248,7 +8248,7 @@ in
yafaray-core = callPackage ../tools/graphics/yafaray-core { };
- yaft = callPackage ../applications/misc/yaft { };
+ yaft = callPackage ../applications/terminal-emulators/yaft { };
yarn = callPackage ../development/tools/yarn { };
@@ -20520,7 +20520,7 @@ in
esniper = callPackage ../applications/networking/esniper { };
- eterm = callPackage ../applications/misc/eterm { };
+ eterm = callPackage ../applications/terminal-emulators/eterm { };
eteroj.lv2 = libsForQt5.callPackage ../applications/audio/eteroj.lv2 { };
@@ -20528,7 +20528,7 @@ in
etherape = callPackage ../applications/networking/sniffers/etherape { };
- evilvte = callPackage ../applications/misc/evilvte (config.evilvte or {});
+ evilvte = callPackage ../applications/terminal-emulators/evilvte (config.evilvte or {});
evilpixie = libsForQt514.callPackage ../applications/graphics/evilpixie { };
@@ -20634,7 +20634,7 @@ in
foo-yc20 = callPackage ../applications/audio/foo-yc20 { };
- foot = callPackage ../applications/misc/foot { };
+ foot = callPackage ../applications/terminal-emulators/foot { };
fossil = callPackage ../applications/version-management/fossil { };
@@ -20927,7 +20927,7 @@ in
gcalcli = callPackage ../applications/misc/gcalcli { };
- havoc = callPackage ../applications/misc/havoc { };
+ havoc = callPackage ../applications/terminal-emulators/havoc { };
vcal = callPackage ../applications/misc/vcal { };
@@ -21146,7 +21146,7 @@ in
gtk2fontsel = callPackage ../applications/misc/gtk2fontsel { };
- guake = callPackage ../applications/misc/guake { };
+ guake = callPackage ../applications/terminal-emulators/guake { };
guardian-agent = callPackage ../tools/networking/guardian-agent { };
@@ -21250,7 +21250,7 @@ in
hydroxide = callPackage ../applications/networking/hydroxide { };
- hyper = callPackage ../applications/misc/hyper { };
+ hyper = callPackage ../applications/terminal-emulators/hyper { };
hyper-haskell-server-with-packages = callPackage ../development/tools/haskell/hyper-haskell/server.nix {
inherit (haskellPackages) ghcWithPackages;
@@ -21695,7 +21695,7 @@ in
ffmpeg = ffmpeg_2;
};
- kitty = callPackage ../applications/misc/kitty {
+ kitty = callPackage ../applications/terminal-emulators/kitty {
harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; };
inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL;
};
@@ -21929,7 +21929,7 @@ in
jftui = callPackage ../applications/video/jftui { };
- lilyterm = callPackage ../applications/misc/lilyterm {
+ lilyterm = callPackage ../applications/terminal-emulators/lilyterm {
inherit (gnome2) vte;
gtk = gtk2;
flavour = "stable";
@@ -22259,7 +22259,7 @@ in
mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { };
- mrxvt = callPackage ../applications/misc/mrxvt { };
+ mrxvt = callPackage ../applications/terminal-emulators/mrxvt { };
mtpaint = callPackage ../applications/graphics/mtpaint { };
@@ -23210,13 +23210,13 @@ in
runc = callPackage ../applications/virtualization/runc {};
- rxvt = callPackage ../applications/misc/rxvt { };
+ rxvt = callPackage ../applications/terminal-emulators/rxvt { };
- rxvt-unicode = callPackage ../applications/misc/rxvt-unicode/wrapper.nix { };
+ rxvt-unicode = callPackage ../applications/terminal-emulators/rxvt-unicode/wrapper.nix { };
- rxvt-unicode-unwrapped = callPackage ../applications/misc/rxvt-unicode { };
+ rxvt-unicode-unwrapped = callPackage ../applications/terminal-emulators/rxvt-unicode { };
- rxvt-unicode-plugins = import ../applications/misc/rxvt-unicode-plugins { inherit callPackage; };
+ rxvt-unicode-plugins = import ../applications/terminal-emulators/rxvt-unicode-plugins { inherit callPackage; };
uade123 = callPackage ../applications/audio/uade123 {};
@@ -23226,7 +23226,7 @@ in
sacc = callPackage ../applications/networking/gopher/sacc { };
- sakura = callPackage ../applications/misc/sakura { };
+ sakura = callPackage ../applications/terminal-emulators/sakura { };
sameboy = callPackage ../misc/emulators/sameboy { };
@@ -23324,7 +23324,7 @@ in
ncurses = ncurses5;
};
- stupidterm = callPackage ../applications/misc/stupidterm {
+ stupidterm = callPackage ../applications/terminal-emulators/stupidterm {
gtk = gtk3;
};
@@ -23338,13 +23338,13 @@ in
sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { };
- st = callPackage ../applications/misc/st {
+ st = callPackage ../applications/terminal-emulators/st {
conf = config.st.conf or null;
patches = config.st.patches or [];
extraLibs = config.st.extraLibs or [];
};
- xst = callPackage ../applications/misc/st/xst.nix { };
+ xst = callPackage ../applications/terminal-emulators/st/xst.nix { };
stag = callPackage ../applications/misc/stag {
curses = ncurses;
@@ -23678,21 +23678,21 @@ in
terminal-notifier = callPackage ../applications/misc/terminal-notifier {};
- terminator = callPackage ../applications/misc/terminator { };
+ terminator = callPackage ../applications/terminal-emulators/terminator { };
- terminus = callPackage ../applications/misc/terminus { };
+ terminus = callPackage ../applications/terminal-emulators/terminus { };
tty-solitaire = callPackage ../applications/misc/tty-solitaire { };
- lxterminal = callPackage ../applications/misc/lxterminal { };
+ lxterminal = callPackage ../applications/terminal-emulators/lxterminal { };
- aminal = callPackage ../applications/misc/aminal {
+ aminal = callPackage ../applications/terminal-emulators/aminal {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel;
};
- termite-unwrapped = callPackage ../applications/misc/termite { };
+ termite-unwrapped = callPackage ../applications/terminal-emulators/termite { };
- termite = callPackage ../applications/misc/termite/wrapper.nix { termite = termite-unwrapped; };
+ termite = callPackage ../applications/terminal-emulators/termite/wrapper.nix { termite = termite-unwrapped; };
termtosvg = callPackage ../tools/misc/termtosvg { };
@@ -23737,7 +23737,7 @@ in
tig = gitAndTools.tig;
- tilda = callPackage ../applications/misc/tilda {
+ tilda = callPackage ../applications/terminal-emulators/tilda {
gtk = gtk3;
};
@@ -24590,16 +24590,16 @@ in
xsynth_dssi = callPackage ../applications/audio/xsynth-dssi { };
- xterm = callPackage ../applications/misc/xterm { };
+ xterm = callPackage ../applications/terminal-emulators/xterm { };
- mlterm = callPackage ../applications/misc/mlterm {
+ mlterm = callPackage ../applications/terminal-emulators/mlterm {
libssh2 = null;
openssl = null;
};
- roxterm = callPackage ../applications/misc/roxterm { };
+ roxterm = callPackage ../applications/terminal-emulators/roxterm { };
- termonad-with-packages = callPackage ../applications/misc/termonad {
+ termonad-with-packages = callPackage ../applications/terminal-emulators/termonad {
inherit (haskellPackages) ghcWithPackages;
};
@@ -28128,7 +28128,7 @@ in
imatix_gsl = callPackage ../development/tools/imatix_gsl {};
- iterm2 = callPackage ../applications/misc/iterm2 {};
+ iterm2 = callPackage ../applications/terminal-emulators/iterm2 {};
sccache = callPackage ../development/tools/misc/sccache { };
@@ -28193,7 +28193,7 @@ in
houdini = callPackage ../applications/misc/houdini {};
- xtermcontrol = callPackage ../applications/misc/xtermcontrol {};
+ xtermcontrol = callPackage ../applications/terminal-emulators/xtermcontrol {};
openfst = callPackage ../development/libraries/openfst {};
From daa40ef48810a6f32ea52a2d3de45e87a3921000 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Tue, 27 Oct 2020 16:46:46 +0100
Subject: [PATCH 363/590] wine{Unstable,Staging}: 5.18 -> 5.19
---
pkgs/misc/emulators/wine/sources.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index e03cc06d55e6..1f77af789f20 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -39,16 +39,16 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
- version = "5.18";
+ version = "5.19";
url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz";
- sha256 = "0hpkcpi6j162bkgcgzzj8y471777q06j7pydl61yp6qscn4g80ch";
+ sha256 = "sha256-ACBIK57q6E6hoSgTI6S80bF9vUXqLovrOhAHN4fml8c=";
inherit (stable) mono gecko32 gecko64;
};
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
- sha256 = "0bwcvkf1g1dsq1qmric3jfl85rfjzhq6x4h839hfqc536lkfbrpy";
+ sha256 = "sha256-Wfh0tAjQurJ/ZuiaSfP922H8KaQuTdHmVExZ23vrcfI=";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";
From 4e3cc04c9f5772873437a5b5552f829d3bf92334 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Tue, 27 Oct 2020 16:54:34 +0100
Subject: [PATCH 364/590] wine{Unstable,Staging}: 5.19 -> 5.20
---
pkgs/misc/emulators/wine/sources.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 1f77af789f20..c26b84ffa0aa 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -39,16 +39,16 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
- version = "5.19";
+ version = "5.20";
url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz";
- sha256 = "sha256-ACBIK57q6E6hoSgTI6S80bF9vUXqLovrOhAHN4fml8c=";
+ sha256 = "sha256-j1Ui+M6+vbqhL1jhumcaEfZjcuCu33T7kyz1qJOQhhw=";
inherit (stable) mono gecko32 gecko64;
};
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
- sha256 = "sha256-Wfh0tAjQurJ/ZuiaSfP922H8KaQuTdHmVExZ23vrcfI=";
+ sha256 = "sha256-1oWoLb5w9g3wDghpvHpNsJCws7QoZ/E2dqxLuaIgi6o=";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";
From f29b4e60efa95f48a7aca7dacbc2c28c53f781a8 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 28 Oct 2020 16:17:28 +0100
Subject: [PATCH 365/590] aptly: 1.3.0 -> 1.4.0
---
pkgs/tools/misc/aptly/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix
index 3c97c1684290..6af3238dbd77 100644
--- a/pkgs/tools/misc/aptly/default.nix
+++ b/pkgs/tools/misc/aptly/default.nix
@@ -2,14 +2,14 @@
let
- version = "1.3.0";
+ version = "1.4.0";
rev = "v${version}";
aptlySrc = fetchFromGitHub {
inherit rev;
owner = "aptly-dev";
repo = "aptly";
- sha256 = "032gw8qkxcgc0jyrvzqh7jkbmk4k0gf7j74hyhclfnjmd9548f5l";
+ sha256 = "06cq761r3bxybb9xn58jii0ggp79mcp3810z1r2z3xcvplwhwnhy";
};
aptlyCompletionSrc = fetchFromGitHub {
From c4f6310e753f8feb5e26420b98ac6f9d0f16480e Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Wed, 28 Oct 2020 16:18:41 +0100
Subject: [PATCH 366/590] grafana: 7.2.2 -> 7.3.0
https://github.com/grafana/grafana/releases/tag/v7.3.0
---
pkgs/servers/monitoring/grafana/default.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index c29c6cdf08f7..fe915e7adc0a 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "grafana";
- version = "7.2.2";
+ version = "7.3.0";
excludedPackages = [ "release_publisher" ];
@@ -10,15 +10,15 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
- sha256 = "14i1h0v6bwb3y1xqs71dabriyd7gdgihb8wkf3gpjr4gnsywvsgm";
+ sha256 = "0sxl06xaz474ir94ng0iak57qpcbh19hs3yjh1g44vf52k5cs70i";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
- sha256 = "03jf5wnf89a3fawdayl5x5rfyc3dsf9wm5dm1ldz9fqk31biq8ky";
+ sha256 = "1338x2sj11mzqqpb43dw2lxjpnv9q7zrwksyvj8ghjp4fad4pi9g";
};
- vendorSha256 = "03zvhznzdbi61kd0y0ldhx2n9zh3pwg1ias1shqgqyx46c9ysdzm";
+ vendorSha256 = "0shaxm2y5i29rb0k5bfpcsxbw3ap913l1rb5qbr9hrx7l142dbx8";
postPatch = ''
substituteInPlace pkg/cmd/grafana-server/main.go \
From 03c77ee4549dd0cc96f308518d72af3cabb11c63 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 28 Oct 2020 13:55:01 +0000
Subject: [PATCH 367/590] python37Packages.pulp: 2.3 -> 2.3.1
---
pkgs/development/python-modules/pulp/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix
index a98c7a518d20..73d367f5eb11 100644
--- a/pkgs/development/python-modules/pulp/default.nix
+++ b/pkgs/development/python-modules/pulp/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "PuLP";
- version = "2.3";
+ version = "2.3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "9d8ecf532868cc31fa9ff59ee5d5b2049600c5c902c18c794a2bad677c1f92e5";
+ sha256 = "5bbe53f854fb3b689e4faacac5bdb5fa576cb270fc12c78edef827dd46a4fb50";
};
propagatedBuildInputs = [ pyparsing amply ];
From 6eabbd79139d1ffdf2f944817b3a637164b2a8d7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 28 Oct 2020 14:29:33 +0000
Subject: [PATCH 368/590] python37Packages.oauthenticator: 0.11.0 -> 0.12.0
---
pkgs/development/python-modules/oauthenticator/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix
index bf2ad31ec3d7..6caaacd963bf 100644
--- a/pkgs/development/python-modules/oauthenticator/default.nix
+++ b/pkgs/development/python-modules/oauthenticator/default.nix
@@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "oauthenticator";
- version = "0.11.0";
+ version = "0.12.0";
src = fetchPypi {
inherit pname version;
- sha256 = "ff1b4ba2458a6ee460c3c4161d780a12e94811b2daaa5d13acdb354fa21a9916";
+ sha256 = "0bc5a4a0ee22689a863090993e0054485030847d0e9884afa1592ca388cccf4a";
};
checkPhase = ''
From c29ded49b19ada4355a95157c118abfc6acbcd28 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 28 Oct 2020 13:30:17 +0000
Subject: [PATCH 369/590] python37Packages.azure-mgmt-datamigration: 4.0.0 ->
4.1.0
---
.../python-modules/azure-mgmt-datamigration/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
index c82bfeab2ed4..1162b0405a71 100644
--- a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-datamigration";
- version = "4.0.0";
+ version = "4.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "1efda568d67af911156591eb308432b5f9a56075b57ac0a5dd9f7aee17d79217";
+ sha256 = "c33d1deb0ee173a15c8ec21a1e714ba544fe5f4895d3b1d8b0581f3c1b2e8ce4";
};
propagatedBuildInputs = [
From 7fecf2cb77067aa3f74161b465b519c4ef7d0396 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 28 Oct 2020 08:03:36 +0000
Subject: [PATCH 370/590] python37Packages.nibabel: 3.1.1 -> 3.2.0
---
pkgs/development/python-modules/nibabel/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix
index b1e8a23ef8ef..dc56bf956b74 100644
--- a/pkgs/development/python-modules/nibabel/default.nix
+++ b/pkgs/development/python-modules/nibabel/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "nibabel";
- version = "3.1.1";
+ version = "3.2.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "1kir9g7kmy2qygyzczx8nj4b0sc6jjvqy0ssm39bxzqsr1vzzvxm";
+ sha256 = "5827b644d1b0833603710dac198f5f8cbb9002769f97001a191e863b32f5956c";
};
propagatedBuildInputs = [ numpy scipy h5py packaging pydicom ];
From 9ecd40908d2a8fb967b7f1bab573fac810229368 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 28 Oct 2020 17:14:12 +0100
Subject: [PATCH 371/590] zsh-powerlevel10k: pin gitstatus version
The required gitstatus version compatible with zsh-powerlevel10k has
been pinned, as even though it is written by the same author, gitstatus
has received updates which are not yet compatible with zsh-p10k.
Fixes: #101946
---
pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
index 39cb1f247fcf..a978ac93a9b0 100644
--- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
+++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
@@ -3,6 +3,20 @@
# To make use of this derivation, use
# `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme";`
+let
+ # match gitstatus version with given `gitstatus_version`:
+ # https://github.com/romkatv/powerlevel10k/blob/master/gitstatus/build.info
+ gitstatus = pkgs.gitAndTools.gitstatus.overrideAttrs (oldAtttrs: rec {
+ version = "1.2.0";
+
+ src = fetchFromGitHub {
+ owner = "romkatv";
+ repo = "gitstatus";
+ rev = "v${version}";
+ sha256 = "0xi5ab0rsj6xs4vqgn2j5rih1nncghr83yn395mk1is1f4bsmp0s";
+ };
+ });
+in
stdenv.mkDerivation rec {
pname = "powerlevel10k";
version = "1.13.0";
@@ -17,7 +31,7 @@ stdenv.mkDerivation rec {
patches = [
(substituteAll {
src = ./gitstatusd.patch;
- gitstatusdPath = "${pkgs.gitAndTools.gitstatus}/bin/gitstatusd";
+ gitstatusdPath = "${gitstatus}/bin/gitstatusd";
})
];
From 8880179b653648abce4208654695d9276e9fd036 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?=
<aluisio@aasg.name>
Date: Wed, 28 Oct 2020 13:03:22 -0300
Subject: [PATCH 372/590] libretro.mame2016: fix build with gnumake-4.3
Builds currently fail with `ar` trying to operate on what are clearly
two paths concatenated together. It stems from a backward-incompatible
change in Make:
> Previously appending using '+=' to an empty variable would result in
> a value starting with a space. Now the initial space is only added
> if the variable already contains some value. Similarly, appending an
> empty string does not add a trailing space.
This issue was first reported on the MAME repository proper
(https://github.com/mamedev/mame/issues/6248), and affects libretro's
2016 snapshot as well. A fix that is reported to work with previous
versions of Make was upstreamed to:
- GENie, the build system: https://github.com/bkaradzic/GENie/pull/493
- MAME: https://github.com/mamedev/mame/pull/6262
- libretro: https://github.com/libretro/mame2016-libretro/pull/47
The fetched patch comes from the last of these.
---
pkgs/misc/emulators/retroarch/cores.nix | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 17b1679ed5ba..2b9cb5e6d27e 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, cmake, pkgconfig, makeWrapper, python27, python37, retroarch
+{ stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkgconfig, makeWrapper, python27, python37, retroarch
, alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL
, ffmpeg_3, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump
, miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl
@@ -630,6 +630,13 @@ in with stdenv.lib.licenses;
rev = "02987af9b81a9c3294af8fb9d5a34f9826a2cf4d";
sha256 = "0gl7irmn5d8lk7kf484vgw6kb325fq4ghwsni3il4nm5n2a8yglh";
};
+ patches = [
+ (fetchpatch {
+ name = "fix_mame_build_on_make-4.3.patch";
+ url = "https://github.com/libretro/mame2016-libretro/commit/5874fae3d124f5e7c8a91634f5473a8eac902e47.patch";
+ sha256 = "061f1lcm72glksf475ikl8w10pnbgqa7049ylw06nikis2qdjlfn";
+ })
+ ];
description = "Port of MAME ~2016 to libretro";
license = gpl2Plus;
extraNativeBuildInputs = [ python27 ];
From 8eeaad9129e265d36c7879765865793e66eee9a0 Mon Sep 17 00:00:00 2001
From: Matthew Piziak <matthew.piziak@gmail.com>
Date: Wed, 28 Oct 2020 12:12:04 -0400
Subject: [PATCH 373/590] tdlib: 1.6.0 -> 1.6.9
fix hash
version 1.6.9 is not released, so use revision hash
---
pkgs/development/libraries/tdlib/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix
index 4bf49e297e33..06909c078609 100644
--- a/pkgs/development/libraries/tdlib/default.nix
+++ b/pkgs/development/libraries/tdlib/default.nix
@@ -1,14 +1,14 @@
{ fetchFromGitHub, gperf, openssl, readline, zlib, cmake, stdenv }:
stdenv.mkDerivation rec {
- version = "1.6.0";
+ version = "1.6.9";
pname = "tdlib";
src = fetchFromGitHub {
owner = "tdlib";
repo = "td";
- rev = "v${version}";
- sha256 = "0zlzpl6fgszg18kwycyyyrnkm255dvc6fkq0b0y32m5wvwwl36cv";
+ rev = "32f2338bd199dd06a1b4b5f1ad14f2d4f2868f01";
+ sha256 = "0wv03hlgzrsc04kcwnwz6dsmkdzvhb0i1wjs08gzivwxw06pkq4n";
};
buildInputs = [ gperf openssl readline zlib ];
From 1f9ab74d4c31d80becd885300a2f7b438f30ae4a Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mcoudron@hotmail.com>
Date: Thu, 22 Oct 2020 15:43:23 +0200
Subject: [PATCH 374/590] buildBazelPackage: build name from pname/version
and updated bazel-remote accordingly.
---
pkgs/build-support/build-bazel-package/default.nix | 2 +-
.../tools/build-managers/bazel/bazel-remote/default.nix | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix
index 4d22a329e416..10a331bcc9e7 100644
--- a/pkgs/build-support/build-bazel-package/default.nix
+++ b/pkgs/build-support/build-bazel-package/default.nix
@@ -9,7 +9,7 @@ let
in
args@{
- name
+ name ? "${args.pname}-${args.version}"
, bazel ? bazelPkg
, bazelFlags ? []
, bazelBuildFlags ? []
diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
index 4cde308b8359..0c9f4d7c50a0 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
@@ -7,7 +7,7 @@
}:
buildBazelPackage rec {
- name = "bazel-remote-${version}";
+ pname = "bazel-remote";
version = "1.0.0";
src = fetchFromGitHub {
From 31d68e01950c61cf1ca2dc643eb3fdbfd68cb675 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 28 Oct 2020 07:54:29 +0000
Subject: [PATCH 375/590] python37Packages.dominate: 2.5.2 -> 2.6.0
---
pkgs/development/python-modules/dominate/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/dominate/default.nix b/pkgs/development/python-modules/dominate/default.nix
index 7418eb4f9522..3f0cca295dcb 100644
--- a/pkgs/development/python-modules/dominate/default.nix
+++ b/pkgs/development/python-modules/dominate/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "dominate";
- version = "2.5.2";
+ version = "2.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "456facce7a7ccfd9363948109cf1e978d48c58e46a46b01c71b4c0adc73b1928";
+ sha256 = "76ec2cde23700a6fc4fee098168b9dee43b99c2f1dd0ca6a711f683e8eb7e1e4";
};
doCheck = !isPy3k;
From 9eddacc837023a87c082dbe74891dc65c7b92bc3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 28 Oct 2020 13:21:12 +0000
Subject: [PATCH 376/590] python37Packages.nbsphinx: 0.7.1 -> 0.8.0
---
pkgs/development/python-modules/nbsphinx/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix
index f46322954f36..fb5eb6cbf7c9 100644
--- a/pkgs/development/python-modules/nbsphinx/default.nix
+++ b/pkgs/development/python-modules/nbsphinx/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "nbsphinx";
- version = "0.7.1";
+ version = "0.8.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0j56bxdj08vn3q1804qwb1ywhga1mdg1awgm7i64wfpfwi8df2zm";
+ sha256 = "369c16fe93af14c878d61fb3e81d838196fb35b27deade2cd7b95efe1fe56ea0";
};
propagatedBuildInputs = [
From b8cec6ed2eaaa042d5240d1b6e7d8d5016e39900 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 28 Oct 2020 09:55:08 +0000
Subject: [PATCH 377/590] python37Packages.audioread: 2.1.8 -> 2.1.9
---
pkgs/development/python-modules/audioread/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/audioread/default.nix b/pkgs/development/python-modules/audioread/default.nix
index addd187abeb6..a4f6d9057654 100644
--- a/pkgs/development/python-modules/audioread/default.nix
+++ b/pkgs/development/python-modules/audioread/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "audioread";
- version = "2.1.8";
+ version = "2.1.9";
src = fetchPypi {
inherit pname version;
- sha256 = "073904fabc842881e07bd3e4a5776623535562f70b1655b635d22886168dd168";
+ sha256 = "a3480e42056c8e80a8192a54f6729a280ef66d27782ee11cbd63e9d4d1523089";
};
nativeBuildInputs = [ pytestrunner ];
From 2458d03ea0b2522d0e1635ffe6d480b1e2ad4c63 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 28 Oct 2020 10:04:37 +0000
Subject: [PATCH 378/590] python37Packages.azure-mgmt-kusto: 0.9.0 -> 0.10.0
---
pkgs/development/python-modules/azure-mgmt-kusto/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix
index 0cb180064eed..93c78c401f0c 100644
--- a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix
@@ -5,13 +5,13 @@
}:
buildPythonPackage rec {
- version = "0.9.0";
+ version = "0.10.0";
pname = "azure-mgmt-kusto";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "9210db89fa18ee8ed53339cd63bbe6fe1d9624cd793b54b7451ddbda8ae92ef3";
+ sha256 = "09e8d4928e19d12feb374adb47651b474f3ee3bc6a12704e4b70c9b38e3bcd9e";
extension = "zip";
};
From 5a7fd27dc74198b35113dc2f33b5f7da663849fa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 28 Oct 2020 09:49:04 +0000
Subject: [PATCH 379/590] python37Packages.pyface: 7.0.1 -> 7.1.0
---
pkgs/development/python-modules/pyface/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix
index 284b8f0837ab..68afbafef308 100644
--- a/pkgs/development/python-modules/pyface/default.nix
+++ b/pkgs/development/python-modules/pyface/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "pyface";
- version = "7.0.1";
+ version = "7.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "43943cc15889153b90191d9e1bd85e7a3709a6d57b6379220cb14017217fb999";
+ sha256 = "a3e22a4d31429f0d5b9ff50aaac3fb47e4f7da678b6b0439a7b91ef40675f88d";
};
propagatedBuildInputs = [ setuptools six traits ];
From 119b2567830794c21c3a51eae36362c5d7d174cf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 28 Oct 2020 09:06:18 +0000
Subject: [PATCH 380/590] python37Packages.trytond: 5.6.7 -> 5.6.8
---
pkgs/development/python-modules/trytond/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix
index 38b7346896c0..5a9495746cd9 100644
--- a/pkgs/development/python-modules/trytond/default.nix
+++ b/pkgs/development/python-modules/trytond/default.nix
@@ -25,12 +25,12 @@ with stdenv.lib;
buildPythonApplication rec {
pname = "trytond";
- version = "5.6.7";
+ version = "5.6.8";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "aca005639931835f4f0eaa92ae48ffebb94551af91649a96018694ea448ca0ae";
+ sha256 = "330067d7319a50b9fb15e89d224e89ab28bc363926774adf7fa119f681b106b6";
};
# Tells the tests which database to use
From a8bc6fd7e08ae20a51ca9865ace2cd9ea094250c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 28 Oct 2020 08:35:44 +0000
Subject: [PATCH 381/590] python37Packages.drf-yasg: 1.17.1 -> 1.20.0
---
pkgs/development/python-modules/drf-yasg/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/drf-yasg/default.nix b/pkgs/development/python-modules/drf-yasg/default.nix
index 0f5f0bc56e05..1488d9382289 100644
--- a/pkgs/development/python-modules/drf-yasg/default.nix
+++ b/pkgs/development/python-modules/drf-yasg/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "drf-yasg";
- version = "1.17.1";
+ version = "1.20.0";
src = fetchPypi {
inherit pname version;
- sha256 = "5572e9d5baab9f6b49318169df9789f7399d0e3c7bdac8fdb8dfccf1d5d2b1ca";
+ sha256 = "d50f197c7f02545d0b736df88c6d5cf874f8fea2507ad85ad7de6ae5bf2d9e5a";
};
nativeBuildInputs = [
From d05139b362406f9cf226c1d2abf531b521fb4794 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 28 Oct 2020 18:16:00 +0100
Subject: [PATCH 382/590] pythonPackages.pysmb: add pythonImportsCheck
---
pkgs/development/python-modules/pysmb/default.nix | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkgs/development/python-modules/pysmb/default.nix b/pkgs/development/python-modules/pysmb/default.nix
index 4a2e3e06966e..8a5c3ae348a3 100644
--- a/pkgs/development/python-modules/pysmb/default.nix
+++ b/pkgs/development/python-modules/pysmb/default.nix
@@ -25,6 +25,8 @@ buildPythonPackage rec {
# https://github.com/miketeo/pysmb/blob/master/python3/tests/README_1st.txt
doCheck = false;
+ pythonImportsCheck = [ "nmb" "smb" ];
+
meta = {
description = "Experimental SMB/CIFS library written in Python to support file sharing between Windows and Linux machines";
homepage = "https://miketeo.net/wp/index.php/projects/pysmb";
From 965168db4eab9d6459cf20aa1f5cffa95fca66c0 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 28 Oct 2020 14:32:06 +0100
Subject: [PATCH 383/590] libvmi: Take maintainership from lschuermann
This patch changes maintainership for this package from lschuermann to
matthiasbeyer.
Leon has informed me in a private conversation that he has too little
time to take care of the packages, so I will (maybe only temporarly,
maybe not) take maintainership for it.
Suggested-by: Leon Schuermann <leon@is.currently.online>
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
pkgs/development/libraries/libvmi/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix
index e49ab9b38a04..1603d32ba797 100644
--- a/pkgs/development/libraries/libvmi/default.nix
+++ b/pkgs/development/libraries/libvmi/default.nix
@@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
'';
license = with licenses; [ gpl3 lgpl3 ];
platforms = platforms.linux;
- maintainers = with maintainers; [ lschuermann ];
+ maintainers = with maintainers; [ matthiasbeyer ];
};
}
From 0addaa7ad04cbbc387dd20a326aa901592b9bdc2 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 28 Oct 2020 14:32:25 +0100
Subject: [PATCH 384/590] tpm2-pkcs11: Take maintainership from lschuermann
This patch changes maintainership for this package from lschuermann to
matthiasbeyer.
Leon has informed me in a private conversation that he has too little
time to take care of the packages, so I will (maybe only temporarly,
maybe not) take maintainership for it.
Suggested-by: Leon Schuermann <leon@is.currently.online>
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
pkgs/misc/tpm2-pkcs11/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/misc/tpm2-pkcs11/default.nix b/pkgs/misc/tpm2-pkcs11/default.nix
index a089488b0e02..c4b8eefcc203 100644
--- a/pkgs/misc/tpm2-pkcs11/default.nix
+++ b/pkgs/misc/tpm2-pkcs11/default.nix
@@ -74,6 +74,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/tpm2-software/tpm2-pkcs11";
license = licenses.bsd2;
platforms = platforms.linux;
- maintainers = with maintainers; [ lschuermann ];
+ maintainers = with maintainers; [ matthiasbeyer ];
};
}
From 2264223f33b0518c01d65f76bbeaf9d9511275d2 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 28 Oct 2020 14:32:36 +0100
Subject: [PATCH 385/590] woof: Take maintainership from lschuermann
This patch changes maintainership for this package from lschuermann to
matthiasbeyer.
Leon has informed me in a private conversation that he has too little
time to take care of the packages, so I will (maybe only temporarly,
maybe not) take maintainership for it.
Suggested-by: Leon Schuermann <leon@is.currently.online>
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
pkgs/tools/misc/woof/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/tools/misc/woof/default.nix b/pkgs/tools/misc/woof/default.nix
index e00634dd53e1..e89ef8dab0e1 100644
--- a/pkgs/tools/misc/woof/default.nix
+++ b/pkgs/tools/misc/woof/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
description = "Web Offer One File - Command-line utility to easily exchange files over a local network";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix;
- maintainers = with maintainers; [ lschuermann ];
+ maintainers = with maintainers; [ matthiasbeyer ];
};
}
From c2a5bbbc244865b28b18f568af09d22c9b149fb4 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 28 Oct 2020 14:32:52 +0100
Subject: [PATCH 386/590] gnupg-pkcs11-scd: Take maintainership from
lschuermann
This patch changes maintainership for this package from lschuermann to
matthiasbeyer.
Leon has informed me in a private conversation that he has too little
time to take care of the packages, so I will (maybe only temporarly,
maybe not) take maintainership for it.
Suggested-by: Leon Schuermann <leon@is.currently.online>
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
pkgs/tools/security/gnupg-pkcs11-scd/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix b/pkgs/tools/security/gnupg-pkcs11-scd/default.nix
index e173f66f7483..04af88e33352 100644
--- a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix
+++ b/pkgs/tools/security/gnupg-pkcs11-scd/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
'';
homepage = "http://gnupg-pkcs11.sourceforge.net/";
license = licenses.bsd3;
- maintainers = with maintainers; [ lschuermann philandstuff ];
+ maintainers = with maintainers; [ matthiasbeyer philandstuff ];
platforms = platforms.unix;
};
}
From e655d6fc1a212bf5feb39e16462e12cc5bc2d58f Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 28 Oct 2020 14:33:03 +0100
Subject: [PATCH 387/590] tpm2-abrmd: Take maintainership from lschuermann
This patch changes maintainership for this package from lschuermann to
matthiasbeyer.
Leon has informed me in a private conversation that he has too little
time to take care of the packages, so I will (maybe only temporarly,
maybe not) take maintainership for it.
Suggested-by: Leon Schuermann <leon@is.currently.online>
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
pkgs/tools/security/tpm2-abrmd/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/tools/security/tpm2-abrmd/default.nix b/pkgs/tools/security/tpm2-abrmd/default.nix
index 7a7928621bd5..a3352c5abfdc 100644
--- a/pkgs/tools/security/tpm2-abrmd/default.nix
+++ b/pkgs/tools/security/tpm2-abrmd/default.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/tpm2-software/tpm2-tools";
license = licenses.bsd3;
platforms = platforms.linux;
- maintainers = with maintainers; [ lschuermann ];
+ maintainers = with maintainers; [ matthiasbeyer ];
};
}
From 93b3fa6088daf09cf500d8e1a78cb28da3263661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Fri, 16 Oct 2020 11:44:23 +0200
Subject: [PATCH 388/590] python3Packages.setuptools-rust: init at 0.11.3
---
.../setuptools-rust/default.nix | 29 +++++++++++++++++++
pkgs/top-level/python-packages.nix | 2 ++
2 files changed, 31 insertions(+)
create mode 100644 pkgs/development/python-modules/setuptools-rust/default.nix
diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix
new file mode 100644
index 000000000000..a00ea9e818f4
--- /dev/null
+++ b/pkgs/development/python-modules/setuptools-rust/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, semantic-version
+, setuptools
+, setuptools_scm
+, toml
+}:
+
+buildPythonPackage rec {
+ pname = "setuptools-rust";
+ version = "0.11.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1p21sw77197m7pciy8g25bwwaakq1675h0x1lis9sypzr46p2s11";
+ };
+
+ nativeBuildInputs = [ setuptools_scm ];
+
+ propagatedBuildInputs = [ semantic-version setuptools toml ];
+
+ meta = with stdenv.lib; {
+ description = "Setuptools plugin for Rust support";
+ homepage = "https://github.com/PyO3/setuptools-rust";
+ license = licenses.mit;
+ maintainers = with maintainers; [ danieldk ];
+ };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8631ccf49db7..c93931fe0ab7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6517,6 +6517,8 @@ in {
setuptools-lint = callPackage ../development/python-modules/setuptools-lint { };
+ setuptools-rust = callPackage ../development/python-modules/setuptools-rust { };
+
setuptools_scm = callPackage ../development/python-modules/setuptools_scm { };
setuptools-scm-git-archive = callPackage ../development/python-modules/setuptools-scm-git-archive { };
From d2e918cc12592a613a9c137adad3e47b6d3ac0ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Fri, 16 Oct 2020 11:40:35 +0200
Subject: [PATCH 389/590] python3Packages.tokenizers: 0.8.1 -> 0.9.2
Changelog:
https://github.com/huggingface/tokenizers/releases/tag/python-v0.9.0
https://github.com/huggingface/tokenizers/releases/tag/python-v0.9.1
https://github.com/huggingface/tokenizers/releases/tag/python-v0.9.2
Changes in the derivation:
* Tokenizers uses a newer version of pyo3 that does not require Rust
nightly anymore. So, we do not have to use any cheat codes anymore.
* Tokenizers is now a mixed Rust/Python project. The way it is set
up does not work with Maturin, so switch to setuptools-rust instead.
* Add additional data files needed for tests.
* Use `pytestCheckHook`.
---
.../python-modules/tokenizers/default.nix | 74 +++++++------------
.../tokenizers/update-parking-lot.diff | 63 ----------------
2 files changed, 25 insertions(+), 112 deletions(-)
delete mode 100644 pkgs/development/python-modules/tokenizers/update-parking-lot.diff
diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix
index d650f350bd28..5b0ba5d0bfa0 100644
--- a/pkgs/development/python-modules/tokenizers/default.nix
+++ b/pkgs/development/python-modules/tokenizers/default.nix
@@ -2,10 +2,12 @@
, rustPlatform
, fetchFromGitHub
, fetchurl
-, maturin
, pipInstallHook
-, pytest
+, setuptools-rust
+, wheel
+, numpy
, python
+, pytestCheckHook
, requests
}:
@@ -18,10 +20,18 @@ let
url = "https://s3.amazonaws.com/models.huggingface.co/bert/roberta-base-merges.txt";
sha256 = "1idd4rvkpqqbks51i2vjbd928inw7slij9l4r063w3y5fd3ndq8w";
};
+ albertVocab = fetchurl {
+ url = "https://s3.amazonaws.com/models.huggingface.co/bert/albert-base-v1-tokenizer.json";
+ sha256 = "1hra9pn8rczx7378z88zjclw2qsdrdwq20m56sy42s2crbas6akf";
+ };
bertVocab = fetchurl {
url = "https://s3.amazonaws.com/models.huggingface.co/bert/bert-base-uncased-vocab.txt";
sha256 = "18rq42cmqa8zanydsbzrb34xwy4l6cz1y900r4kls57cbhvyvv07";
};
+ norvigBig = fetchurl {
+ url = "https://norvig.com/big.txt";
+ sha256 = "0yz80icdly7na03cfpl0nfk5h3j3cam55rj486n03wph81ynq1ps";
+ };
openaiVocab = fetchurl {
url = "https://s3.amazonaws.com/models.huggingface.co/bert/openai-gpt-vocab.json";
sha256 = "0y40gc9bixj5rxv674br1rxmxkd3ly29p80x1596h8yywwcrpx7x";
@@ -32,38 +42,34 @@ let
};
in rustPlatform.buildRustPackage rec {
pname = "tokenizers";
- version = "0.8.1";
+ version = "0.9.2";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = "python-v${version}";
- sha256 = "0sxdwx05hr87j2z32rk4rgwn6a26w9r7m5fgj6ah1sgagiiyxbjw";
+ sha256 = "0rsm1g5zfq3ygdb3s8v9xqqpgfzvvkc4n5ik3ahy8sw7pyjljb4m";
};
- # Update parking_lot to be compatible with recent Rust versions, that
- # replace asm! by llvm_asm!:
- #
- # https://github.com/Amanieu/parking_lot/pull/223
- #
- # Remove once upstream updates this dependency.
- cargoPatches = [ ./update-parking-lot.diff ];
-
- cargoSha256 = "0cdkxmj8z2wdspn6r62lqlpvd0sj1z0cmb1zpqaajxvr0b2kjlj8";
+ cargoSha256 = "0yn699dq9hdjh7fyci99ni8mmd5qdhzrsi80grzgf5cch8g38rbi";
sourceRoot = "source/bindings/python";
nativeBuildInputs = [
- maturin
pipInstallHook
+ setuptools-rust
+ wheel
];
propagatedBuildInputs = [
+ numpy
python
];
- # tokenizers uses pyo3, which requires Rust nightly.
- RUSTC_BOOTSTRAP = 1;
+ installCheckInputs = [
+ pytestCheckHook
+ requests
+ ];
doCheck = false;
doInstallCheck = true;
@@ -74,51 +80,21 @@ in rustPlatform.buildRustPackage rec {
( cd $sourceRoot/tests/data
ln -s ${robertaVocab} roberta-base-vocab.json
ln -s ${robertaMerges} roberta-base-merges.txt
+ ln -s ${albertVocab} albert-base-v1-tokenizer.json
ln -s ${bertVocab} bert-base-uncased-vocab.txt
+ ln -s ${norvigBig} big.txt
ln -s ${openaiVocab} openai-gpt-vocab.json
ln -s ${openaiMerges} openai-gpt-merges.txt )
'';
- postPatch = ''
- # pyo3's build check verifies that Rust is a nightly
- # version. Disable this check.
- substituteInPlace $NIX_BUILD_TOP/$cargoDepsCopy/pyo3/build.rs \
- --replace "check_rustc_version()?;" ""
-
- # Patching the vendored dependency invalidates the file
- # checksums, so remove them. This should be safe, since
- # this is just a copy of the vendored dependencies and
- # the integrity of the vendored dependencies is validated
- # by cargoSha256.
- sed -r -i 's|"files":\{[^}]+\}|"files":{}|' \
- $NIX_BUILD_TOP/$cargoDepsCopy/pyo3/.cargo-checksum.json
-
- # Maturin uses the crate name as the wheel name.
- substituteInPlace Cargo.toml \
- --replace "tokenizers-python" "tokenizers"
- '';
-
buildPhase = ''
- maturin build --release --manylinux off
+ ${python.interpreter} setup.py bdist_wheel
'';
installPhase = ''
- # Put the wheels where the pip install hook can find them.
- install -Dm644 -t dist target/wheels/*.whl
pipInstallPhase
'';
- installCheckInputs = [
- pytest
- requests
- ];
-
- installCheckPhase = ''
- # Append paths, or the binding's tokenizer module will be
- # used, since the test directories have __init__.py
- pytest --import-mode=append
- '';
-
meta = with stdenv.lib; {
homepage = "https://github.com/huggingface/tokenizers";
description = "Fast State-of-the-Art Tokenizers optimized for Research and Production";
diff --git a/pkgs/development/python-modules/tokenizers/update-parking-lot.diff b/pkgs/development/python-modules/tokenizers/update-parking-lot.diff
deleted file mode 100644
index d8f144465ac9..000000000000
--- a/pkgs/development/python-modules/tokenizers/update-parking-lot.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/bindings/python/Cargo.lock b/bindings/python/Cargo.lock
-index f50db71..ea71817 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -269,7 +269,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
-
- [[package]]
- name = "lock_api"
--version = "0.3.3"
-+version = "0.3.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
- "scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -337,16 +337,16 @@ dependencies = [
-
- [[package]]
- name = "parking_lot"
--version = "0.10.0"
-+version = "0.10.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-- "lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-- "parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lock_api 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "parking_lot_core 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
-
- [[package]]
- name = "parking_lot_core"
--version = "0.7.0"
-+version = "0.7.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -409,7 +409,7 @@ dependencies = [
- "inventory 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
-- "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "paste 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "pyo3cls 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -768,7 +768,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- "checksum itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
- "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
- "checksum libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)" = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0"
--"checksum lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b"
-+"checksum lock_api 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75"
- "checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
- "checksum memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
- "checksum memoffset 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4fc2c02a7e374099d4ee95a193111f72d2110197fe200272371758f6c3643d8"
-@@ -777,8 +777,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- "checksum number_prefix 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a"
- "checksum onig 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bd91ccd8a02fce2f7e8a86655aec67bc6c171e6f8e704118a0e8c4b866a05a8a"
- "checksum onig_sys 69.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3814583fad89f3c60ae0701d80e87e1fd3028741723deda72d0d4a0ecf0cb0db"
--"checksum parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "92e98c49ab0b7ce5b222f2cc9193fc4efe11c6d0bd4f648e374684a6857b1cfc"
--"checksum parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7582838484df45743c8434fbff785e8edf260c28748353d44bc0da32e0ceabf1"
-+"checksum parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e"
-+"checksum parking_lot_core 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"
- "checksum paste 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab4fb1930692d1b6a9cfabdde3d06ea0a7d186518e2f4d67660d8970e2fa647a"
- "checksum paste-impl 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "a62486e111e571b1e93b710b61e8f493c0013be39629b714cb166bdb06aa5a8a"
- "checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
From 05f6de94cf6c918ca1b573da2cb3dcc79851b64e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Fri, 23 Oct 2020 08:32:06 +0200
Subject: [PATCH 390/590] python3Packages.transformers: 3.3.1 -> 3.4.0
Changelog:
https://github.com/huggingface/transformers/releases/tag/v3.4.0
---
.../python-modules/transformers/default.nix | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix
index fdb807bd0a1e..e3fd150fbcf7 100644
--- a/pkgs/development/python-modules/transformers/default.nix
+++ b/pkgs/development/python-modules/transformers/default.nix
@@ -7,6 +7,7 @@
, requests
, numpy
, parameterized
+, protobuf
, sacremoses
, sentencepiece
, timeout-decorator
@@ -17,19 +18,19 @@
buildPythonPackage rec {
pname = "transformers";
- version = "3.3.1";
+ version = "3.4.0";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = "v${version}";
- sha256 = "1j9nzhl0zw5z9rnvzfih7v6bax353rxp05b3f0cvkii3b5dbkc2j";
+ sha256 = "1v09gryxsg57d2cjwagna1535m8mbxlazdbhsww210lxa818m5qj";
};
propagatedBuildInputs = [
- boto3
filelock
numpy
+ protobuf
regex
requests
sacremoses
@@ -44,11 +45,6 @@ buildPythonPackage rec {
timeout-decorator
];
- postPatch = ''
- substituteInPlace setup.py \
- --replace "tokenizers == 0.8.1.rc2" "tokenizers>=0.8"
- '';
-
preCheck = ''
export HOME="$TMPDIR"
@@ -67,8 +63,10 @@ buildPythonPackage rec {
# Disable tests that require network access.
disabledTests = [
- "PegasusTokenizationTest"
- "T5TokenizationTest"
+ "BlenderbotSmallTokenizerTest"
+ "Blenderbot3BTokenizerTests"
+ "TokenizationTest"
+ "TestTokenizationBart"
"test_all_tokenizers"
"test_batch_encoding_is_fast"
"test_batch_encoding_pickle"
From 01b58c02401adffe34de99a06cb27e29e5b8cdfc Mon Sep 17 00:00:00 2001
From: meutraa <paul@lost.host>
Date: Wed, 28 Oct 2020 17:57:00 +0000
Subject: [PATCH 391/590] androidStudioPackages.{canary,dev}: 4.2.0.14 ->
4.2.0.15
---
pkgs/applications/editors/android-studio/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index e16464fb8494..3a5bc63e1c38 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -19,9 +19,9 @@ let
sha256Hash = "sha256-qbxmR9g8DSKzcP09bJuc+am79BSXWG39UQxFEb1bZ88=";
};
latestVersion = { # canary & dev
- version = "4.2.0.14"; # "Android Studio 4.2 Canary 14"
- build = "202.6907010";
- sha256Hash = "sha256-A6nl4uN25CWOjpwBvOQG26EZnJP5tNvSrGtoF+IQmtY=";
+ version = "4.2.0.15"; # "Android Studio 4.2 Canary 15"
+ build = "202.6922807";
+ sha256Hash = "sha256-PXFNnPSJbdp9NtkMDR3Vq+vpWqd85Io2FmXPhRLRk/8=";
};
in {
# Attributes are named by their corresponding release channels
From dbc8525ab25b2c1e59b73303e81c2703f1dc520d Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Wed, 28 Oct 2020 13:31:27 +0100
Subject: [PATCH 392/590] gofumpt: 2019-11-11 -> 2020-10-27
---
pkgs/development/tools/gofumpt/default.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/development/tools/gofumpt/default.nix
index 080f4bd3305a..82ae3d4bb7b8 100644
--- a/pkgs/development/tools/gofumpt/default.nix
+++ b/pkgs/development/tools/gofumpt/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gofumpt";
- version = "2019-11-11";
+ version = "2020-10-27";
src = fetchFromGitHub {
owner = "mvdan";
repo = pname;
- rev = "eb442649d62000da5d11671f3beb1afa1b746fd7";
- sha256 = "1cw9mmavxz8gxzzwsllvf5lwb2wwi19jbc7hcwxsi4ywp7a84gh0";
+ rev = "85d5401eb0f699d87b0d6c949dd4c0d5fb23f2e0";
+ sha256 = "0n72d7p4y89kfilcdx3qb63qy6xm8dyp6q8s8954wrkm2wlhkwiy";
};
- vendorSha256 = "14a3p163xy861xb6x160wy15hzjc75n36jdyzaxl877i17shba8z";
+ vendorSha256 = "1s546hp4ngzqvfx7dbd43k7b94z0mvndgdkndh4ypkkl3rpd9kkz";
doCheck = false;
From 7502d0e5d7baf74965c0db5a3e10354408c44cf5 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <bstaffin@memsql.com>
Date: Wed, 28 Oct 2020 14:18:45 -0400
Subject: [PATCH 393/590] aws-google-auth: 0.0.34 -> 0.0.36
---
pkgs/tools/admin/aws-google-auth/default.nix | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/pkgs/tools/admin/aws-google-auth/default.nix b/pkgs/tools/admin/aws-google-auth/default.nix
index d96eadf0eab5..a9a49beda2f3 100644
--- a/pkgs/tools/admin/aws-google-auth/default.nix
+++ b/pkgs/tools/admin/aws-google-auth/default.nix
@@ -4,6 +4,7 @@
, beautifulsoup4
, boto3
, configparser
+, filelock
, keyring
, keyrings-alt
, lxml
@@ -19,7 +20,7 @@
buildPythonApplication rec {
pname = "aws-google-auth";
- version = "0.0.34";
+ version = "0.0.36";
# Pypi doesn't ship the tests, so we fetch directly from GitHub
# https://github.com/cevoaustralia/aws-google-auth/issues/120
@@ -27,13 +28,14 @@ buildPythonApplication rec {
owner = "cevoaustralia";
repo = "aws-google-auth";
rev = version;
- sha256 = "12c5ssdy870szrizhs4d7dzcpq3hvszjvl8ba60qf1ak5jsr1ay4";
+ sha256 = "099r020v33sij2b3816cjp4fpy35c886l559szfxqx6kgy19y9z7";
};
- propagatedBuildInputs = [
+ propagatedBuildInputs = [
beautifulsoup4
boto3
configparser
+ filelock
keyring
keyrings-alt
lxml
@@ -43,10 +45,10 @@ buildPythonApplication rec {
tabulate
tzlocal
] ++ lib.optional withU2F python-u2flib-host;
-
- checkInputs = [
+
+ checkInputs = [
mock
- nose
+ nose
];
preCheck = ''
From ca45bb574ddd7c4e4a855bc41a7154f0b6edddd9 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 28 Oct 2020 19:38:28 +0100
Subject: [PATCH 394/590] nixos/rl-2009: minor typo fix
---
nixos/doc/manual/release-notes/rl-2009.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index c399c22eef55..01f113198eb9 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -1618,7 +1618,7 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0";
nixpkgs. It was a work in progress to package the
<link xlink:href="https://www.deepin.org/en/dde/">Deepin Desktop Environment (DDE)</link>,
including libraries, tools and applications, and it was still
- missing a service to lauch the desktop environment. It has shown
+ missing a service to launch the desktop environment. It has shown
to no longer be a feasible goal due to reasons discussed in
<link xlink:href="https://github.com/NixOS/nixpkgs/issues/94870">issue #94870</link>.
The package <literal>netease-cloud-music</literal> has also been
From 4ce6364e291d6853cee1bf8383e1e1e8b25abbcb Mon Sep 17 00:00:00 2001
From: eyjhb <eyjhbb@gmail.com>
Date: Wed, 28 Oct 2020 16:15:05 +0100
Subject: [PATCH 395/590] ns-3: 3.30 -> 3.32
---
.../libraries/science/networking/ns-3/default.nix | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/libraries/science/networking/ns-3/default.nix b/pkgs/development/libraries/science/networking/ns-3/default.nix
index 73be2a8ca6c2..b611a2baf8e2 100644
--- a/pkgs/development/libraries/science/networking/ns-3/default.nix
+++ b/pkgs/development/libraries/science/networking/ns-3/default.nix
@@ -26,7 +26,7 @@
# All modules can be enabled by choosing 'all_modules'.
# we include here the DCE mandatory ones
-, modules ? [ "core" "network" "internet" "point-to-point" "fd-net-device" "netanim"]
+, modules ? [ "core" "network" "internet" "point-to-point" "point-to-point-layout" "fd-net-device" "netanim" ]
, lib
}:
@@ -38,13 +38,13 @@ let
in
stdenv.mkDerivation rec {
pname = "ns-3";
- version = "30";
+ version = "32";
src = fetchFromGitLab {
owner = "nsnam";
repo = "ns-3-dev";
rev = "ns-3.${version}";
- sha256 = "0smdi3gglmafpc7a20hj2lbmwks3d5fpsicpn39lmm3svazw0bvp";
+ sha256 = "158yjhsrmslj1q4zcq5p16hv9i82qnxx714l7idicncn0wzrfx7k";
};
nativeBuildInputs = [ wafHook ];
@@ -60,6 +60,8 @@ stdenv.mkDerivation rec {
postPatch = ''
patchShebangs doc/ns3_html_theme/get_version.sh
+ # FIX/Remove when https://github.com/NixOS/nixpkgs/pull/69310 gets merged
+ sed -i 's/program.ns3_module_dependencies.copy()/program.ns3_module_dependencies[:]/g' wscript
'';
wafConfigureFlags = with stdenv.lib; [
From 3fce2724784984f07ec86b6f144399da2e21fa0f Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Fri, 2 Oct 2020 20:31:38 +0200
Subject: [PATCH 396/590] nixos/shiori: harden service with systemd
---
nixos/modules/services/web-apps/shiori.nix | 51 +++++++++++++++++++++-
1 file changed, 50 insertions(+), 1 deletion(-)
diff --git a/nixos/modules/services/web-apps/shiori.nix b/nixos/modules/services/web-apps/shiori.nix
index 1817a2039352..9083ddfa2206 100644
--- a/nixos/modules/services/web-apps/shiori.nix
+++ b/nixos/modules/services/web-apps/shiori.nix
@@ -37,11 +37,60 @@ in {
description = "Shiori simple bookmarks manager";
wantedBy = [ "multi-user.target" ];
+ environment.SHIORI_DIR = "/var/lib/shiori";
+
serviceConfig = {
ExecStart = "${package}/bin/shiori serve --address '${address}' --port '${toString port}'";
+
DynamicUser = true;
- Environment = "SHIORI_DIR=/var/lib/shiori";
StateDirectory = "shiori";
+ # As the RootDirectory
+ RuntimeDirectory = "shiori";
+
+ # Security options
+
+ BindReadOnlyPaths = [
+ "/nix/store"
+
+ # For SSL certificates, and the resolv.conf
+ "/etc"
+ ];
+
+ CapabilityBoundingSet = "";
+
+ DeviceAllow = "";
+
+ LockPersonality = true;
+
+ MemoryDenyWriteExecute = true;
+
+ PrivateDevices = true;
+ PrivateUsers = true;
+
+ ProtectClock = true;
+ ProtectControlGroups = true;
+ ProtectHome = true;
+ ProtectHostname = true;
+ ProtectKernelLogs = true;
+ ProtectKernelModules = true;
+ ProtectKernelTunables = true;
+
+ RestrictNamespaces = true;
+ RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
+ RestrictRealtime = true;
+ RestrictSUIDSGID = true;
+
+ RootDirectory = "/run/shiori";
+
+ SystemCallArchitectures = "native";
+ SystemCallErrorNumber = "EPERM";
+ SystemCallFilter = [
+ "@system-service"
+
+ "~@chown" "~@cpu-emulation" "~@debug" "~@ipc" "~@keyring" "~@memlock"
+ "~@module" "~@obsolete" "~@privileged" "~@process" "~@raw-io"
+ "~@resources" "~@setuid"
+ ];
};
};
};
From ff9487703e1a7ceacfbddbfe17d67a74c9d5d524 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 28 Oct 2020 21:05:22 +0100
Subject: [PATCH 397/590] matrix-synapse: make dependency for `hiredis`
optional
This is only needed for replication which isn't even supported by the
current NixOS module.
---
pkgs/servers/matrix-synapse/default.nix | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 4aff60587065..04700a9e209e 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -1,5 +1,6 @@
{ lib, stdenv, python3, openssl
, enableSystemd ? stdenv.isLinux, nixosTests
+, enableRedis ? false
}:
with python3.pkgs;
@@ -53,14 +54,15 @@ buildPythonApplication rec {
typing-extensions
authlib
pyjwt
- hiredis
- ] ++ lib.optional enableSystemd systemd;
+ ] ++ lib.optional enableSystemd systemd
+ ++ lib.optional enableRedis hiredis;
checkInputs = [ mock parameterized openssl ];
doCheck = !stdenv.isDarwin;
checkPhase = ''
+ ${lib.optionalString (!enableRedis) "rm -r tests/replication # these tests need the optional dependency 'hiredis'"}
PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests
'';
From 3b4631d601887ee5c39ad91baa6797552f6048b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 11 Oct 2020 02:18:51 +0200
Subject: [PATCH 398/590] yle-dl: 2.31 -> 20200807
---
pkgs/tools/misc/yle-dl/default.nix | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix
index 00624a482c8e..9c233e36f892 100644
--- a/pkgs/tools/misc/yle-dl/default.nix
+++ b/pkgs/tools/misc/yle-dl/default.nix
@@ -1,28 +1,28 @@
-{ stdenv, fetchFromGitHub, rtmpdump, php, pythonPackages, ffmpeg_3 }:
+{ stdenv, fetchFromGitHub, rtmpdump, php, wget, python3Packages, ffmpeg_3 }:
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
pname = "yle-dl";
- version = "2.31";
+ version = "20200807";
src = fetchFromGitHub {
owner = "aajanki";
repo = "yle-dl";
rev = version;
- sha256 = "0k93p9csyjm0w33diwl5s22kzs3g78jl3n9k8nxxpqrybfjl912f";
+ sha256 = "0jiah6gfp75rc80kzha0cr51cxiy6n3wa9g3z8zgy2nhcf8m2vxq";
};
- propagatedBuildInputs = with pythonPackages; [
- lxml pyamf pycrypto requests future ffmpeg_3 setuptools
+ propagatedBuildInputs = with python3Packages; [
+ attrs ConfigArgParse ffmpeg_3 future lxml requests
];
- pythonPath = [ rtmpdump php ];
+ pythonPath = [ rtmpdump php wget ];
doCheck = false; # tests require network access
- checkInputs = with pythonPackages; [ pytest pytestrunner ];
+ checkInputs = with python3Packages; [ ffmpeg_3 pytest pytestrunner ];
meta = with stdenv.lib; {
description = "Downloads videos from Yle (Finnish Broadcasting Company) servers";
homepage = "https://aajanki.github.io/yle-dl/";
- license = licenses.gpl3;
+ license = licenses.gpl3Plus;
maintainers = [ maintainers.dezgeg ];
platforms = platforms.linux;
};
From ee2e2c10327a1f0cbf47d173f7604e5623876673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 27 Oct 2020 11:56:30 +0100
Subject: [PATCH 399/590] yle-dl: 20200807 -> 20201022
---
pkgs/tools/misc/yle-dl/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix
index 9c233e36f892..2c2165ef5621 100644
--- a/pkgs/tools/misc/yle-dl/default.nix
+++ b/pkgs/tools/misc/yle-dl/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "yle-dl";
- version = "20200807";
+ version = "20201022";
src = fetchFromGitHub {
owner = "aajanki";
repo = "yle-dl";
rev = version;
- sha256 = "0jiah6gfp75rc80kzha0cr51cxiy6n3wa9g3z8zgy2nhcf8m2vxq";
+ sha256 = "0p56pb3wxdzqgs4fsh4hn06xs0mgzgznqqr0bn2vkkkibnkr1asp";
};
propagatedBuildInputs = with python3Packages; [
From cedc271c918c0478967865260295d6ab6aa41582 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 27 Oct 2020 12:08:00 +0100
Subject: [PATCH 400/590] yle-dl: Add SuperSandro2000 as maintainer
---
pkgs/tools/misc/yle-dl/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix
index 2c2165ef5621..4e0f2787fdbe 100644
--- a/pkgs/tools/misc/yle-dl/default.nix
+++ b/pkgs/tools/misc/yle-dl/default.nix
@@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec {
description = "Downloads videos from Yle (Finnish Broadcasting Company) servers";
homepage = "https://aajanki.github.io/yle-dl/";
license = licenses.gpl3Plus;
- maintainers = [ maintainers.dezgeg ];
+ maintainers = with maintainers; [ dezgeg SuperSandro2000 ];
platforms = platforms.linux;
};
}
From 99bf27cc456297b481560fb2f1a21e0a93dbd8ba Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Tue, 27 Oct 2020 15:03:10 +0100
Subject: [PATCH 401/590] yle-dl: enable on unix
Thanks @sikmir
Co-authored-by: Nikolay Korotkiy <sikmir@gmail.com>
---
pkgs/tools/misc/yle-dl/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix
index 4e0f2787fdbe..40bf214f4630 100644
--- a/pkgs/tools/misc/yle-dl/default.nix
+++ b/pkgs/tools/misc/yle-dl/default.nix
@@ -24,6 +24,6 @@ python3Packages.buildPythonApplication rec {
homepage = "https://aajanki.github.io/yle-dl/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dezgeg SuperSandro2000 ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
From 135f6b62ddf007187307eac6566a689a7ae7a441 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 28 Oct 2020 21:44:22 +0100
Subject: [PATCH 402/590] element-web: 1.7.10 -> 1.7.12
https://github.com/vector-im/element-web/releases/tag/v1.7.11
https://github.com/vector-im/element-web/releases/tag/v1.7.12
---
.../networking/instant-messengers/element/element-web.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix
index a71bc086370a..0d3e771630fd 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-web.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix
@@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec {
pname = "element-web";
- version = "1.7.10";
+ version = "1.7.12";
src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
- sha256 = "1xcvydjpdp6cy5g0da5yaa49gjxsmf4hsyi2q4l3p8qvs4qajn0r";
+ sha256 = "173hdg09cw13vqh0lvz6kl0mq4i3rsacjxhspkpydh2qd1g3hjrs";
};
installPhase = ''
From 9d5c765e33972ebbdee97b656aaf480be2edb195 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 28 Oct 2020 21:44:46 +0100
Subject: [PATCH 403/590] element-desktop: 1.7.10 -> 1.7.12
https://github.com/vector-im/element-desktop/releases/tag/v1.7.11
https://github.com/vector-im/element-desktop/releases/tag/v1.7.12
---
.../element/element-desktop-package.json | 4 ++--
.../element/element-desktop-yarndeps.nix | 8 ++++----
.../instant-messengers/element/element-desktop.nix | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
index 05f7af332436..364f5a25d0af 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
@@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "src/electron-main.js",
- "version": "1.7.10",
+ "version": "1.7.12",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
@@ -62,7 +62,7 @@
},
"build": {
"appId": "im.riot.app",
- "electronVersion": "10.1.1",
+ "electronVersion": "10.1.3",
"files": [
"package.json",
{
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix
index 2a611aa630a2..21374014c886 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix
@@ -4394,11 +4394,11 @@
};
}
{
- name = "npm_user_validate___npm_user_validate_1.0.0.tgz";
+ name = "npm_user_validate___npm_user_validate_1.0.1.tgz";
path = fetchurl {
- name = "npm_user_validate___npm_user_validate_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.0.tgz";
- sha1 = "8ceca0f5cea04d4e93519ef72d0557a75122e951";
+ name = "npm_user_validate___npm_user_validate_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.1.tgz";
+ sha1 = "31428fc5475fe8416023f178c0ab47935ad8c561";
};
}
{
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
index cb5e598c1211..b31841c5e79a 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
@@ -8,12 +8,12 @@
let
executableName = "element-desktop";
- version = "1.7.10";
+ version = "1.7.12";
src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-desktop";
rev = "v${version}";
- sha256 = "06ygqfhbsld4s274kakb6a5nx75jki44r8lwk3n0pi5mnkn626gl";
+ sha256 = "08d9llrglap5bbicdkbdl9l71wba2kkyhdyd0a4iqdz3l2jvv698";
};
electron = electron_9;
From 520114c59e6181c142ee53aaa1fb0dc385216315 Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Wed, 28 Oct 2020 13:46:23 -0700
Subject: [PATCH 404/590] vimPlugins: update
---
pkgs/misc/vim-plugins/generated.nix | 674 ++++++++++++++--------------
1 file changed, 337 insertions(+), 337 deletions(-)
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 14c05727e9c2..cd36f40f2792 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -65,12 +65,12 @@ let
ale = buildVimPluginFrom2Nix {
pname = "ale";
- version = "2020-10-01";
+ version = "2020-10-15";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
- rev = "2d3ed956b944132e1d520446493fa5c9aa8a309f";
- sha256 = "0mlx6g87h9mcvb5fbpx4j06mx7kpjmi8nh11kzm7bfni7bhyjhx4";
+ rev = "557a1ed5da70cb443a8650766f4e8ea95e8c0da3";
+ sha256 = "105rp35mp6nr79vyz93v36x48yjja38n9n4ngxnpsnm7qf9q8x5n";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@@ -89,12 +89,12 @@ let
ansible-vim = buildVimPluginFrom2Nix {
pname = "ansible-vim";
- version = "2020-07-13";
+ version = "2020-10-15";
src = fetchFromGitHub {
owner = "pearofducks";
repo = "ansible-vim";
- rev = "cfdde31672bce2f60bedc36842ab9bca8d28ba5b";
- sha256 = "01lpnvdym9izaq29kbgwa7kl303nnzsn0cpqq75bv7glymglbn0m";
+ rev = "7abb04c115742ec9a5f90b86170f0118680cf8ec";
+ sha256 = "185b4dari7y05p99756bqld4kk3d124ry4m4j7an8qm0zmpq648m";
};
meta.homepage = "https://github.com/pearofducks/ansible-vim/";
};
@@ -137,12 +137,12 @@ let
asyncomplete-vim = buildVimPluginFrom2Nix {
pname = "asyncomplete-vim";
- version = "2020-09-17";
+ version = "2020-10-21";
src = fetchFromGitHub {
owner = "prabirshrestha";
repo = "asyncomplete.vim";
- rev = "20a279b079452dba6e841755f8e9cc5aed75d05e";
- sha256 = "0fsafx0h3nmsrsscg233cyfhm2vj6n1k0n37l2mg0kbv77pzicga";
+ rev = "2107094f83e58818ec9b8ca033a75eeeb49db163";
+ sha256 = "0bxxl1jj1bigwnvd07wb0ypsp5rn0b5c864m4k44llw7v1r3nrms";
};
meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/";
};
@@ -197,12 +197,12 @@ let
awesome-vim-colorschemes = buildVimPluginFrom2Nix {
pname = "awesome-vim-colorschemes";
- version = "2020-09-11";
+ version = "2020-10-24";
src = fetchFromGitHub {
owner = "rafi";
repo = "awesome-vim-colorschemes";
- rev = "41a0d9ea4dac077c2050ceaf144f9ed72d6849d8";
- sha256 = "12ivlzyw0iq9jsj3ll2wwbya0ssl4vdk1vvjpg7v4xhxgh96s3jr";
+ rev = "6ab7034fde6e6e4307df83d8735643b0fe1ff641";
+ sha256 = "0ds3xxb2w645aspn2d1n5543h9vpn869aihq68z0ajkvvl8mr66z";
};
meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/";
};
@@ -281,12 +281,12 @@ let
calendar-vim = buildVimPluginFrom2Nix {
pname = "calendar-vim";
- version = "2020-08-15";
+ version = "2020-10-16";
src = fetchFromGitHub {
owner = "itchyny";
repo = "calendar.vim";
- rev = "9b2dcc18ba104820eac1701aaca44dcc24d90eb4";
- sha256 = "1vy0np1i8whyw9wfkcx564kvlxspwvrp4sznk6iixjln6ha7ngil";
+ rev = "84335b66be1e323002380280f265983dc635fd99";
+ sha256 = "0p9f7hy751ayjh6pna8gi0vi09lk0dwpi69rh21nidiqiph6n5l5";
};
meta.homepage = "https://github.com/itchyny/calendar.vim/";
};
@@ -305,12 +305,12 @@ let
caw-vim = buildVimPluginFrom2Nix {
pname = "caw-vim";
- version = "2020-06-01";
+ version = "2020-10-09";
src = fetchFromGitHub {
owner = "tyru";
repo = "caw.vim";
- rev = "0725e7c273e2c39d8730adc78e0fd20e0d57d173";
- sha256 = "14rsjy5lllmb84vs5q111cb17c6nwc37zf460kh8ii1ijziyqhy2";
+ rev = "26279f70cdfe5da2226cd15d7dd832ef6242ed26";
+ sha256 = "0sdkcbh0rxx9wf5qa7wwvm8zjk57vvclvss4cadll54zi6q8xq1s";
};
meta.homepage = "https://github.com/tyru/caw.vim/";
};
@@ -389,36 +389,36 @@ let
coc-explorer = buildVimPluginFrom2Nix {
pname = "coc-explorer";
- version = "2020-09-28";
+ version = "2020-10-27";
src = fetchFromGitHub {
owner = "weirongxu";
repo = "coc-explorer";
- rev = "c8cc53707a11192ce7b3d6ef62750fea1ea1e9ce";
- sha256 = "08zq9axfyj4c8wvn09dj6dbw9iq7w4pxgms6yh34p3qf8km6pl91";
+ rev = "9e3fdc4079255b7e77207011119bf47aae8c08f5";
+ sha256 = "0jkm2qf01w8m5x50h24y79l5qmxvwpv2hrl8v34bqhz6jvm10zz4";
};
meta.homepage = "https://github.com/weirongxu/coc-explorer/";
};
coc-fzf = buildVimPluginFrom2Nix {
pname = "coc-fzf";
- version = "2020-09-03";
+ version = "2020-10-22";
src = fetchFromGitHub {
owner = "antoinemadec";
repo = "coc-fzf";
- rev = "2047783c1c9f7bcc020612a719d932e848a2d39d";
- sha256 = "15fxpip9zz5z8np3qrsgadh7p8y8446bxb9vbcr80fcq3j8fmq0v";
+ rev = "ca80d81fdb61d1ea32cfaa498153e1f0cb651994";
+ sha256 = "1p5i415jk6af4yiqzkgghrhs52x491nrz4d3wrdxad8ydlf64jvx";
};
meta.homepage = "https://github.com/antoinemadec/coc-fzf/";
};
coc-markdownlint = buildVimPluginFrom2Nix {
pname = "coc-markdownlint";
- version = "2020-09-29";
+ version = "2020-10-27";
src = fetchFromGitHub {
owner = "fannheyward";
repo = "coc-markdownlint";
- rev = "876ce05c7a249f2065f4953ea1bfb0a0dadf764c";
- sha256 = "0qxbb45djq724yhfna0s9d7m99wcrv8vkw5ilvp1yz2vfg1b78x9";
+ rev = "abdd6450aee119750ddb4dff4a7ab82355a89418";
+ sha256 = "1p0wafvn8xzi4bm9bn2fnp8kavw8s6hchpz81ms9770jrx02z5xi";
};
meta.homepage = "https://github.com/fannheyward/coc-markdownlint/";
};
@@ -461,12 +461,12 @@ let
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim";
- version = "2020-09-26";
+ version = "2020-10-27";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
- rev = "2b83490cb1228abe4bf2c2557f1407321f6af734";
- sha256 = "10pgj0kh4vd0wvsb68l3k2af5rhmh249a2cf4mhbl8jb1g76bnrl";
+ rev = "6a903340710a808401120bd1a32f204529f00935";
+ sha256 = "1cznyvwgdgbg60hfd423h0fqdyzxhwwy5w88b5rmf44maspjr41i";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@@ -522,24 +522,24 @@ let
completion-nvim = buildVimPluginFrom2Nix {
pname = "completion-nvim";
- version = "2020-10-01";
+ version = "2020-10-23";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "completion-nvim";
- rev = "52ccd7c344dca90b62de4ea997c4aa328ce7f020";
- sha256 = "035my2dzahf6svx3f97frv6xx56k4vxxiw0qcwgsbvdp3s4jmb9g";
+ rev = "3b6774ed1c1b4720efe3385f06883483f5e16884";
+ sha256 = "1vldm13lbfmphim946lnyl30276chw4gnnnq2hxnf67k8a9x8ssc";
};
meta.homepage = "https://github.com/nvim-lua/completion-nvim/";
};
completion-tabnine = buildVimPluginFrom2Nix {
pname = "completion-tabnine";
- version = "2020-10-01";
+ version = "2020-10-03";
src = fetchFromGitHub {
owner = "aca";
repo = "completion-tabnine";
- rev = "49771bca86f185c8cd1017f28b025addae82fe09";
- sha256 = "1kc9ck62k7rj09i3bqhz36661z1501z7ns7q6dr4n07nqylcn5kb";
+ rev = "a7e6e2e249fec79f4260f388cd0c8adb38c0b3ad";
+ sha256 = "1hnbhr4sgl7a8mj2ygma9avc7hfsv18wxrxypik62x7vijsnv9aq";
};
meta.homepage = "https://github.com/aca/completion-tabnine/";
};
@@ -570,12 +570,12 @@ let
conjure = buildVimPluginFrom2Nix {
pname = "conjure";
- version = "2020-09-20";
+ version = "2020-10-17";
src = fetchFromGitHub {
owner = "Olical";
repo = "conjure";
- rev = "a9431410d74f2281ae626727342a5d23d4a12552";
- sha256 = "00b73dxirn3m0rvagskgc00vyrkkcnbxfkn22jnzv84fjvvcj375";
+ rev = "0e63269e176232cdd9f1c20d94dfd3b8ad5702a1";
+ sha256 = "0ixryjfszx09g27awdaqf5xrc7yjb5mlpc57ph3w61hdv65yps7b";
};
meta.homepage = "https://github.com/Olical/conjure/";
};
@@ -594,12 +594,12 @@ let
Coqtail = buildVimPluginFrom2Nix {
pname = "Coqtail";
- version = "2020-09-29";
+ version = "2020-10-23";
src = fetchFromGitHub {
owner = "whonore";
repo = "Coqtail";
- rev = "3c9d27a1a15da1d0f6128402fa766d9e9feebc1e";
- sha256 = "064ldkah460azqibc03cj42vbrl6ns4sj439wsbkqb0qxni5cp57";
+ rev = "2aa48079243de581b498f11bb3c4e8aba9e09f71";
+ sha256 = "07bxcvvxrfvifxk9yyg0vnisj0fsrb1mzlrrzg8qjrr571cjvj6x";
};
meta.homepage = "https://github.com/whonore/Coqtail/";
};
@@ -642,12 +642,12 @@ let
csv-vim = buildVimPluginFrom2Nix {
pname = "csv-vim";
- version = "2020-09-02";
+ version = "2020-10-07";
src = fetchFromGitHub {
owner = "chrisbra";
repo = "csv.vim";
- rev = "e23f03632ad2544f0232b824dd5520fd0b58d235";
- sha256 = "12b127v6yxwik7q2wbyqag4082yzp44sm0x4xwnv55xhlz4w6xws";
+ rev = "350af4840991142230103e4f4fc58581d9c07812";
+ sha256 = "1ibmrz1h51iy5ffvwalfydgjvdsfjvbpz1s1zmsalpv8mlswrhij";
};
meta.homepage = "https://github.com/chrisbra/csv.vim/";
};
@@ -690,12 +690,12 @@ let
ctrlp-vim = buildVimPluginFrom2Nix {
pname = "ctrlp-vim";
- version = "2020-09-21";
+ version = "2020-10-16";
src = fetchFromGitHub {
owner = "ctrlpvim";
repo = "ctrlp.vim";
- rev = "ae5237f8eb9bbc1ad7f8903738e0dc2af194f740";
- sha256 = "18inmxhqzw40sm5ixybbliikbhs10zrqp58qjcd8qc4grj8z6lcp";
+ rev = "3866ae170a342fb40d83e1538c37c81c7977b821";
+ sha256 = "1ksi46g33ghdrp0nff0fyysxnzw0sr1x5b1ln6xzjv4hkdxiz51k";
};
meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/";
};
@@ -738,12 +738,12 @@ let
defx-nvim = buildVimPluginFrom2Nix {
pname = "defx-nvim";
- version = "2020-09-24";
+ version = "2020-10-27";
src = fetchFromGitHub {
owner = "Shougo";
repo = "defx.nvim";
- rev = "a84cb7f88afc904123858b226240c3339b7ca814";
- sha256 = "1ryc0ahrjjc20344jbvxz9miyrqdjs7gz6r2awkf0ayyz6nx5gch";
+ rev = "77956f66722f3a8b7d7e1c86092a3ac84af70b90";
+ sha256 = "0iqib5fgz2hal3qm4az4glikml6i33sfk7fgwmdy5kgkx512vqb8";
};
meta.homepage = "https://github.com/Shougo/defx.nvim/";
};
@@ -786,12 +786,12 @@ let
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
- version = "2020-09-23";
+ version = "2020-10-27";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
- rev = "cb06d89aaded0bc2418d03a8fbb263ca0ef70406";
- sha256 = "0dk4w6yljnhf4qwhgamnw2bnmqikgqb8nshifn5l767sm3hk7d2h";
+ rev = "48f485e080c2b6a21a374b5b2000c091d30c5f56";
+ sha256 = "0wg1dz57hz0rq14f5lyqh9hbdyw3c1hdwpgwckd7qrncbcfbvbw2";
};
meta.homepage = "https://github.com/Shougo/denite.nvim/";
};
@@ -1004,11 +1004,11 @@ let
deoplete-vim-lsp = buildVimPluginFrom2Nix {
pname = "deoplete-vim-lsp";
- version = "2020-07-24";
+ version = "2020-10-27";
src = fetchFromGitHub {
owner = "lighttiger2505";
repo = "deoplete-vim-lsp";
- rev = "2ea06074dc07c67ccffc24b976b92e17e9d795d1";
+ rev = "cb5af558e892a70648587e673fc251409ac3dc72";
sha256 = "03rpw1z5fgglba7vymi3ln810nh5x3x9hjqlm41shdik9pgmg867";
};
meta.homepage = "https://github.com/lighttiger2505/deoplete-vim-lsp/";
@@ -1028,12 +1028,12 @@ let
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
- version = "2020-09-12";
+ version = "2020-10-23";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
- rev = "895fafe572585b807a31d4ba2835188d7b38cc41";
- sha256 = "1irhdp1bdwpyj9g40mb4n1mjw2f1hxswhgf2f1nkv1cx0j8pvkzd";
+ rev = "c09da81e9824fc113323573abea3a2ec13c04409";
+ sha256 = "0b8sp5kj6nnv3wlkpy2q14k9v9qxsf8lskb11rssrjwhfys12bn0";
};
meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
};
@@ -1076,12 +1076,12 @@ let
direnv-vim = buildVimPluginFrom2Nix {
pname = "direnv-vim";
- version = "2020-09-27";
+ version = "2020-10-10";
src = fetchFromGitHub {
owner = "direnv";
repo = "direnv.vim";
- rev = "c2b9f7834c1a2d28c4e022485b870c19de0c6ada";
- sha256 = "0qk1kywr4zdhvvpc77868g3aclwbmm5p4zvsxj65qb4bpzddxvrd";
+ rev = "983bbce66b39cd17e4b8348078a41a5782cd73a0";
+ sha256 = "1n144nihbcaljgbxv4kfg8af3dxvf9i4cxdz5qq12rzslwqgdsi1";
};
meta.homepage = "https://github.com/direnv/direnv.vim/";
};
@@ -1100,36 +1100,36 @@ let
dracula-vim = buildVimPluginFrom2Nix {
pname = "dracula-vim";
- version = "2020-07-19";
+ version = "2020-10-19";
src = fetchFromGitHub {
owner = "dracula";
repo = "vim";
- rev = "b64b22affafca7d3831a20949115b91031d596ec";
- sha256 = "1f5hwfcrsfq3yk53kkn4syaxmri8wh8h6rpq867468b8rdcnhq01";
+ rev = "80d2667818492e2e7630894f2b3eb7fdae1e240f";
+ sha256 = "1bq52larf3bbhrrzqg2gx737zc1xrg8qa916ny2qh9w7lsjjwf4h";
};
meta.homepage = "https://github.com/dracula/vim/";
};
echodoc-vim = buildVimPluginFrom2Nix {
pname = "echodoc-vim";
- version = "2020-06-08";
+ version = "2020-10-13";
src = fetchFromGitHub {
owner = "Shougo";
repo = "echodoc.vim";
- rev = "4719626bfd477f1189dd9992614ff452d3ea3caf";
- sha256 = "0bpaav7yf06wlzfiyx6iylxan8a9hici041pnmlw7kgf176h6w7b";
+ rev = "2a6d6bd6255fbfe152da6bb7f2404afa29479941";
+ sha256 = "18nm20ivkcjlh0rgf3c1wdxf1wsc4r95znm2dhgmw1ym4wmh0v4s";
};
meta.homepage = "https://github.com/Shougo/echodoc.vim/";
};
editorconfig-vim = buildVimPluginFrom2Nix {
pname = "editorconfig-vim";
- version = "2020-06-02";
+ version = "2020-10-21";
src = fetchFromGitHub {
owner = "editorconfig";
repo = "editorconfig-vim";
- rev = "0a3c1d8082e38a5ebadcba7bb3a608d88a9ff044";
- sha256 = "1w60rsij0ag74vjal2l75k4g4xv8438a0izvzpy5xir4bby2g7dz";
+ rev = "8f6eba5fd6c306e0480ea72917902a2bde162d73";
+ sha256 = "057k0fdqgc6m1d6zzql5m1q5lsdsp2s28s9f80h9sgxvrzy36z7y";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/editorconfig/editorconfig-vim/";
@@ -1161,12 +1161,12 @@ let
emmet-vim = buildVimPluginFrom2Nix {
pname = "emmet-vim";
- version = "2020-06-20";
+ version = "2020-10-21";
src = fetchFromGitHub {
owner = "mattn";
repo = "emmet-vim";
- rev = "dc6cb4fd074f4c371158eeab0c8e4ce4af33534b";
- sha256 = "1cy201c5imbw2pw65f1s0nn8p6vwm00nqlvxwygh18dhy2qv4gfa";
+ rev = "60930a968d26fc7abf4f8fd5c3926bdcda2dd787";
+ sha256 = "1sf0518rq9idj0sbyplh7y9a481i3y57wwkvdakqvngbpm4bf6ms";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/mattn/emmet-vim/";
@@ -1258,12 +1258,12 @@ let
flake8-vim = buildVimPluginFrom2Nix {
pname = "flake8-vim";
- version = "2017-02-17";
+ version = "2020-10-20";
src = fetchFromGitHub {
owner = "andviro";
repo = "flake8-vim";
- rev = "01c4af4c68f33b2b3785314bfbf5b3d8d1451795";
- sha256 = "14rv0p1vx4njlplkc72gz7r8sy9vc6n8x9l00zc777x5zzrhgz3g";
+ rev = "5bc93f7f26ceb18ccbe116830eaf8ff2baa63994";
+ sha256 = "142pgasl0b64a0zxmspdsi636axrgvdx6rh3hwjrb1zlsck19y1a";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/andviro/flake8-vim/";
@@ -1331,36 +1331,36 @@ let
fzf-vim = buildVimPluginFrom2Nix {
pname = "fzf-vim";
- version = "2020-09-11";
+ version = "2020-10-27";
src = fetchFromGitHub {
owner = "junegunn";
repo = "fzf.vim";
- rev = "3348aef05d02828cd8b071ab29476af2029ea3d3";
- sha256 = "0jyk9c3ksxss8zjk0qqkm95074glbf31a5w78sdzwn352xm8nakp";
+ rev = "7d45724fdd323d5eb7d39c8caa2e38e63c5e84a7";
+ sha256 = "1v9ry3k8si26h2f9as7dnxrh5qihl3a1spinqqlwsk9faq7d511w";
};
meta.homepage = "https://github.com/junegunn/fzf.vim/";
};
gen_tags-vim = buildVimPluginFrom2Nix {
pname = "gen_tags-vim";
- version = "2019-06-28";
+ version = "2020-10-12";
src = fetchFromGitHub {
owner = "jsfaint";
repo = "gen_tags.vim";
- rev = "208cd0490547bc8f7615eea1b26e4635d2e60a96";
- sha256 = "00s1kxi1bsvz06z7x78kls0k6ncnbqdyz14fvdxxq82f6s1kdvdw";
+ rev = "f888a2f8732e08d9f2b638b144c5c826a30953a3";
+ sha256 = "16gkczlaani0c0v3hkklriabhkgcs0mg9mrbn8jzfsap15cnkgk5";
};
meta.homepage = "https://github.com/jsfaint/gen_tags.vim/";
};
gentoo-syntax = buildVimPluginFrom2Nix {
pname = "gentoo-syntax";
- version = "2020-06-05";
+ version = "2020-10-07";
src = fetchFromGitHub {
owner = "gentoo";
repo = "gentoo-syntax";
- rev = "47b6900c425614d4ba22223c13a23920f0618d9f";
- sha256 = "0agswv1r5nxbnw0nddhw9vqvrfsvsgh18nwrg83c01sj97075qmv";
+ rev = "3d90ee5686e54fb1c3242f10e644a789579a4372";
+ sha256 = "0qvfqw38vk9ijwhgivjwh289vnmzc2p7cp6jiqpj98zsnank0yw2";
};
meta.homepage = "https://github.com/gentoo/gentoo-syntax/";
};
@@ -1475,12 +1475,12 @@ let
gruvbox-community = buildVimPluginFrom2Nix {
pname = "gruvbox-community";
- version = "2020-05-23";
+ version = "2020-10-04";
src = fetchFromGitHub {
owner = "gruvbox-community";
repo = "gruvbox";
- rev = "933b6cc35a0f180ff488ef20c7b534c9c3b6701a";
- sha256 = "0w10hcz66dgilx6fv07bb3zsf5c0x9gv4vhp15c5fp2rzwxi10bn";
+ rev = "9e71159ffa93be1e772d2cb3c78ee940f7b308ba";
+ sha256 = "0n3jzzjbfrs3r26bagry3pvqcy2asb1jkcfqvabmycs6y6w8sx01";
};
meta.homepage = "https://github.com/gruvbox-community/gruvbox/";
};
@@ -1499,12 +1499,12 @@ let
gv-vim = buildVimPluginFrom2Nix {
pname = "gv-vim";
- version = "2020-05-22";
+ version = "2020-10-16";
src = fetchFromGitHub {
owner = "junegunn";
repo = "gv.vim";
- rev = "61d877d23caaad9009d672f90fe2ab576ab93d2d";
- sha256 = "00h4d6jah0fdr5m8x9c1gmmm9wskplixnvbbalfbbpc599xhgj83";
+ rev = "486b5c4e960d5ec9e79888939534b7b2fc7453ad";
+ sha256 = "07pj94s5kf8qgwdz73xbb7b2h3w6gkv4sw9faicdb6hla3i19d9b";
};
meta.homepage = "https://github.com/junegunn/gv.vim/";
};
@@ -1547,12 +1547,12 @@ let
hoon-vim = buildVimPluginFrom2Nix {
pname = "hoon-vim";
- version = "2020-02-19";
+ version = "2020-10-15";
src = fetchFromGitHub {
owner = "urbit";
repo = "hoon.vim";
- rev = "116f29971a2fbec8e484daeba8afd9d60f85800f";
- sha256 = "029rm8njpsa0lhhh504975lmw7yr2bkvxi2gag1l9279r629vp2r";
+ rev = "aeb307427f2ffaf756cb04574f5ed0d77626d51e";
+ sha256 = "11nsws8q54lya6lk51zkwhv47rmidg1wclgd4vq7v4jwc25gw8id";
};
meta.homepage = "https://github.com/urbit/hoon.vim/";
};
@@ -1643,12 +1643,12 @@ let
indentLine = buildVimPluginFrom2Nix {
pname = "indentLine";
- version = "2020-09-04";
+ version = "2020-10-12";
src = fetchFromGitHub {
owner = "Yggdroot";
repo = "indentLine";
- rev = "5bf49035522dea94b72638d039828c6f84b7ae34";
- sha256 = "098ng8f2dv29pgvai4nsm2d5qyw44gd9dxjmdc3mdznzmn0clvvf";
+ rev = "6107214eff0cac5d9810d29ae8614ddfdfcd986b";
+ sha256 = "1aycs427w9w5hjnif5c13wf3jd872a3i94zzdfisfrispbs3ad2m";
};
meta.homepage = "https://github.com/Yggdroot/indentLine/";
};
@@ -1691,12 +1691,12 @@ let
is-vim = buildVimPluginFrom2Nix {
pname = "is-vim";
- version = "2017-10-30";
+ version = "2020-10-27";
src = fetchFromGitHub {
owner = "haya14busa";
repo = "is.vim";
- rev = "61d5029310c69bde700b2d46a454f80859b5af17";
- sha256 = "1nnf6y62mc0rj7hbrapfkmr91ypsqkzhwgpfx7pahz8m3a2324q6";
+ rev = "d393cb346dcdf733fecd7bbfc45b70b8c05e9eb4";
+ sha256 = "03rvhvqx59c6lp9xh6zry3ynppngqn53swl3v9gmc3ynh3l1jdzq";
};
meta.homepage = "https://github.com/haya14busa/is.vim/";
};
@@ -1764,12 +1764,12 @@ let
julia-vim = buildVimPluginFrom2Nix {
pname = "julia-vim";
- version = "2020-09-07";
+ version = "2020-10-14";
src = fetchFromGitHub {
owner = "JuliaEditorSupport";
repo = "julia-vim";
- rev = "33116e1135ffa0c09997c111785beb5232efc7cf";
- sha256 = "1qx1xpnnzvb5h86mrywx56yqw5lbma9xmwdgi6dh6x8mzald7agw";
+ rev = "a4bc8a2032e9da4dbfc5f527c2415b68fc09b9bd";
+ sha256 = "1ir0yj0f0ggndxfpg8119vcb1l7qagf5qsl9s94ghbka6qqvlia3";
};
meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/";
};
@@ -1836,12 +1836,12 @@ let
lean-vim = buildVimPluginFrom2Nix {
pname = "lean-vim";
- version = "2019-10-04";
+ version = "2020-10-10";
src = fetchFromGitHub {
owner = "leanprover";
repo = "lean.vim";
- rev = "2ace010eb32603a65af7921954a0594a02523c6b";
- sha256 = "0wq2lw4xx2qhz1xii9g7i6wz0y43b2icqrm6ypr9jmaac1rhiq7c";
+ rev = "c3a99f34a92af8a86e162134276222309e01e896";
+ sha256 = "09kz4iy0flwdawhd0phy6jl6zkxp3qdyhl8snl0n12sbskzq7i1b";
};
meta.homepage = "https://github.com/leanprover/lean.vim/";
};
@@ -1872,12 +1872,12 @@ let
lf-vim = buildVimPluginFrom2Nix {
pname = "lf-vim";
- version = "2020-06-11";
+ version = "2020-10-13";
src = fetchFromGitHub {
owner = "ptzz";
repo = "lf.vim";
- rev = "8eef4095f0ca4ec37b6877b7b01047146e987c6b";
- sha256 = "17clfc8shmv485r6anpkkcq88x6n2pm54ir1pjy852spzykycika";
+ rev = "e541328a67fe10f1323630a30a37b58c934d7819";
+ sha256 = "09w33f4cyg9wdj8jas5h43cc7byqfmmm9wyc0xjaw9jxcp78ygg9";
};
meta.homepage = "https://github.com/ptzz/lf.vim/";
};
@@ -1896,12 +1896,12 @@ let
lh-vim-lib = buildVimPluginFrom2Nix {
pname = "lh-vim-lib";
- version = "2020-09-30";
+ version = "2020-10-27";
src = fetchFromGitHub {
owner = "LucHermitte";
repo = "lh-vim-lib";
- rev = "df2a495aac2dae95e9869c35d79ed26313f0e7c3";
- sha256 = "1hc4vsyb616qj0irak1c28kgsk7aszk3x94mhrbgy6yxkiv9asgn";
+ rev = "b5959b4fa3635d9a7eac587a5c223effca14a970";
+ sha256 = "0rfl5c2bf0j6kn1knzg4kywi7xvqhr6impwfh5466ncb4p529vlk";
};
meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/";
};
@@ -1932,36 +1932,36 @@ let
lightline-vim = buildVimPluginFrom2Nix {
pname = "lightline-vim";
- version = "2020-09-25";
+ version = "2020-10-20";
src = fetchFromGitHub {
owner = "itchyny";
repo = "lightline.vim";
- rev = "2afc3ab4dda191c75764d3239d1cf56356759dd4";
- sha256 = "0yvinwvzhqb87nqg38azd19c9w0yrkl06mx3agji2mvn23p66ab5";
+ rev = "8769bbb84cd22b475275cc4f9f06a25445357a49";
+ sha256 = "1q1pmfvzvdsknw67zi00b3bn8y10mx7wjfc1nxfy1h33vzhl2g2r";
};
meta.homepage = "https://github.com/itchyny/lightline.vim/";
};
limelight-vim = buildVimPluginFrom2Nix {
pname = "limelight-vim";
- version = "2020-09-07";
+ version = "2020-10-13";
src = fetchFromGitHub {
owner = "junegunn";
repo = "limelight.vim";
- rev = "815c6122504361d52e10172601471b416d040ca8";
- sha256 = "1af9jz05iphp6738vvfchnvhfxw7wx2hxqs0iyjkmi7w43hsw0sy";
+ rev = "4412a84d7fbfd01281bf23d801e95c45c1eacc09";
+ sha256 = "1qab2pd1pyfrw0llxd5j11imzqxa3lnnfhr1w2fjn3yanbsxvlvd";
};
meta.homepage = "https://github.com/junegunn/limelight.vim/";
};
lsp_extensions-nvim = buildVimPluginFrom2Nix {
pname = "lsp_extensions-nvim";
- version = "2020-09-06";
+ version = "2020-10-19";
src = fetchFromGitHub {
owner = "tjdevries";
repo = "lsp_extensions.nvim";
- rev = "7c3f907c3cf94d5797dcdaf5a72c5364a91e6bd2";
- sha256 = "0c9glx0hn28m5jzz52ny1rcp63s9fdlznvywy4gzwwqi9rscqznz";
+ rev = "85ce064c36b93cd8856d6dfc41ea5089764ec1c6";
+ sha256 = "0vljxb9cvq042f70cq01n5mf2vd2wg2qpj75nlva9rjhiw9q3qw8";
};
meta.homepage = "https://github.com/tjdevries/lsp_extensions.nvim/";
};
@@ -2292,12 +2292,12 @@ let
neoformat = buildVimPluginFrom2Nix {
pname = "neoformat";
- version = "2020-09-27";
+ version = "2020-10-27";
src = fetchFromGitHub {
owner = "sbdchd";
repo = "neoformat";
- rev = "78098f6d1e03fd87ca90a522a752106357dfdc6f";
- sha256 = "0hpml222gj203svm7f9sghzgg0ccjvf0xw9lbnfmn8naxqqqmzw6";
+ rev = "2033ca4fa0a820658f07e6a2ffcfb0434d5be071";
+ sha256 = "0mz237rbymlq6ksmyakc6mqvskic72fgaw88jywg3cmnjjskqvi2";
};
meta.homepage = "https://github.com/sbdchd/neoformat/";
};
@@ -2340,12 +2340,12 @@ let
neosnippet-snippets = buildVimPluginFrom2Nix {
pname = "neosnippet-snippets";
- version = "2020-09-24";
+ version = "2020-10-08";
src = fetchFromGitHub {
owner = "Shougo";
repo = "neosnippet-snippets";
- rev = "886a414e339fe40a47f30da8aa6012a6e0906018";
- sha256 = "0rnqa2cc7imapizg52r5dxzq2x2m8sxvds2q27ablzcvvghsjh96";
+ rev = "7448233dfd40e7f0a1075fefa76d1d5a84e5d28a";
+ sha256 = "0dy7fgdhkz06720ws4r5gyksqg60hb2v157vkbzii3jqd5fx8mkf";
};
meta.homepage = "https://github.com/Shougo/neosnippet-snippets/";
};
@@ -2436,24 +2436,24 @@ let
nerdtree = buildVimPluginFrom2Nix {
pname = "nerdtree";
- version = "2020-08-18";
+ version = "2020-10-14";
src = fetchFromGitHub {
owner = "preservim";
repo = "nerdtree";
- rev = "577ddc73f0a1d2fd6166ed3268ab8536111037e0";
- sha256 = "0bccr18nr42vwbb4i765yxjw18piyiyd12sm4snbkkxahp9yswf7";
+ rev = "14af89743ac1c31ff9bb43682025eda50333a7d5";
+ sha256 = "1q50cc9z91v809s65w0zq2s0z5smvghy0fbdjn64mr894ndvrmcv";
};
meta.homepage = "https://github.com/preservim/nerdtree/";
};
nerdtree-git-plugin = buildVimPluginFrom2Nix {
pname = "nerdtree-git-plugin";
- version = "2020-09-25";
+ version = "2020-10-16";
src = fetchFromGitHub {
owner = "Xuyuanp";
repo = "nerdtree-git-plugin";
- rev = "85c4bed898d2d755a2a2ffbfc2433084ce107cdd";
- sha256 = "1m8s5x30k875812fbznvbq3pch5jpy29jr5rpzr0pr2ni5wkv6a4";
+ rev = "01b84c63b9ba48628285779fbdfd046dd2bc2970";
+ sha256 = "1bmnm5my7r8ranafanwc33qksic444p47i23qsnkkphxk2hiq5q7";
};
meta.homepage = "https://github.com/Xuyuanp/nerdtree-git-plugin/";
};
@@ -2472,12 +2472,12 @@ let
nim-vim = buildVimPluginFrom2Nix {
pname = "nim-vim";
- version = "2019-04-26";
+ version = "2020-10-16";
src = fetchFromGitHub {
owner = "zah";
repo = "nim.vim";
- rev = "88f5e708a739fb26be6364ab2fabadf9fffb8d7b";
- sha256 = "0ja8qx9c5g7k4phllvk3vz6s62iwpwsn40w6c32sybjs98jkrw7y";
+ rev = "7a8737a4532239c06116ebde0329d8156f3d3b55";
+ sha256 = "05xhac416c8zsgqlchc80f7gbjxbyngi6cxziqagdhr6kccc73gi";
};
meta.homepage = "https://github.com/zah/nim.vim/";
};
@@ -2580,12 +2580,12 @@ let
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
- version = "2020-10-01";
+ version = "2020-10-27";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
- rev = "5debe931333b20fe2b352dd92c03ded837e3df4b";
- sha256 = "1mw5v1qpqz7h9vb89bj1m8wrqk7yvfycmal7y1b5wizl45ssx40m";
+ rev = "d9454afd93b8396fb72ff15179b5c59df21713c3";
+ sha256 = "0kx2ljal46fj2pgvv2cpflxp6s0qzlry8i5mk0in27qs8bix79jn";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@@ -2640,12 +2640,12 @@ let
onehalf = buildVimPluginFrom2Nix {
pname = "onehalf";
- version = "2020-06-11";
+ version = "2020-10-14";
src = fetchFromGitHub {
owner = "sonph";
repo = "onehalf";
- rev = "3aa42a39ed3cddde0c53976a700b81b8a7067890";
- sha256 = "0x01c7930hlzvjac3r2wbkdha8j6mmhyk7nwgdazh1z4sxqjyj1l";
+ rev = "89923117bc49dd1e0c6b7fdd34bc6dc4d425fe1f";
+ sha256 = "0d3d9sp88b41j8yhkn99b0g1y3jbcm3hhf8dw6kq50scrb84g5y3";
};
meta.homepage = "https://github.com/sonph/onehalf/";
};
@@ -2676,12 +2676,12 @@ let
palenight-vim = buildVimPluginFrom2Nix {
pname = "palenight-vim";
- version = "2020-09-08";
+ version = "2020-10-20";
src = fetchFromGitHub {
owner = "drewtempelmeyer";
repo = "palenight.vim";
- rev = "294f190da3bd50a7c91fed1b94c92fd0930791ec";
- sha256 = "0s9mna0dcpszz3wyz1qmmrm76rxkjlmyxn7697k5vz4l49zzyi39";
+ rev = "847fcf5b1de2a1f9c28fdcc369d009996c6bf633";
+ sha256 = "0v7jkg6rpwmyq0wl6lymm2j07r0mzab8lbsnxb0jw34hcpx0rfis";
};
meta.homepage = "https://github.com/drewtempelmeyer/palenight.vim/";
};
@@ -2796,12 +2796,12 @@ let
purescript-vim = buildVimPluginFrom2Nix {
pname = "purescript-vim";
- version = "2018-12-10";
+ version = "2020-10-08";
src = fetchFromGitHub {
owner = "purescript-contrib";
repo = "purescript-vim";
- rev = "67ca4dc4a0291e5d8c8da48bffc0f3d2c9739e7f";
- sha256 = "1insh39hzbynr6qxb215qxhpifl5m8i5i0d09a3b6v679i7s11i8";
+ rev = "5b4fa3e2970be1353f7d77735c0c9b42dc9885f3";
+ sha256 = "11d2jfzimdi6idvs61gjhy7d1g8yk90dfvvw5m8rn9620xrypbgn";
};
meta.homepage = "https://github.com/purescript-contrib/purescript-vim/";
};
@@ -3108,12 +3108,12 @@ let
skim-vim = buildVimPluginFrom2Nix {
pname = "skim-vim";
- version = "2019-07-31";
+ version = "2020-10-20";
src = fetchFromGitHub {
owner = "lotabout";
repo = "skim.vim";
- rev = "4e9d9a3deb2060e2e79fede1c213f13ac7866eb5";
- sha256 = "0vpfn2zivk8cf2l841jbd78zl1vzdw1wjf9p0dm6pgr84kj9pkx4";
+ rev = "2908249af6b759c79c7834862bd42af3a8bc6d4e";
+ sha256 = "1819niha13yzhk7sya1mx8qigjwacd4mdp6s2hkk03l1s6x84dj7";
};
meta.homepage = "https://github.com/lotabout/skim.vim/";
};
@@ -3228,12 +3228,12 @@ let
splitjoin-vim = buildVimPluginFrom2Nix {
pname = "splitjoin-vim";
- version = "2020-09-21";
+ version = "2020-10-25";
src = fetchFromGitHub {
owner = "AndrewRadev";
repo = "splitjoin.vim";
- rev = "7148cbc3b9c4f70cea9fdccb72ae246b6d499c20";
- sha256 = "0smaghrigmr8jmw919pmlcvv6a7w7rw2j12gnbks30pi45y547jm";
+ rev = "1c1b94a6aa218c429421c82bcc56a216301b6e85";
+ sha256 = "1jkny1ag82zvkfjvbzrkkh4s54jcf9hq5n9ak3g691zcddhmrp17";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
@@ -3337,12 +3337,12 @@ let
tagbar = buildVimPluginFrom2Nix {
pname = "tagbar";
- version = "2020-09-29";
+ version = "2020-10-27";
src = fetchFromGitHub {
owner = "preservim";
repo = "tagbar";
- rev = "a1e0e7a57144a0af26e219d16f6f00098b271e25";
- sha256 = "04c0s7q7gg1znvzgfdyicscfgbpxj7z5ym7v8zpcg9bfhg29nngv";
+ rev = "aa8c59220148640d66e779c1da495e6c5dfa78a9";
+ sha256 = "17ll4hgf67pc24r0bf9zz4l4g5xd3bchgh8i7acd2svsxckjjy3z";
};
meta.homepage = "https://github.com/preservim/tagbar/";
};
@@ -3373,12 +3373,12 @@ let
tcomment_vim = buildVimPluginFrom2Nix {
pname = "tcomment_vim";
- version = "2020-08-23";
+ version = "2020-10-09";
src = fetchFromGitHub {
owner = "tomtom";
repo = "tcomment_vim";
- rev = "25bdb50a6c5934d4ac9313cef0d7d2168d84803b";
- sha256 = "04dmdydrc4v055qkjn5gfvibyzd30fg00abnk8ijvabfcmhvlh40";
+ rev = "cfd1360119f5d41ed161cdf8a3e8502680f2fb4c";
+ sha256 = "040vwmgqlhnvjc8d32d9lw3a5lr7flgj4h6gnz6m1zw9jw5l68gh";
};
meta.homepage = "https://github.com/tomtom/tcomment_vim/";
};
@@ -3470,12 +3470,12 @@ let
traces-vim = buildVimPluginFrom2Nix {
pname = "traces-vim";
- version = "2020-09-24";
+ version = "2020-10-13";
src = fetchFromGitHub {
owner = "markonm";
repo = "traces.vim";
- rev = "8ea8d8b98e61cddaff159b4328310f4096c7bb2b";
- sha256 = "1fs7j7v72nv5374pqpx68xjc8kl3fyyhwz4hc029kljqlvgg0lrj";
+ rev = "1fb8738cf1e4db06423396dd3576592a94255935";
+ sha256 = "0jl7m04rly8y1kslmcmi9f83a87qb3fbk6isqqqd5xgrxxmcj753";
};
meta.homepage = "https://github.com/markonm/traces.vim/";
};
@@ -3494,12 +3494,12 @@ let
tsuquyomi = buildVimPluginFrom2Nix {
pname = "tsuquyomi";
- version = "2020-03-10";
+ version = "2020-10-16";
src = fetchFromGitHub {
owner = "Quramy";
repo = "tsuquyomi";
- rev = "85fffd5939c8fc5750b35a937b965af2ad5b0b15";
- sha256 = "1j5wdh0xa5yld4fy2msyjf1qvj8zx0iccc1bw63zzbrcl6rs30gx";
+ rev = "144526df5340d3bd0b413e6127c0393de171889a";
+ sha256 = "1amizvbpv4mwpi39x9xn5aj1kjkgl4sgh54irnhs4ga76zn0s09d";
};
meta.homepage = "https://github.com/Quramy/tsuquyomi/";
};
@@ -3518,12 +3518,12 @@ let
ultisnips = buildVimPluginFrom2Nix {
pname = "ultisnips";
- version = "2020-09-08";
+ version = "2020-10-21";
src = fetchFromGitHub {
owner = "SirVer";
repo = "ultisnips";
- rev = "7941f98337564d4e86cf2b7467b64def4d212794";
- sha256 = "0miihbj9h3ay6iq1ld13ixij3l4h02yrmc7bq8iarw776l89gin0";
+ rev = "e6478871c04bb75f3c6cb9b90e171fffbf9c8ff3";
+ sha256 = "17f1q0hv89l5mdiv3xrk1l3lnlxj6gbg8pnzcpx5dk4sd14xivd3";
};
meta.homepage = "https://github.com/SirVer/ultisnips/";
};
@@ -3542,12 +3542,12 @@ let
unicode-vim = buildVimPluginFrom2Nix {
pname = "unicode-vim";
- version = "2020-08-10";
+ version = "2020-10-07";
src = fetchFromGitHub {
owner = "chrisbra";
repo = "unicode.vim";
- rev = "e9b21134f4e8bc8cd09fa6145749511ac8800f98";
- sha256 = "0rfkd11arkmc2z2m9lz5hnqxfcp2b98hmzgf424s44xyhrn98y16";
+ rev = "5f21e3e7e60f6d032daa4769e7ee84885fb0ce4d";
+ sha256 = "0sfbv620zl8lqdzsypxcn9gasaaqpwarsynjxa25c4cd843cz3d2";
};
meta.homepage = "https://github.com/chrisbra/unicode.vim/";
};
@@ -3590,12 +3590,12 @@ let
vCoolor-vim = buildVimPluginFrom2Nix {
pname = "vCoolor-vim";
- version = "2018-10-06";
+ version = "2020-10-14";
src = fetchFromGitHub {
owner = "KabbAmine";
repo = "vCoolor.vim";
- rev = "8fc037e453f4c2274f590bde4f9fb56167b14e57";
- sha256 = "193cjxfha5xcpfjqqpyfa6xidys1zmmmwlcj7w2cxbr5j5bdnybm";
+ rev = "bc19d684af09b1e146cf72176eea1ecded84882c";
+ sha256 = "03vaghwqr3k0nls365wk4qwzmvdvdvq41q02c3l5qv2vsdikmz5i";
};
meta.homepage = "https://github.com/KabbAmine/vCoolor.vim/";
};
@@ -3866,24 +3866,24 @@ let
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
- version = "2020-09-26";
+ version = "2020-10-18";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
- rev = "9614105d09ff0d6e1043ab33028615f107fe94a5";
- sha256 = "11kkzl473l4nrz3k13264sn23pmpr1pdcnmxkzndpx1k0r3f87qy";
+ rev = "8608270bd39e9aa31bbdb8cd22b2ba776037feb6";
+ sha256 = "1g9nq313zdmklwcnn4lakyndc96qiq2zp9l3cg119i5470y7i1lz";
};
meta.homepage = "https://github.com/vim-airline/vim-airline/";
};
vim-airline-themes = buildVimPluginFrom2Nix {
pname = "vim-airline-themes";
- version = "2020-08-27";
+ version = "2020-10-08";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline-themes";
- rev = "155bce6665ab8c83447102e8402cc9d3b7c3b3f3";
- sha256 = "1qavi386va4wnalaf03b19lfxypbkjcjdiiasbdzfnlqpz7d4rwy";
+ rev = "e1b0d9f86cf89e84b15c459683fd72730e51a054";
+ sha256 = "1mlp2yvam11cyscqy6ifn4chhm4w9ccf5hvjd4g3v2nb31zw5h3f";
};
meta.homepage = "https://github.com/vim-airline/vim-airline-themes/";
};
@@ -3938,12 +3938,12 @@ let
vim-autoformat = buildVimPluginFrom2Nix {
pname = "vim-autoformat";
- version = "2020-09-29";
+ version = "2020-10-18";
src = fetchFromGitHub {
owner = "Chiel92";
repo = "vim-autoformat";
- rev = "ed8ea34b649c100c0b60167f8bde12e804627044";
- sha256 = "0dwql5s2j3bmdz0zfmx2f5fdky72mfa91q7kc301rgd9lr5jhqbg";
+ rev = "ba41779884d23fc1f865c5077dfea7b53377e7b2";
+ sha256 = "1qfq3clgizk7h992x0j3khh53snxm4jjdaq46cy1mgapw4za7d2a";
};
meta.homepage = "https://github.com/Chiel92/vim-autoformat/";
};
@@ -4046,12 +4046,12 @@ let
vim-carbon-now-sh = buildVimPluginFrom2Nix {
pname = "vim-carbon-now-sh";
- version = "2019-02-14";
+ version = "2020-10-25";
src = fetchFromGitHub {
owner = "kristijanhusak";
repo = "vim-carbon-now-sh";
- rev = "789b15d17966a1100ed2889d670923dd6d9ff063";
- sha256 = "1vfhdqv8mf8w0s4nv8k2rqzvahvh1lxm4zsd3ks1n334f580w8x4";
+ rev = "f348932f5b65bfccaaa54cfc018fbd251240434f";
+ sha256 = "17hj0mfl636hdw4m37xgjg8lahiir3g8bh9rfyq0avqqscjhzc58";
};
meta.homepage = "https://github.com/kristijanhusak/vim-carbon-now-sh/";
};
@@ -4082,12 +4082,12 @@ let
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
- version = "2020-09-30";
+ version = "2020-10-27";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
- rev = "c6ed3de48693d754ef47ec9422ecb065200f8a70";
- sha256 = "1wnz8fx7nkl4maszghl4q0csw3zi26vnavrvzc447il077sff3wq";
+ rev = "6bf6a490c27737f04b92082a5859357ad43887c9";
+ sha256 = "1nl3bzkqkzxya5a4wpqiads7xyx4prxyzllp9anyg0imbvqd54ms";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@@ -4118,12 +4118,12 @@ let
vim-closetag = buildVimPluginFrom2Nix {
pname = "vim-closetag";
- version = "2020-04-09";
+ version = "2020-10-09";
src = fetchFromGitHub {
owner = "alvan";
repo = "vim-closetag";
- rev = "90cf416c03ed841ad7f3d44f4d6f3192f216176a";
- sha256 = "0kxba7s0s66m2k4j1v8iwq6m5j9843ha67br03dg7d9ya4qiyyw9";
+ rev = "bd6bbc33c7e178673aa1dd17a5d249bbd4e3a6a6";
+ sha256 = "0nqzjma6mqg19cxq0ck2lym51ajb1x97z497zf9pbp47hkg5875j";
};
meta.homepage = "https://github.com/alvan/vim-closetag/";
};
@@ -4274,12 +4274,12 @@ let
vim-cue = buildVimPluginFrom2Nix {
pname = "vim-cue";
- version = "2020-09-28";
+ version = "2020-10-26";
src = fetchFromGitHub {
owner = "jjo";
repo = "vim-cue";
- rev = "1c802d17f86c775d879b2cdebe84efd40dc4bbfd";
- sha256 = "1gp0s4094prxqyzk39igigjqppha7bmy4j36wxl16ns1v8yq4qp1";
+ rev = "9e8bef1198817b6bae1143fecd965403d65d2466";
+ sha256 = "0rq74znq9mx5p925jd120l5apjqdqp6xy6llzhf2gq5cxpg62hjl";
};
meta.homepage = "https://github.com/jjo/vim-cue/";
};
@@ -4358,12 +4358,12 @@ let
vim-dirdiff = buildVimPluginFrom2Nix {
pname = "vim-dirdiff";
- version = "2020-03-31";
+ version = "2020-10-12";
src = fetchFromGitHub {
owner = "will133";
repo = "vim-dirdiff";
- rev = "5bf29d8a41b4ec93e6c04b9d4a6c626b408c27c5";
- sha256 = "0nvhsj12gsjgncpmvg8b1qz675ghfcsib5gj22p7j4l4brih563r";
+ rev = "6e4b04c252be6537b888e88e5bef959308a7c993";
+ sha256 = "0n5g78021xzswfnghhzfgv5acaqv6s9k10d8kp84b846bjxc5hb7";
};
meta.homepage = "https://github.com/will133/vim-dirdiff/";
};
@@ -4454,11 +4454,11 @@ let
vim-easymotion = buildVimPluginFrom2Nix {
pname = "vim-easymotion";
- version = "2020-09-29";
+ version = "2020-10-25";
src = fetchFromGitHub {
owner = "easymotion";
repo = "vim-easymotion";
- rev = "6c9c0547bfcca6a059dfaaf39dcac1b8c4e814c4";
+ rev = "41bbb8ce8a3c3acc837895ebd79f8a8bc07b99b3";
sha256 = "1lbn844pv5pnla3qhc01wyyrx3czmr83gax8pr3w6283jwp4di6y";
};
meta.homepage = "https://github.com/easymotion/vim-easymotion/";
@@ -4586,12 +4586,12 @@ let
vim-fireplace = buildVimPluginFrom2Nix {
pname = "vim-fireplace";
- version = "2020-09-23";
+ version = "2020-10-11";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fireplace";
- rev = "f936a7671888638dec54b86f2e49001a0e5e6005";
- sha256 = "0yvvwi4kf6frrgdwd86p2bpcgh4x2lrhav1yl58q6mrdp2qjl446";
+ rev = "a465d598b23b4fa04f0cd61895918cca498f1c9b";
+ sha256 = "0ydpx8x931wix35fv9hamms4bl4s1hvzawsalhfi4cg4qnp3dkj8";
};
meta.homepage = "https://github.com/tpope/vim-fireplace/";
};
@@ -4646,12 +4646,12 @@ let
vim-floaterm = buildVimPluginFrom2Nix {
pname = "vim-floaterm";
- version = "2020-09-16";
+ version = "2020-10-19";
src = fetchFromGitHub {
owner = "voldikss";
repo = "vim-floaterm";
- rev = "dfaecd8d3fede970a1e4c38e2287e0fa5a264253";
- sha256 = "0wkhib4cawh6hq1ihq851afdj6chkxw4a4dqgjkvz2f6krhpblj5";
+ rev = "f6654e2f9c29bd85039a11f305acd4e5222b03f8";
+ sha256 = "07bh7hkajfg5gchmi0psy0anaz2rdvhii3p09xml9dfkvrapzdrx";
};
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
};
@@ -4694,12 +4694,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2020-09-30";
+ version = "2020-10-27";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "4189bdb580743a92f0e81d0ba9359a1c3b253a3c";
- sha256 = "0pbmi9p87bqvf2l5jxq1wdkjjgwn0m3r1lswdbxrn070s8c8rg0a";
+ rev = "1a77f1c00e12e8460f39098ec3289c5433d32512";
+ sha256 = "14w43j0gnh10kyshikz4cl6m3f04a6hpiqasn2n71isvdd1p24kp";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@@ -4718,12 +4718,12 @@ let
vim-gist = buildVimPluginFrom2Nix {
pname = "vim-gist";
- version = "2020-01-29";
+ version = "2020-10-04";
src = fetchFromGitHub {
owner = "mattn";
repo = "vim-gist";
- rev = "2158eceb210b0a354bc17aa4144554e5d8bb6c79";
- sha256 = "1dz33c63q7gghz35hyrvbshqw20faccs7bvxlda5w70mkbz9h9c4";
+ rev = "4a210316550577c1b6a5cb13b09ce79fba602b9c";
+ sha256 = "1c3k2yfaxijg0c8fvh70jqmrc6zyhh57hid7rm77v2kymvimvazg";
};
meta.homepage = "https://github.com/mattn/vim-gist/";
};
@@ -4754,12 +4754,12 @@ let
vim-gitgutter = buildVimPluginFrom2Nix {
pname = "vim-gitgutter";
- version = "2020-09-11";
+ version = "2020-10-27";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-gitgutter";
- rev = "ea79bc01c2efc84cf8e71fbe5fd8adbf4242739d";
- sha256 = "0dv69ganm4rv2909yy9w13y82bik4maa5x1z3kpv0hrd55qay40z";
+ rev = "e480eb2b63e337b07e7e5fef288df0b77c06cac5";
+ sha256 = "16vidy7kws3n29x9cm4pvb8cvam183wnv2ybvr8iyn8y3p9w3l2j";
};
meta.homepage = "https://github.com/airblade/vim-gitgutter/";
};
@@ -4790,12 +4790,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2020-09-28";
+ version = "2020-10-19";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "e8da3621d6177e5b0beca318a0f9f5baa44d9350";
- sha256 = "0q7i7c6d7infybw870qlbdgpqddykzw14142ikz8x0sb30ijigxq";
+ rev = "a5e2535d31aa1d7c0fa8a4e77ee96b92ad185be5";
+ sha256 = "0ixpy4vvvh7kgwq4wvyiw8cm3aj89mql2phf49rmi60d9kli3kn9";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@@ -4814,12 +4814,12 @@ let
vim-graphql = buildVimPluginFrom2Nix {
pname = "vim-graphql";
- version = "2020-09-14";
+ version = "2020-10-04";
src = fetchFromGitHub {
owner = "jparise";
repo = "vim-graphql";
- rev = "b06a6e62db170f085aa4af7f2439ae7e453eb1d3";
- sha256 = "12qwz7m652jgn86210mbbg1glcmshm67wdhrsb36bxqrx39g1ghh";
+ rev = "51c5b178cce145c3aaa22fbc37fd5d64065baebc";
+ sha256 = "0kgnyc94fd5i7456vdnad58yn1qcanfp0lg7xdf5dbs1nbarzywg";
};
meta.homepage = "https://github.com/jparise/vim-graphql/";
};
@@ -5030,12 +5030,12 @@ let
vim-illuminate = buildVimPluginFrom2Nix {
pname = "vim-illuminate";
- version = "2020-08-25";
+ version = "2020-10-24";
src = fetchFromGitHub {
owner = "RRethy";
repo = "vim-illuminate";
- rev = "56e7df8f402a8302fa7f6cb21760d366a105d94c";
- sha256 = "0j4986pdh06q5d0bq4k6lq0b6bgi1fazng106ykhg3aaxjqqhs37";
+ rev = "3f8a03701f271c3dc44313fa1254527021afe748";
+ sha256 = "1nwzdp708s5j63qldrmf1vvq2vy6vl89hmlnfygdch9dvmzhbvha";
};
meta.homepage = "https://github.com/RRethy/vim-illuminate/";
};
@@ -5126,12 +5126,12 @@ let
vim-javacomplete2 = buildVimPluginFrom2Nix {
pname = "vim-javacomplete2";
- version = "2020-07-29";
+ version = "2020-10-27";
src = fetchFromGitHub {
owner = "artur-shaik";
repo = "vim-javacomplete2";
- rev = "80cf31797a85012b7408701073d743a45a3fbf36";
- sha256 = "19ci5n8rkf4wf4ivqj2mjig4m6phvy14k0zplkbafccaadnc0k21";
+ rev = "e25876fd386bb2feda519335587c22e493c78541";
+ sha256 = "0g92806r8g243apl0g4i1c9mhmqyy2n10776alii5bgyk6jblh82";
};
meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/";
};
@@ -5187,12 +5187,12 @@ let
vim-jsdoc = buildVimPluginFrom2Nix {
pname = "vim-jsdoc";
- version = "2020-08-31";
+ version = "2020-10-10";
src = fetchFromGitHub {
owner = "heavenshell";
repo = "vim-jsdoc";
- rev = "5bbe872ee41e50bd5b99bf6204d6147dab39cdc5";
- sha256 = "0jmmkqzan5mkc0j05243f5layqj7fny92rl1vlj32ipv8wgdmczn";
+ rev = "548767343ff221a4efd0c055a43c022d23fcafc5";
+ sha256 = "0scmpjav4zapglybdqilimqb3n805k8gqc46qvkiihprq9j9za4d";
};
meta.homepage = "https://github.com/heavenshell/vim-jsdoc/";
};
@@ -5283,12 +5283,12 @@ let
vim-lawrencium = buildVimPluginFrom2Nix {
pname = "vim-lawrencium";
- version = "2019-04-10";
+ version = "2020-10-10";
src = fetchFromGitHub {
owner = "ludovicchabant";
repo = "vim-lawrencium";
- rev = "e0c127cb4e4224453cb88faffd4627b7da499bcb";
- sha256 = "1gvvr04x17157iz83rv45nlbj1qaz90j0l96q3fki3h1b0fw0099";
+ rev = "4592f24a50386e02870fa8d508cc7ba8454dc102";
+ sha256 = "158hslq4chlqr9mhdpcrbxnygjk4j1pc2caqc3zrwqh9qdk8mvha";
};
meta.homepage = "https://github.com/ludovicchabant/vim-lawrencium/";
};
@@ -5379,24 +5379,24 @@ let
vim-lsc = buildVimPluginFrom2Nix {
pname = "vim-lsc";
- version = "2020-09-28";
+ version = "2020-10-17";
src = fetchFromGitHub {
owner = "natebosch";
repo = "vim-lsc";
- rev = "1f6e440c5485b26a75ca1db90bd793cb9a81d57b";
- sha256 = "147rvcjq1h03x3bwgg0ii5jvsxvh4j6bk47z1hk349rn4ssi6fmr";
+ rev = "9230c11dfb630ef4a9dadf491f1e1c1b2d86ace8";
+ sha256 = "13w3fjwy3iy6j48f16g3bg956dd0fl9ynywd1nqvk4ba305g6crx";
};
meta.homepage = "https://github.com/natebosch/vim-lsc/";
};
vim-lsp = buildVimPluginFrom2Nix {
pname = "vim-lsp";
- version = "2020-09-26";
+ version = "2020-10-24";
src = fetchFromGitHub {
owner = "prabirshrestha";
repo = "vim-lsp";
- rev = "d2b6922250e2fc8fdf7c94c6ca6f0871fe9be1e1";
- sha256 = "1kxqafjfl1f32q05xgkmczfcjg8zr87w1r0hyw054fdzf7krcnmp";
+ rev = "fdb69ab91317ce37c167b9820fcce2c35bce47ef";
+ sha256 = "13jxzdi3yp4qhlrx9fk0591db1gx3kzmwrmlq3bvicaziip2izsy";
};
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
};
@@ -5511,24 +5511,24 @@ let
vim-monokai = buildVimPluginFrom2Nix {
pname = "vim-monokai";
- version = "2020-09-30";
+ version = "2020-10-23";
src = fetchFromGitHub {
owner = "crusoexia";
repo = "vim-monokai";
- rev = "054194afce3fdafea33cf21fbfc4d6b3c0e30fc8";
- sha256 = "036w39fwxj75mh9m5nqiakzyhn2ynsxmbq2rp45zf83nr6mm2h5q";
+ rev = "9f8d7de3848e32c592b168f898f82ec4356128af";
+ sha256 = "1xrwx75dq46snjsrrv0yh4p409w1blmqpw4i5vlxwi5vn29qpnvs";
};
meta.homepage = "https://github.com/crusoexia/vim-monokai/";
};
vim-monokai-pro = buildVimPluginFrom2Nix {
pname = "vim-monokai-pro";
- version = "2020-05-07";
+ version = "2020-10-02";
src = fetchFromGitHub {
owner = "phanviet";
repo = "vim-monokai-pro";
- rev = "baf3046bb44cdffe3bf9a571b3ec24039e2c9f88";
- sha256 = "0rszkf070d8w94dhgjpsl1kyn19j7bqyz434qshz4j88jk7hap6h";
+ rev = "05e534f9fea9a8e4cbf69a1523c785845deabe4e";
+ sha256 = "0hf3iy2ydr6jpraf5zyqg2hl7ma5hn301jyxf6m9ffdsz7722jwm";
};
meta.homepage = "https://github.com/phanviet/vim-monokai-pro/";
};
@@ -5679,12 +5679,12 @@ let
vim-ocaml = buildVimPluginFrom2Nix {
pname = "vim-ocaml";
- version = "2020-09-14";
+ version = "2020-10-11";
src = fetchFromGitHub {
owner = "ocaml";
repo = "vim-ocaml";
- rev = "acee4ad4d65ddaf81895cca9e28baea4c13fa76a";
- sha256 = "0rrjcc5i1isia74nrrik5avkd0casbjhgyqb2ph2176gywz6h5y5";
+ rev = "023a2a464e7a096779d3e541ee7d1dbe61148f6a";
+ sha256 = "0wj945n3da9bzcj5n8002m4vrzv9cgk6sqcc7nyc1x34y9452z94";
};
meta.homepage = "https://github.com/ocaml/vim-ocaml/";
};
@@ -5739,12 +5739,12 @@ let
vim-orgmode = buildVimPluginFrom2Nix {
pname = "vim-orgmode";
- version = "2020-07-14";
+ version = "2020-10-15";
src = fetchFromGitHub {
owner = "jceb";
repo = "vim-orgmode";
- rev = "ad5f154a5bd9daffb7cf50719f0cc945f445af85";
- sha256 = "09x3x53vf2fir9jhi38v9sai7dx5i40ylx1yk42459bgig2vv1aa";
+ rev = "b7bce17005cf114b0961d0b5576bf584a2574774";
+ sha256 = "1kpg858qazv465k2w8343hkiz9lzclkcx91vcysip77diandn523";
};
meta.homepage = "https://github.com/jceb/vim-orgmode/";
};
@@ -5823,12 +5823,12 @@ let
vim-pandoc-syntax = buildVimPluginFrom2Nix {
pname = "vim-pandoc-syntax";
- version = "2020-08-10";
+ version = "2020-10-24";
src = fetchFromGitHub {
owner = "vim-pandoc";
repo = "vim-pandoc-syntax";
- rev = "59680708cdc98c3fae9acb6c261374bfd808335a";
- sha256 = "1yiczv4l2rg8wva2gbjvv7k9s6y9p0gwmlazdd9rnq28nhmxx3gv";
+ rev = "2521e2e9b99a3550e1a20f24e09fa46679cbbbc7";
+ sha256 = "02023bnvc9m98m45krld1b7gy13z335jv88fx4ybz019wc0mv35g";
};
meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/";
};
@@ -5919,12 +5919,12 @@ let
vim-plug = buildVimPluginFrom2Nix {
pname = "vim-plug";
- version = "2020-09-08";
+ version = "2020-10-22";
src = fetchFromGitHub {
owner = "junegunn";
repo = "vim-plug";
- rev = "d16273e07231260e02412625f98651bc6ceebb56";
- sha256 = "0ckglxbnxq50jfigbmgjwaj2vj1g6xjwyipzxbph2b64yi2kklg5";
+ rev = "ab940f624ae1df24605a8ff1bf427de7a76e5911";
+ sha256 = "0v985v9a7kspchfvr2lvj5jqnlkg05agyay0wn0c6mg5bf2mw8q1";
};
meta.homepage = "https://github.com/junegunn/vim-plug/";
};
@@ -5943,12 +5943,12 @@ let
vim-polyglot = buildVimPluginFrom2Nix {
pname = "vim-polyglot";
- version = "2020-09-30";
+ version = "2020-10-27";
src = fetchFromGitHub {
owner = "sheerun";
repo = "vim-polyglot";
- rev = "3ad297db5c1cf94660e4297ffa81b6281eab2884";
- sha256 = "0v7dzidqp24shm00w79xvg912qvdbsn2119j5gw70q1xjsi3sxav";
+ rev = "05e21a9e252b283b2d71568ad3b671d7f28fe0bc";
+ sha256 = "039wha51p2zwnjyjm0qxca63dgrp54l43ba74639gf0hp5h2wvfa";
};
meta.homepage = "https://github.com/sheerun/vim-polyglot/";
};
@@ -5991,12 +5991,12 @@ let
vim-prosession = buildVimPluginFrom2Nix {
pname = "vim-prosession";
- version = "2020-04-20";
+ version = "2020-10-12";
src = fetchFromGitHub {
owner = "dhruvasagar";
repo = "vim-prosession";
- rev = "95f78bd0f719fee96569f30fd5f4199c4461efb7";
- sha256 = "1ix04f3nxxmxd36kzalx0hrbks30v44ydz15apvl1h8l8663hda2";
+ rev = "e735468710a5cd6037b6d4c0e4c8c2bc1353cf4b";
+ sha256 = "0ava297hpm1cf8j18ypfrziwavqcv982hisvh1d8yjxal521pam1";
};
meta.homepage = "https://github.com/dhruvasagar/vim-prosession/";
};
@@ -6063,12 +6063,12 @@ let
vim-qml = buildVimPluginFrom2Nix {
pname = "vim-qml";
- version = "2019-12-20";
+ version = "2020-10-24";
src = fetchFromGitHub {
owner = "peterhoeg";
repo = "vim-qml";
- rev = "b04de1dadb7dfe372d22f7529a001af1b5e19f4f";
- sha256 = "1pxl70l0g4i8cbnpjhb9pyjhz982flkrng07y9xwzbdl2jx42i8s";
+ rev = "77853c3ff98a868dcbbdfa4eb8f0e659b57993ff";
+ sha256 = "14v90gchmpl1nkiic3f3kiz8akbw2wmpish794xakvz63iys703y";
};
meta.homepage = "https://github.com/peterhoeg/vim-qml/";
};
@@ -6087,12 +6087,12 @@ let
vim-racer = buildVimPluginFrom2Nix {
pname = "vim-racer";
- version = "2020-06-18";
+ version = "2020-10-21";
src = fetchFromGitHub {
owner = "racer-rust";
repo = "vim-racer";
- rev = "250e9fd496edde1516a5e68e9837ccf5e46cc895";
- sha256 = "1ar5wv776xslxrs2mmxr5kzz5pp4a4v8jydh9s6cqbfzglgr9kw5";
+ rev = "4c8b8843de2bbf4a6b44a570f284534d5e75a989";
+ sha256 = "1rkp75q0m8w9br35nngdbdlvfpha4x4yilaff40d62mcmb8xmhvj";
};
meta.homepage = "https://github.com/racer-rust/vim-racer/";
};
@@ -6339,12 +6339,12 @@ let
vim-slime = buildVimPluginFrom2Nix {
pname = "vim-slime";
- version = "2020-08-06";
+ version = "2020-10-25";
src = fetchFromGitHub {
owner = "jpalardy";
repo = "vim-slime";
- rev = "db486eaa39f14d130ddf6338aaa02127aa04b272";
- sha256 = "1x9vflsbdl1b03irkvfpapb0c4mw9lymfghcjy1wxjl2vpq630ia";
+ rev = "4e319f2bde4e65ab2f21719cb5c0371221d19f51";
+ sha256 = "01zjg2r103p543lcyrkssw6agrj58m1ymqhf7fbzhpra9ykdpsp6";
};
meta.homepage = "https://github.com/jpalardy/vim-slime/";
};
@@ -6399,24 +6399,24 @@ let
vim-snipmate = buildVimPluginFrom2Nix {
pname = "vim-snipmate";
- version = "2020-03-27";
+ version = "2020-10-02";
src = fetchFromGitHub {
owner = "garbas";
repo = "vim-snipmate";
- rev = "b80367fefc2188c9d6c4a9eb1830360b09e13476";
- sha256 = "0qq81hcavmaq76r38qfy1cxlmhj0aswbd41k2k9fyzilzq4r0bg8";
+ rev = "68eebf9dabe5c1d1964e78dda188765f224bab34";
+ sha256 = "1mxa373ry17zwszd089k99lbgr5pg46x5dlahpk0l68ksxpkbxir";
};
meta.homepage = "https://github.com/garbas/vim-snipmate/";
};
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
- version = "2020-10-01";
+ version = "2020-10-27";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
- rev = "78a9ca0fa3e4d16b73f5f642ec56298b7fec7803";
- sha256 = "1k4rvkbfixp1yi5gz8kffnq7k7xd7bc5cb521jb6h0z6f74qrk70";
+ rev = "d48c1e2dae8f40391b2bd4b4daf97527c4d75130";
+ sha256 = "04dmcikkxlx2vm3lnhw94nw59wi4x1yf27k6j85a0lifwgra1a2m";
};
meta.homepage = "https://github.com/honza/vim-snippets/";
};
@@ -6483,12 +6483,12 @@ let
vim-startify = buildVimPluginFrom2Nix {
pname = "vim-startify";
- version = "2020-04-18";
+ version = "2020-10-07";
src = fetchFromGitHub {
owner = "mhinz";
repo = "vim-startify";
- rev = "593388d3dbe7bfdcc06a714550d3253442b2fc65";
- sha256 = "1k0sgx8r3gi3k4ira1ilvc1jmj0k5apiv7x71dqnh41gfrz1i12h";
+ rev = "f2fc11844b234479d37bef37faa7ceb2aade788b";
+ sha256 = "18n16hpkqadq18gpgppbr4s516jpc8qwd357vb2c7069q79kfx39";
};
meta.homepage = "https://github.com/mhinz/vim-startify/";
};
@@ -6567,12 +6567,12 @@ let
vim-table-mode = buildVimPluginFrom2Nix {
pname = "vim-table-mode";
- version = "2020-08-19";
+ version = "2020-10-13";
src = fetchFromGitHub {
owner = "dhruvasagar";
repo = "vim-table-mode";
- rev = "3476c4e517aa86bc131c707d32f2e508bd5be468";
- sha256 = "0vglazxlsg7ai4c5znxaddpjnfhz6a9slzs0kzzqvmhd3xr7vfg1";
+ rev = "659ba4f39caa38e6913f88c9f4369c00e852160f";
+ sha256 = "0fqj9l7i052mvw0wlyg30bmihzi937svk3ggsp0rc9wlr30frg2p";
};
meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/";
};
@@ -6603,12 +6603,12 @@ let
vim-terraform = buildVimPluginFrom2Nix {
pname = "vim-terraform";
- version = "2020-09-23";
+ version = "2020-10-10";
src = fetchFromGitHub {
owner = "hashivim";
repo = "vim-terraform";
- rev = "f77a07617a649684148de97e5a9115e659166f6a";
- sha256 = "01rgbiddczyx56b6fha6jgxmr0kfhjz8d9rmbfnqlnynmy5545ic";
+ rev = "6fd491d6a2ae40fef3aa6c414e096ce07664f030";
+ sha256 = "0iczgn4ifhlzszgwv1w43w7qzrf1pp8zpfv4vdpm82mli58xlnhc";
};
meta.homepage = "https://github.com/hashivim/vim-terraform/";
};
@@ -6628,12 +6628,12 @@ let
vim-test = buildVimPluginFrom2Nix {
pname = "vim-test";
- version = "2020-09-29";
+ version = "2020-10-22";
src = fetchFromGitHub {
owner = "vim-test";
repo = "vim-test";
- rev = "fd9fb9b29c265d86fa30c672df1fea9a5a757860";
- sha256 = "0qhjmpamhk89h9hjzwc9j88yngf945fk5jd9015qajfk0l15k8x9";
+ rev = "58dde91c0477fa58d18d5c0fde10b2a60a526b0f";
+ sha256 = "1l23fb1q86ikrz8dg4n23l7bqp1xa68fwdhv0j0by73ymcp4zn1s";
};
meta.homepage = "https://github.com/vim-test/vim-test/";
};
@@ -6748,12 +6748,12 @@ let
vim-tmux-focus-events = buildVimPluginFrom2Nix {
pname = "vim-tmux-focus-events";
- version = "2019-12-09";
+ version = "2020-10-05";
src = fetchFromGitHub {
owner = "tmux-plugins";
repo = "vim-tmux-focus-events";
- rev = "e80960715c09aef8ab9204848ed1683805a93a33";
- sha256 = "0ds6qw2i1r67jhxh9ff36al45bafsmbxxdc127l6iy2vl5wj0d3d";
+ rev = "a568192ca0de4ca0bd7b3cd0249aad491625c941";
+ sha256 = "130l73v18md95djkc4s9d0fr018f8f183sjcgy7dgldwdaxlqdi1";
};
meta.homepage = "https://github.com/tmux-plugins/vim-tmux-focus-events/";
};
@@ -6832,12 +6832,12 @@ let
vim-twiggy = buildVimPluginFrom2Nix {
pname = "vim-twiggy";
- version = "2020-09-07";
+ version = "2020-10-06";
src = fetchFromGitHub {
owner = "sodapopcan";
repo = "vim-twiggy";
- rev = "c0edb8a684f624d6f177c2625fc9db617a3d539f";
- sha256 = "13fm3mgnvbhm93cn0jglnqm8hhmwvh5xg088pn5wmwrn9bjj00gz";
+ rev = "efe1d29979bd2b65d22cf49f08524d6e27e5244b";
+ sha256 = "0xqn39apmy6d8vqzbzvv6ic7p2pd5lpdgd4jay1afg2q73yi1rbv";
};
meta.homepage = "https://github.com/sodapopcan/vim-twiggy/";
};
@@ -6916,24 +6916,24 @@ let
vim-vsnip = buildVimPluginFrom2Nix {
pname = "vim-vsnip";
- version = "2020-09-23";
+ version = "2020-10-27";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "vim-vsnip";
- rev = "ec25ffcdf793dd5af6d73ce75d21709a60a4689f";
- sha256 = "07gkygdspxn0fwlgcyhli85nlgg8g4y4v991n80vmk0rhsxqdh90";
+ rev = "562cabf644314c97224a025ad2594a47966e6207";
+ sha256 = "1i1b8la3w9x8lay63kqx958k4csxnqmdw9bfmhyh2vf1p0cdqv6l";
};
meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";
};
vim-vsnip-integ = buildVimPluginFrom2Nix {
pname = "vim-vsnip-integ";
- version = "2020-08-19";
+ version = "2020-10-25";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "vim-vsnip-integ";
- rev = "4a076bea73e307738ac5d08f60a0936cab391efd";
- sha256 = "1jx6ijmj48ffymfn20d0syp1ywv19gmjvf3hb6rdwsk421y58chv";
+ rev = "383573b9b07fd37caf98247dfdbb1d4711eecee9";
+ sha256 = "1kavjyr53cbg630snri2x94f7h80p2vl6vlskqfwi3djfdvn68x6";
};
meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/";
};
@@ -6976,24 +6976,24 @@ let
vim-which-key = buildVimPluginFrom2Nix {
pname = "vim-which-key";
- version = "2020-09-29";
+ version = "2020-10-02";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-which-key";
- rev = "641df563764d68454ab752a6815d783c452274be";
- sha256 = "00wn2jvjazkjagf4bfpz3fh7xh2w495qn8kilz89lab6pvzx79rp";
+ rev = "30c0810b012a7acdccc6b72f0e99c0388986844f";
+ sha256 = "18rflksd58mwkq0lc64frfimj1l1k8cc0l45jpv0z4w118v92jyv";
};
meta.homepage = "https://github.com/liuchengxu/vim-which-key/";
};
vim-wordy = buildVimPluginFrom2Nix {
pname = "vim-wordy";
- version = "2019-11-22";
+ version = "2020-10-24";
src = fetchFromGitHub {
owner = "reedes";
repo = "vim-wordy";
- rev = "f0391713fa83771d64b065868331ef4754d861ed";
- sha256 = "0v5cl3rrg2vrdb2al67hbh730rw8m2zvhb1vippv64k65mknkgp5";
+ rev = "667426a0171787b2620dffa5b2d7c01c9040237f";
+ sha256 = "1lcrisv2wcd8iw76prql03wd11jgmknm3rvbcw7vv4v5r2s9rv5z";
};
meta.homepage = "https://github.com/reedes/vim-wordy/";
};
@@ -7012,12 +7012,12 @@ let
vim-xkbswitch = buildVimPluginFrom2Nix {
pname = "vim-xkbswitch";
- version = "2020-05-22";
+ version = "2020-10-07";
src = fetchFromGitHub {
owner = "lyokha";
repo = "vim-xkbswitch";
- rev = "f54fd6a7357d43a8773313504da72d1bd96d6f1a";
- sha256 = "0542prcclaw6s4f6dlp0ywz5zp10brb7br7hx4lhhizslcakg09v";
+ rev = "8fb3d07e5c9809f292dddb034db2c02d649b29fb";
+ sha256 = "08j0r68ps4jisgbx6lg2vz3wxyx7yzrklsi112bqjxizxjpjb132";
};
meta.homepage = "https://github.com/lyokha/vim-xkbswitch/";
};
@@ -7120,12 +7120,12 @@ let
vimoutliner = buildVimPluginFrom2Nix {
pname = "vimoutliner";
- version = "2020-02-09";
+ version = "2020-10-26";
src = fetchFromGitHub {
owner = "vimoutliner";
repo = "vimoutliner";
- rev = "1031b16e6b0069229fe0f33a66489f81174fa4d9";
- sha256 = "1gn21b8yr0bjg0y1nidk13zcl4f6z8wkrxncgkd1hlc14d99jkg0";
+ rev = "d198aa72c70270f1330f4237bbf853efaaa79723";
+ sha256 = "05wcqs36qn8f3vcy9xi2cf0yyp7yzawlxqvpjhbad6lm52vzsabs";
};
meta.homepage = "https://github.com/vimoutliner/vimoutliner/";
};
@@ -7180,12 +7180,12 @@ let
vimspector = buildVimPluginFrom2Nix {
pname = "vimspector";
- version = "2020-09-27";
+ version = "2020-10-23";
src = fetchFromGitHub {
owner = "puremourning";
repo = "vimspector";
- rev = "692a0d8d39bfbd048119df9644e4b2fab2e01abe";
- sha256 = "1msf62l8bvcgk0g5rknfy44kjfh0r081y78xi15xyyc1mibpvx06";
+ rev = "7b048367f7d4921e4eeea1bb82e6f368b418d89a";
+ sha256 = "0n1kqiki5gag7nd5c5gmnv6czv90kzsfndbb92n3wzvwxhpf1ff6";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -7193,12 +7193,12 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2020-09-29";
+ version = "2020-10-24";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "bfdaec19bf236fad1c9c192a0cf43e299cf1682a";
- sha256 = "12z29gs9h81rv0w3zm49r4b4s3bj0gzqxl5x1gyjk7pijvnnxfbg";
+ rev = "eb7d89178319fd21601d2fe057e3f7cae2130b74";
+ sha256 = "14gj3n54q475cw9j6h12ir3lynn048829zjrb6nyhrzplikhpc9n";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
@@ -7241,12 +7241,12 @@ let
vista-vim = buildVimPluginFrom2Nix {
pname = "vista-vim";
- version = "2020-09-29";
+ version = "2020-10-10";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vista.vim";
- rev = "bcb50336188074c9cfc1aad4b463f4c0e698a68c";
- sha256 = "0kckpj2v0yabp7hz9a6qdh8vspdn6fldk2q1pygyn35bii8x86dh";
+ rev = "27889ff58d4340167bb8dd4abbe9ff4a8869da8f";
+ sha256 = "1asc8fqyv6rfmdd0g5n78mzzssn7rcanzy2d30gddgfa3gr65yms";
};
meta.homepage = "https://github.com/liuchengxu/vista.vim/";
};
@@ -7361,12 +7361,12 @@ let
yats-vim = buildVimPluginFrom2Nix {
pname = "yats-vim";
- version = "2020-09-27";
+ version = "2020-10-27";
src = fetchFromGitHub {
owner = "HerringtonDarkholme";
repo = "yats.vim";
- rev = "7c904cf443f5fd4900e1b4aad6dba6af96b4a395";
- sha256 = "0ap2jh0j5ssv1mv51syvw2y7352ydf4qmk3s7f2rlcq3nba3y6rr";
+ rev = "0635a855ff1c56073d5e372001a3843e15c8aedb";
+ sha256 = "0883lz5sv4w38awwxgff8lx2n1fcy6lw6dd1f8zkambvd7n4v19l";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/";
@@ -7374,12 +7374,12 @@ let
YouCompleteMe = buildVimPluginFrom2Nix {
pname = "YouCompleteMe";
- version = "2020-09-30";
+ version = "2020-10-25";
src = fetchFromGitHub {
owner = "ycm-core";
repo = "YouCompleteMe";
- rev = "12376a7b179939612f834735f50015436e30c6e7";
- sha256 = "0caf6xd9gxx136gi92hnw0myfil74wh3qg264ykfd0km34lysf3h";
+ rev = "dd61ad7a101e0c0467f2c9942c7cbd3f31f6a06b";
+ sha256 = "0xjy6zpz02db5fcwwpdw3kp7kjgrvhlm3bk62syn0hxjghgd7pyb";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
@@ -7423,24 +7423,24 @@ let
zig-vim = buildVimPluginFrom2Nix {
pname = "zig-vim";
- version = "2020-09-20";
+ version = "2020-10-09";
src = fetchFromGitHub {
owner = "ziglang";
repo = "zig.vim";
- rev = "9979e503e675b432c55a83891238c631f7f16a01";
- sha256 = "05cmc3173yscmk2r976280z53z3z7v8ysyy4i0z4v998l804hq5c";
+ rev = "fa5f6d7c5be47bd32dcc69ccf980fc585575cc38";
+ sha256 = "0szrnp27ccl93fbn1j9ybsld1l6j3xdrnx6dsf01gdxidm3w60f3";
};
meta.homepage = "https://github.com/ziglang/zig.vim/";
};
zoomwintab-vim = buildVimPluginFrom2Nix {
pname = "zoomwintab-vim";
- version = "2020-04-10";
+ version = "2020-10-13";
src = fetchFromGitHub {
owner = "troydm";
repo = "zoomwintab.vim";
- rev = "63a70b9e12617d6565a0489c68efe44708d19cf8";
- sha256 = "1dsi2d6wrv5x6w2hrrjzqivsspxxav0hdj0pymml6gry2jcbj4s9";
+ rev = "3b33368ed2ff6138d07f7ee148306cce7d7f6b7c";
+ sha256 = "0jx6860ajw50fn0l5p3dm3fcfwklqs1lf22yyrb09iljavixj777";
};
meta.homepage = "https://github.com/troydm/zoomwintab.vim/";
};
From bcec9042d55218b72550244d45b093e4a92877f6 Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Wed, 28 Oct 2020 13:46:39 -0700
Subject: [PATCH 405/590] vimPlugins: resolve github repository redirects
---
pkgs/misc/vim-plugins/generated.nix | 4 ++--
pkgs/misc/vim-plugins/vim-plugin-names | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index cd36f40f2792..ded185a30e77 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -1958,12 +1958,12 @@ let
pname = "lsp_extensions-nvim";
version = "2020-10-19";
src = fetchFromGitHub {
- owner = "tjdevries";
+ owner = "nvim-lua";
repo = "lsp_extensions.nvim";
rev = "85ce064c36b93cd8856d6dfc41ea5089764ec1c6";
sha256 = "0vljxb9cvq042f70cq01n5mf2vd2wg2qpj75nlva9rjhiw9q3qw8";
};
- meta.homepage = "https://github.com/tjdevries/lsp_extensions.nvim/";
+ meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/";
};
lushtags = buildVimPluginFrom2Nix {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 2b1d6337f665..0d0eec878e08 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -369,6 +369,7 @@ numirias/semshi
nvie/vim-flake8
nvim-lua/completion-nvim
nvim-lua/diagnostic-nvim
+nvim-lua/lsp_extensions.nvim
nvim-treesitter/completion-treesitter
nvim-treesitter/nvim-treesitter
ocaml/vim-ocaml
@@ -494,7 +495,6 @@ thirtythreeforty/lessspace.vim
thosakwe/vim-flutter
tiagofumo/vim-nerdtree-syntax-highlight
tikhomirov/vim-glsl
-tjdevries/lsp_extensions.nvim
tmhedberg/SimpylFold
tmsvg/pear-tree
tmux-plugins/vim-tmux
From 7fd9976af3ee5c952f931e98b785608f0d0aa44c Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Wed, 28 Oct 2020 13:47:00 -0700
Subject: [PATCH 406/590] vimPlugins: document update proces
---
doc/languages-frameworks/vim.section.md | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md
index 8e4826232e1a..84ad567e8c21 100644
--- a/doc/languages-frameworks/vim.section.md
+++ b/doc/languages-frameworks/vim.section.md
@@ -265,6 +265,20 @@ To add a new plugin, run `./update.py --add "[owner]/[name]"`. **NOTE**: This sc
Finally, there are some plugins that are also packaged in nodePackages because they have Javascript-related build steps, such as running webpack. Those plugins are not listed in `vim-plugin-names` or managed by `update.py` at all, and are included separately in `overrides.nix`. Currently, all these plugins are related to the `coc.nvim` ecosystem of Language Server Protocol integration with vim/neovim.
+## Updating plugins in nixpkgs
+
+Run the update script with a GitHub API token that has at least `public_repo` access. Running the script without the token is likely to result in rate-limiting (429 errors). For steps on creating an API token, please refer to [GitHub's token documentation](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/creating-a-personal-access-token).
+
+```sh
+GITHUB_API_TOKEN=my_token ./pkgs/misc/vim-plugins/update.py
+```
+
+Alternatively, set the number of processes to a lower count to avoid rate-limiting.
+
+```sh
+./pkgs/misc/vim-plugins/update.py --proc 1
+```
+
## Important repositories
- [vim-pi](https://bitbucket.org/vimcommunity/vim-pi) is a plugin repository
From 0dc7ad6f1fc3c8cd5164cb19468162c0c498e523 Mon Sep 17 00:00:00 2001
From: "Robert T. McGibbon" <rmcgibbo@gmail.com>
Date: Wed, 28 Oct 2020 17:37:39 -0400
Subject: [PATCH 407/590] bluejeans: 2.4.0 -> 2.17.0.11 (#101973)
---
.../networking/instant-messengers/bluejeans/default.nix | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
index f8bcdc4bef7c..8b6348340587 100644
--- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
@@ -39,11 +39,12 @@
stdenv.mkDerivation rec {
pname = "bluejeans";
- version = "2.4.0";
+ version = "2.17.0";
+ buildNumber = "11";
src = fetchurl {
- url = "https://swdl.bluejeans.com/desktop-app/linux/${version}/BlueJeans.rpm";
- sha256 = "180hc854ngwfn6y6nsrfn74rv78cxhq6sgshrca5zqv6wq3l98g0";
+ url = "https://swdl.bluejeans.com/desktop-app/linux/${version}/BlueJeans_${version}.${buildNumber}.rpm";
+ sha256 = "1h5jbnp5bwy6bpma9a1ia08v7bpz09fm66jsip470k1r7vjjwa68";
};
nativeBuildInputs = [ rpmextract makeWrapper ];
From 5a6acc6a7fc89ef0f7d92751d3da71a195d5bc3f Mon Sep 17 00:00:00 2001
From: Matthew Piziak <matthew.piziak@gmail.com>
Date: Wed, 28 Oct 2020 17:38:40 -0400
Subject: [PATCH 408/590] tdlib: 1.6.0 -> 1.6.9
fix hash
version 1.6.9 is not released, so use revision hash
add a comment to the rev about why we are not using `v${version}` anymore
---
pkgs/development/libraries/tdlib/default.nix | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix
index 06909c078609..80defd4a5439 100644
--- a/pkgs/development/libraries/tdlib/default.nix
+++ b/pkgs/development/libraries/tdlib/default.nix
@@ -7,7 +7,13 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "tdlib";
repo = "td";
+
+ # At version 1.6.0, this line was `rev = "v${version}". Version 1.6.9 uses an explicit revision hash because 1.6.9
+ # is not a tdlib GitHub release, and is therefore not hosted at `https://github.com/tdlib/td/releases/tag/v1.6.9`.
+ # Please return to the `rev = "v${version}"` style on the next version bump if you can, since that will allow
+ # `nixpkgs-update` to update the package automatically.
rev = "32f2338bd199dd06a1b4b5f1ad14f2d4f2868f01";
+
sha256 = "0wv03hlgzrsc04kcwnwz6dsmkdzvhb0i1wjs08gzivwxw06pkq4n";
};
From 263c9eabef60fe1513e024a2ddf953b1109dd04c Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 29 Oct 2020 08:33:31 +1000
Subject: [PATCH 409/590] fzf: 0.24.0 -> 0.24.1
https://github.com/junegunn/fzf/releases/tag/0.24.1
---
pkgs/tools/misc/fzf/default.nix | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 86819d77a9e4..6bd7f1ac3ed4 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "fzf";
- version = "0.24.0";
+ version = "0.24.1";
src = fetchFromGitHub {
owner = "junegunn";
repo = pname;
rev = version;
- sha256 = "0a1jhlkv6z5msw8p3wccy3axwpdvpnri6qps9fmvz57gfm9a3jmr";
+ sha256 = "03f9fdqicw1a2hcjiasya0dq72jvdz6fqw7dfig4kv5l14pwf3v9";
};
vendorSha256 = "0dd0qm1fxp3jnlrhfaas8fw87cj7rygaac35a9nk3xh2xsk7q35p";
@@ -19,7 +19,9 @@ buildGoModule rec {
buildInputs = [ ncurses ];
- buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
+ buildFlagsArray = [
+ "-ldflags=-s -w -X main.version=${version} -X main.revision=${src.rev}"
+ ];
# The vim plugin expects a relative path to the binary; patch it to abspath.
patchPhase = ''
From a30a084b371a364f684adaed66fbab83324a6a56 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Wed, 28 Oct 2020 22:42:07 +0000
Subject: [PATCH 410/590] gopls: don't build integration tests or documentation
generator (#101641)
Not only are these not used, but they also have super generic names,
which is confusing when they appear on the path, and possibly leads
to conflicts with other binaries.
---
pkgs/development/tools/gopls/default.nix | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix
index 66582969714f..290500376e85 100644
--- a/pkgs/development/tools/gopls/default.nix
+++ b/pkgs/development/tools/gopls/default.nix
@@ -15,6 +15,9 @@ buildGoModule rec {
doCheck = false;
+ # Only build gopls, and not the integration tests or documentation generator.
+ subPackages = [ "." ];
+
meta = with stdenv.lib; {
description = "Official language server for the Go language";
homepage = "https://github.com/golang/tools/tree/master/gopls";
From 0d41c9a9c623b62ce5f700d2d7bd36eb970f9b4e Mon Sep 17 00:00:00 2001
From: Andrey Kuznetsov <fear@loathing.in>
Date: Thu, 29 Oct 2020 01:43:24 +0300
Subject: [PATCH 411/590] buildkite-agent: 3.17.0 -> 3.25.0, use buildGoModule,
add darwin to platforms (#101954)
---
.../buildkite-agent/default.nix | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
index ceaa704b565c..97f75a99c079 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
@@ -1,8 +1,8 @@
-{ fetchFromGitHub, stdenv, buildGoPackage,
+{ fetchFromGitHub, stdenv, buildGoModule,
makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }:
-buildGoPackage rec {
+buildGoModule rec {
name = "buildkite-agent-${version}";
- version = "3.17.0";
+ version = "3.25.0";
goPackagePath = "github.com/buildkite/agent";
@@ -10,17 +10,18 @@ buildGoPackage rec {
owner = "buildkite";
repo = "agent";
rev = "v${version}";
- sha256 = "0a7x919kxnpdn0pnhc5ilx1z6ninx8zgjvsd0jcg4qwh0qqp5ppr";
+ sha256 = "VxAGi2NpXpc3U+GNIvGJSkdHGODrX2s8oY+dQ8QXIHQ=";
};
+
+ vendorSha256 = "X1K6uKiMFXTDT1PcedGQ8HLGox8ePP7Cz0Ihf4m9ts8=";
+
postPatch = ''
substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash
'';
nativeBuildInputs = [ makeWrapper ];
- # on Linux, the TMPDIR is /build which is the same prefix as this package
- # remove once #35068 is merged
- noAuditTmpdir = stdenv.isLinux;
+ doCheck = false;
postInstall = ''
# Fix binary name
@@ -43,6 +44,6 @@ buildGoPackage rec {
homepage = "https://buildkite.com/docs/agent";
license = licenses.mit;
maintainers = with maintainers; [ pawelpacana zimbatm rvl ];
- platforms = platforms.unix;
+ platforms = with platforms; unix ++ darwin;
};
}
From 12314c6299b3f6370279246c01994663c7a96f93 Mon Sep 17 00:00:00 2001
From: Matthew Piziak <matthew.piziak@gmail.com>
Date: Wed, 28 Oct 2020 18:44:02 -0400
Subject: [PATCH 412/590] tdlib: 1.6.0 -> 1.6.9
fix hash
version 1.6.9 is not released, so use revision hash
add a comment to the rev about why we are not using `v${version}` anymore
use unstable-2020-10-25
---
pkgs/development/libraries/tdlib/default.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix
index 80defd4a5439..f430b10c64c0 100644
--- a/pkgs/development/libraries/tdlib/default.nix
+++ b/pkgs/development/libraries/tdlib/default.nix
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
owner = "tdlib";
repo = "td";
- # At version 1.6.0, this line was `rev = "v${version}". Version 1.6.9 uses an explicit revision hash because 1.6.9
- # is not a tdlib GitHub release, and is therefore not hosted at `https://github.com/tdlib/td/releases/tag/v1.6.9`.
- # Please return to the `rev = "v${version}"` style on the next version bump if you can, since that will allow
+ # At version 1.6.0, this line was `rev = "v${version}". Version 1.6.9 uses an explicit revision because 1.6.9 is not
+ # a tdlib GitHub release, and is therefore not hosted at `https://github.com/tdlib/td/releases/tag/v1.6.9`. Please
+ # return to the `rev = "v${version}"` style on the next version bump if you can, since that will allow
# `nixpkgs-update` to update the package automatically.
- rev = "32f2338bd199dd06a1b4b5f1ad14f2d4f2868f01";
+ rev = "unstable-2020-10-25";
sha256 = "0wv03hlgzrsc04kcwnwz6dsmkdzvhb0i1wjs08gzivwxw06pkq4n";
};
From da519e3a2b74d6506aeb461369f35307581c40da Mon Sep 17 00:00:00 2001
From: Scriptkiddi <fritz@otlinghaus.it>
Date: Wed, 28 Oct 2020 19:21:49 +0100
Subject: [PATCH 413/590] python3Packages.python-jose: 3.1.0 -> 3.2.0
---
.../python-modules/python-jose/default.nix | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix
index 09a424583110..6b8104516ea9 100644
--- a/pkgs/development/python-modules/python-jose/default.nix
+++ b/pkgs/development/python-modules/python-jose/default.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "python-jose";
- version = "3.1.0";
+ version = "3.2.0";
src = fetchFromGitHub {
owner = "mpdavis";
repo = "python-jose";
rev = version;
- sha256 = "1gnn0zy03pywj65ammy3sd07knzhjv8n5jhx1ir9bikgra9v0iqh";
+ sha256 = "cSPIZrps0xFd4pPcQ4w/jFWOk2XYgd3mtE/sDzlytvY=";
};
checkInputs = [
@@ -23,6 +23,13 @@ buildPythonPackage rec {
cryptography # optional dependency, but needed in tests
];
+ # relax ecdsa deps
+ patchPhase = ''
+ substituteInPlace setup.py \
+ --replace 'ecdsa<0.15' 'ecdsa' \
+ --replace 'ecdsa <0.15' 'ecdsa'
+ '';
+
disabledTests = [
# https://github.com/mpdavis/python-jose/issues/176
"test_key_too_short"
From aa94abac64d19f3b23d4f86be492b1400641337d Mon Sep 17 00:00:00 2001
From: Scriptkiddi <fritz@otlinghaus.it>
Date: Wed, 28 Oct 2020 19:22:17 +0100
Subject: [PATCH 414/590] python3Packages.pycognito: 0.1.3 -> 0.1.4
---
pkgs/development/python-modules/pycognito/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix
index 8101b76b62cf..a30c1cd344b4 100644
--- a/pkgs/development/python-modules/pycognito/default.nix
+++ b/pkgs/development/python-modules/pycognito/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "pycognito";
- version = "0.1.3";
+ version = "0.1.4";
src = fetchFromGitHub {
owner = "pvizeli";
repo = "pycognito";
rev = version;
- sha256 = "0wy6d274xda7v6dazv10h2vwig2avfyz8mh2lpd1a5k7i06r335r";
+ sha256 = "HLzPrRon+ipcUZlD1l4nYSwSbdDLwOALy4ejGunjK0w=";
};
postPatch = ''
From da2e83490c96890356db09e3aa8aaf741ac6f157 Mon Sep 17 00:00:00 2001
From: Scriptkiddi <fritz@otlinghaus.it>
Date: Wed, 28 Oct 2020 19:22:32 +0100
Subject: [PATCH 415/590] python3Packages.hass-nabucasa: 0.34.6 -> 0.37.1
---
.../python-modules/hass-nabucasa/default.nix | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix
index 61c63b28ab60..6ecd91580931 100644
--- a/pkgs/development/python-modules/hass-nabucasa/default.nix
+++ b/pkgs/development/python-modules/hass-nabucasa/default.nix
@@ -4,13 +4,13 @@
buildPythonPackage rec {
pname = "hass-nabucasa";
- version = "0.34.6";
+ version = "0.37.1";
src = fetchFromGitHub {
owner = "nabucasa";
repo = pname;
rev = version;
- sha256 = "1lkqwj58qr0vn7zf5mhrhaz973ahj9wjp4mgzvyja1gcdh6amv34";
+ sha256 = "/GFNrLi1I69gUDIwnHa2q/pxkiRl9PKxpKtb56JrmuA=";
};
postPatch = ''
@@ -18,24 +18,12 @@ buildPythonPackage rec {
sed -i 's/"cryptography.*"/"cryptography"/' setup.py
'';
- patches = [
- # relax pytz dependency
- (fetchpatch {
- url = "https://github.com/NabuCasa/hass-nabucasa/commit/419e80feddc36c68384c032feda0057515b53eaa.patch";
- sha256 = "14dgwci8615cwcf27hg7b42s7da50xhyjys3yx446q7ipk8zw4x6";
- })
- ];
-
propagatedBuildInputs = [
acme aiohttp atomicwrites snitun attrs warrant pycognito
];
checkInputs = [ pytest pytest-aiohttp asynctest ];
- # Asynctest's mocking is broken with python3.8
- # https://github.com/Martiusweb/asynctest/issues/132
- doCheck = pythonOlder "3.8";
-
checkPhase = ''
pytest tests/
'';
From 437dc4c047b9d7c5c8932ec6587fccb9793cac2a Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 28 Oct 2020 23:24:01 +0000
Subject: [PATCH 416/590] zstd: Fix MinGW build
---
pkgs/tools/compression/zstd/default.nix | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index 8ce434741a55..c26ca507525f 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
- buildInputs = [ bash ];
+ buildInputs = stdenv.lib.optional stdenv.hostPlatform.isUnix bash;
patches = [
./playtests-darwin.patch
@@ -72,7 +72,9 @@ stdenv.mkDerivation rec {
--replace "zstdcat" "$bin/bin/zstdcat"
'';
- outputs = [ "bin" "dev" "man" "out" ];
+ outputs = [ "bin" "dev" ]
+ ++ stdenv.lib.optional stdenv.hostPlatform.isUnix "man"
+ ++ [ "out" ];
meta = with stdenv.lib; {
description = "Zstandard real-time compression algorithm";
From 9bb8fdf84299ab43bc030d6128eb22037c221eed Mon Sep 17 00:00:00 2001
From: Scriptkiddi <fritz@otlinghaus.it>
Date: Tue, 27 Oct 2020 12:52:41 +0100
Subject: [PATCH 417/590] teleprompter: 2.3.4 -> 2.4.0
---
pkgs/applications/misc/teleprompter/default.nix | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pkgs/applications/misc/teleprompter/default.nix b/pkgs/applications/misc/teleprompter/default.nix
index 37b3f10329b9..96265356ead7 100644
--- a/pkgs/applications/misc/teleprompter/default.nix
+++ b/pkgs/applications/misc/teleprompter/default.nix
@@ -1,15 +1,15 @@
-{ lib, stdenv, fetchurl, electron_4, makeDesktopItem, makeWrapper, nodePackages, autoPatchelfHook}:
+{ lib, stdenv, fetchurl, electron_10, makeDesktopItem, makeWrapper, nodePackages, autoPatchelfHook}:
let
- electron = electron_4;
+ electron = electron_10;
in
stdenv.mkDerivation rec {
pname = "teleprompter";
- version = "2.3.4";
+ version = "2.4.0";
src = fetchurl {
- url = "mirror://sourceforge/teleprompter-imaginary-films/imaginary-${pname}-${version}-64bit.tar.gz";
- sha256 = "084ml2l3qg46bsazaapyxdx4zavvxp0j4ycsdpdwk3f94g9xb120";
+ url = "https://github.com/ImaginarySense/Imaginary-Teleprompter-Electron/releases/download/${lib.versions.majorMinor version}/imaginary-teleprompter-${version}.tar.gz";
+ sha256 = "bgdtK8l5d26avv1WUw9cfOgZrIL1q/a9890Ams4yidQ=";
};
dontBuild = true;
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "The most complete, free, teleprompter app on the web";
- license = [ licenses.gpl3 ];
+ license = [ licenses.gpl3Plus ];
homepage = "https://github.com/ImaginarySense/Teleprompter-Core";
platforms = platforms.linux;
maintainers = with maintainers; [ Scriptkiddi ];
From 7a498aba3e892b5d3239667efd165e6ca004a9d6 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Thu, 29 Oct 2020 00:30:32 +0100
Subject: [PATCH 418/590] monero: 0.17.1.0 -> 0.17.1.1
---
pkgs/applications/blockchains/monero/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix
index 7d55a5f6f34c..29acbd0f37b3 100644
--- a/pkgs/applications/blockchains/monero/default.nix
+++ b/pkgs/applications/blockchains/monero/default.nix
@@ -17,13 +17,13 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ];
stdenv.mkDerivation rec {
pname = "monero";
- version = "0.17.1.0";
+ version = "0.17.1.1";
src = fetchFromGitHub {
owner = "monero-project";
repo = "monero";
rev = "v${version}";
- sha256 = "1cngniv7sndy8r0fcfgk737640k53q3kwd36g891p5igcb985qdw";
+ sha256 = "18x27dm24k04vx0yz57zi02rk0wrmbn4wr8alqf48dq6z9wr0fhp";
fetchSubmodules = true;
};
From 79a81f81aa5d5f34e001bbee62e639ed02b5c2d3 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Thu, 29 Oct 2020 00:30:45 +0100
Subject: [PATCH 419/590] monero-gui: 0.17.1.0 -> 0.17.1.1
---
pkgs/applications/blockchains/monero-gui/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix
index c079fa88a703..431d667d1534 100644
--- a/pkgs/applications/blockchains/monero-gui/default.nix
+++ b/pkgs/applications/blockchains/monero-gui/default.nix
@@ -27,13 +27,13 @@ in
stdenv.mkDerivation rec {
pname = "monero-gui";
- version = "0.17.1.0";
+ version = "0.17.1.1";
src = fetchFromGitHub {
owner = "monero-project";
repo = "monero-gui";
rev = "v${version}";
- sha256 = "07r78ipv4g3i6z822kq380vi3qwlb958rccsy6lyybkhj9y0rx84";
+ sha256 = "0aqhp4rmqsgwjb875kgh6qwz0wyyiag1fksyic9cnhgg5j5y95nx";
};
nativeBuildInputs = [
From 9f05c50be198a396eb6c555fc239a2e0da42c9a5 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 29 Oct 2020 00:38:45 +0000
Subject: [PATCH 420/590] libarchive: Fix Windows build
---
pkgs/development/libraries/libarchive/default.nix | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index d1917de37d6a..3c97ce21ce07 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -2,8 +2,10 @@
fetchFromGitHub, stdenv, pkgconfig, autoreconfHook,
acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, zstd,
- # Optional but increases closure only negligibly.
- xarSupport ? true,
+ # Optional but increases closure only negligibly. Also, while libxml2
+ # builds fine on windows, but libarchive has trouble linking windows
+ # things it depends on for some reason.
+ xarSupport ? stdenv.hostPlatform.isUnix,
}:
assert xarSupport -> libxml2 != null;
@@ -22,7 +24,9 @@ stdenv.mkDerivation rec {
outputs = [ "out" "lib" "dev" ];
nativeBuildInputs = [ pkgconfig autoreconfHook ];
- buildInputs = [ sharutils zlib bzip2 openssl xz lzo zstd ]
+ buildInputs =
+ stdenv.lib.optional stdenv.hostPlatform.isUnix sharutils
+ ++ [ zlib bzip2 openssl xz lzo zstd ]
++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ]
++ stdenv.lib.optional xarSupport libxml2;
From 5b5aac40d5675f04f6b0d987dd75e20337d487e0 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Wed, 28 Oct 2020 12:34:17 -0300
Subject: [PATCH 421/590] Terminal emulators: whitespace cleanup and regroup
Because editorconfig complains, and also why not to organize them
"ascii-betically"?
---
.../urxvt-vtwheel/default.nix | 4 +-
.../rxvt-unicode/wrapper.nix | 2 +-
pkgs/top-level/all-packages.nix | 202 +++++++++---------
3 files changed, 105 insertions(+), 103 deletions(-)
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix
index aebbedacef64..eb520f38bedb 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
rev = "36d3e861664aeae36a45f96100f10f8fe2218035";
sha256 = "1h3vrsbli5q9kr84j5ijbivlhpwlh3l8cv233pg362v2zz4ja8i7";
};
-
+
installPhase = ''
sed -i 's|#! perl|#! ${perl}/bin/perl|g' vtwheel
mkdir -p $out/lib/urxvt/perl
@@ -23,5 +23,5 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ danbst ];
platforms = with platforms; unix;
};
-
+
}
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix
index 38978799b5a8..b03acb99530a 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix
@@ -29,7 +29,7 @@ let
# This provides simple way to customize urxvt using
# the `.override` mechanism.
wrapper = { configure, ... }:
- let
+ let
config = configure { inherit availablePlugins; };
plugins = config.plugins or (builtins.attrValues availablePlugins);
extraDeps = config.extraDeps or [ ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad7eb42b128d..47d2c9c7fc7d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -669,11 +669,113 @@ in
albert = libsForQt5.callPackage ../applications/misc/albert {};
+ ### APPLICATIONS/TERMINAL-EMULATORS
+
alacritty = callPackage ../applications/terminal-emulators/alacritty {
inherit (xorg) libXcursor libXxf86vm libXi;
inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL;
};
+ aminal = callPackage ../applications/terminal-emulators/aminal {
+ inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel;
+ };
+
+ cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { };
+
+ eterm = callPackage ../applications/terminal-emulators/eterm { };
+
+ evilvte = callPackage ../applications/terminal-emulators/evilvte (config.evilvte or {});
+
+ foot = callPackage ../applications/terminal-emulators/foot { };
+
+ guake = callPackage ../applications/terminal-emulators/guake { };
+
+ havoc = callPackage ../applications/terminal-emulators/havoc { };
+
+ hyper = callPackage ../applications/terminal-emulators/hyper { };
+
+ iterm2 = callPackage ../applications/terminal-emulators/iterm2 {};
+
+ kitty = callPackage ../applications/terminal-emulators/kitty {
+ harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; };
+ inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL;
+ };
+
+ lilyterm = callPackage ../applications/terminal-emulators/lilyterm {
+ inherit (gnome2) vte;
+ gtk = gtk2;
+ flavour = "stable";
+ };
+
+ lilyterm-git = lilyterm.override {
+ flavour = "git";
+ };
+
+ lxterminal = callPackage ../applications/terminal-emulators/lxterminal { };
+
+ microcom = callPackage ../applications/terminal-emulators/microcom { };
+
+ mlterm = callPackage ../applications/terminal-emulators/mlterm {
+ libssh2 = null;
+ openssl = null;
+ };
+
+ mrxvt = callPackage ../applications/terminal-emulators/mrxvt { };
+
+ nimmm = callPackage ../applications/terminal-emulators/nimmm { };
+
+ roxterm = callPackage ../applications/terminal-emulators/roxterm { };
+
+ rxvt = callPackage ../applications/terminal-emulators/rxvt { };
+
+ rxvt-unicode = callPackage ../applications/terminal-emulators/rxvt-unicode/wrapper.nix { };
+
+ rxvt-unicode-plugins = import ../applications/terminal-emulators/rxvt-unicode-plugins { inherit callPackage; };
+
+ rxvt-unicode-unwrapped = callPackage ../applications/terminal-emulators/rxvt-unicode { };
+
+ sakura = callPackage ../applications/terminal-emulators/sakura { };
+
+ st = callPackage ../applications/terminal-emulators/st {
+ conf = config.st.conf or null;
+ patches = config.st.patches or [];
+ extraLibs = config.st.extraLibs or [];
+ };
+ xst = callPackage ../applications/terminal-emulators/st/xst.nix { };
+
+ stupidterm = callPackage ../applications/terminal-emulators/stupidterm {
+ gtk = gtk3;
+ };
+
+ terminator = callPackage ../applications/terminal-emulators/terminator { };
+
+ terminus = callPackage ../applications/terminal-emulators/terminus { };
+
+ termite = callPackage ../applications/terminal-emulators/termite/wrapper.nix {
+ termite = termite-unwrapped;
+ };
+ termite-unwrapped = callPackage ../applications/terminal-emulators/termite { };
+
+ termonad-with-packages = callPackage ../applications/terminal-emulators/termonad {
+ inherit (haskellPackages) ghcWithPackages;
+ };
+
+ tilda = callPackage ../applications/terminal-emulators/tilda {
+ gtk = gtk3;
+ };
+
+ tilix = callPackage ../applications/terminal-emulators/tilix { };
+
+ wayst = callPackage ../applications/terminal-emulators/wayst { };
+
+ x3270 = callPackage ../applications/terminal-emulators/x3270 { };
+
+ xterm = callPackage ../applications/terminal-emulators/xterm { };
+
+ xtermcontrol = callPackage ../applications/terminal-emulators/xtermcontrol {};
+
+ yaft = callPackage ../applications/terminal-emulators/yaft { };
+
aldo = callPackage ../applications/radio/aldo { };
almanah = callPackage ../applications/misc/almanah { };
@@ -2976,8 +3078,6 @@ in
cpcfs = callPackage ../tools/filesystems/cpcfs { };
- cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { };
-
coreutils = callPackage ../tools/misc/coreutils { };
coreutils-full = coreutils.override { minimal = false; };
coreutils-prefixed = coreutils.override { withPrefix = true; singleBinary = false; };
@@ -3431,8 +3531,6 @@ in
wayland-utils = callPackage ../tools/wayland/wayland-utils { };
- wayst = callPackage ../applications/terminal-emulators/wayst { };
-
wev = callPackage ../tools/misc/wev { };
wl-clipboard = callPackage ../tools/misc/wl-clipboard { };
@@ -5477,8 +5575,6 @@ in
mgba = libsForQt5.callPackage ../misc/emulators/mgba { };
- microcom = callPackage ../applications/terminal-emulators/microcom { };
-
microserver = callPackage ../servers/microserver { };
midisheetmusic = callPackage ../applications/audio/midisheetmusic { };
@@ -5830,8 +5926,6 @@ in
nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {};
- nimmm = callPackage ../applications/terminal-emulators/nimmm { };
-
nitrogen = callPackage ../tools/X11/nitrogen {};
nms = callPackage ../tools/misc/nms { };
@@ -7445,8 +7539,6 @@ in
tikzit = libsForQt5.callPackage ../tools/typesetting/tikzit { };
- tilix = callPackage ../applications/terminal-emulators/tilix { };
-
tinc_pre = callPackage ../tools/networking/tinc/pre.nix {};
tinycbor = callPackage ../development/libraries/tinycbor { };
@@ -8160,8 +8252,6 @@ in
clipnotify = callPackage ../tools/misc/clipnotify { };
- x3270 = callPackage ../applications/terminal-emulators/x3270 { };
-
xclip = callPackage ../tools/misc/xclip { };
xcur2png = callPackage ../tools/graphics/xcur2png { };
@@ -8248,8 +8338,6 @@ in
yafaray-core = callPackage ../tools/graphics/yafaray-core { };
- yaft = callPackage ../applications/terminal-emulators/yaft { };
-
yarn = callPackage ../development/tools/yarn { };
yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { };
@@ -20520,16 +20608,12 @@ in
esniper = callPackage ../applications/networking/esniper { };
- eterm = callPackage ../applications/terminal-emulators/eterm { };
-
eteroj.lv2 = libsForQt5.callPackage ../applications/audio/eteroj.lv2 { };
etesync-dav = callPackage ../applications/misc/etesync-dav {};
etherape = callPackage ../applications/networking/sniffers/etherape { };
- evilvte = callPackage ../applications/terminal-emulators/evilvte (config.evilvte or {});
-
evilpixie = libsForQt514.callPackage ../applications/graphics/evilpixie { };
exercism = callPackage ../applications/misc/exercism { };
@@ -20634,8 +20718,6 @@ in
foo-yc20 = callPackage ../applications/audio/foo-yc20 { };
- foot = callPackage ../applications/terminal-emulators/foot { };
-
fossil = callPackage ../applications/version-management/fossil { };
freebayes = callPackage ../applications/science/biology/freebayes { };
@@ -20927,8 +21009,6 @@ in
gcalcli = callPackage ../applications/misc/gcalcli { };
- havoc = callPackage ../applications/terminal-emulators/havoc { };
-
vcal = callPackage ../applications/misc/vcal { };
gcolor2 = callPackage ../applications/graphics/gcolor2 { };
@@ -21146,8 +21226,6 @@ in
gtk2fontsel = callPackage ../applications/misc/gtk2fontsel { };
- guake = callPackage ../applications/terminal-emulators/guake { };
-
guardian-agent = callPackage ../tools/networking/guardian-agent { };
guitone = callPackage ../applications/version-management/guitone {
@@ -21250,8 +21328,6 @@ in
hydroxide = callPackage ../applications/networking/hydroxide { };
- hyper = callPackage ../applications/terminal-emulators/hyper { };
-
hyper-haskell-server-with-packages = callPackage ../development/tools/haskell/hyper-haskell/server.nix {
inherit (haskellPackages) ghcWithPackages;
packages = self: with self; [];
@@ -21695,11 +21771,6 @@ in
ffmpeg = ffmpeg_2;
};
- kitty = callPackage ../applications/terminal-emulators/kitty {
- harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; };
- inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL;
- };
-
kiwix = callPackage ../applications/misc/kiwix { };
klayout = libsForQt5.callPackage ../applications/misc/klayout { };
@@ -21929,16 +22000,6 @@ in
jftui = callPackage ../applications/video/jftui { };
- lilyterm = callPackage ../applications/terminal-emulators/lilyterm {
- inherit (gnome2) vte;
- gtk = gtk2;
- flavour = "stable";
- };
-
- lilyterm-git = lilyterm.override {
- flavour = "git";
- };
-
lime = callPackage ../development/libraries/lime { };
luakit = callPackage ../applications/networking/browsers/luakit {
@@ -22259,8 +22320,6 @@ in
mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { };
- mrxvt = callPackage ../applications/terminal-emulators/mrxvt { };
-
mtpaint = callPackage ../applications/graphics/mtpaint { };
mu-repo = python3Packages.callPackage ../applications/misc/mu-repo { };
@@ -23210,14 +23269,6 @@ in
runc = callPackage ../applications/virtualization/runc {};
- rxvt = callPackage ../applications/terminal-emulators/rxvt { };
-
- rxvt-unicode = callPackage ../applications/terminal-emulators/rxvt-unicode/wrapper.nix { };
-
- rxvt-unicode-unwrapped = callPackage ../applications/terminal-emulators/rxvt-unicode { };
-
- rxvt-unicode-plugins = import ../applications/terminal-emulators/rxvt-unicode-plugins { inherit callPackage; };
-
uade123 = callPackage ../applications/audio/uade123 {};
udevil = callPackage ../applications/misc/udevil {};
@@ -23226,8 +23277,6 @@ in
sacc = callPackage ../applications/networking/gopher/sacc { };
- sakura = callPackage ../applications/terminal-emulators/sakura { };
-
sameboy = callPackage ../misc/emulators/sameboy { };
sayonara = libsForQt514.callPackage ../applications/audio/sayonara { };
@@ -23324,10 +23373,6 @@ in
ncurses = ncurses5;
};
- stupidterm = callPackage ../applications/terminal-emulators/stupidterm {
- gtk = gtk3;
- };
-
styx = callPackage ../applications/misc/styx { };
tecoc = callPackage ../applications/editors/tecoc { };
@@ -23338,14 +23383,6 @@ in
sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { };
- st = callPackage ../applications/terminal-emulators/st {
- conf = config.st.conf or null;
- patches = config.st.patches or [];
- extraLibs = config.st.extraLibs or [];
- };
-
- xst = callPackage ../applications/terminal-emulators/st/xst.nix { };
-
stag = callPackage ../applications/misc/stag {
curses = ncurses;
};
@@ -23678,22 +23715,8 @@ in
terminal-notifier = callPackage ../applications/misc/terminal-notifier {};
- terminator = callPackage ../applications/terminal-emulators/terminator { };
-
- terminus = callPackage ../applications/terminal-emulators/terminus { };
-
tty-solitaire = callPackage ../applications/misc/tty-solitaire { };
- lxterminal = callPackage ../applications/terminal-emulators/lxterminal { };
-
- aminal = callPackage ../applications/terminal-emulators/aminal {
- inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel;
- };
-
- termite-unwrapped = callPackage ../applications/terminal-emulators/termite { };
-
- termite = callPackage ../applications/terminal-emulators/termite/wrapper.nix { termite = termite-unwrapped; };
-
termtosvg = callPackage ../tools/misc/termtosvg { };
inherit (callPackage ../applications/graphics/tesseract {})
@@ -23737,10 +23760,6 @@ in
tig = gitAndTools.tig;
- tilda = callPackage ../applications/terminal-emulators/tilda {
- gtk = gtk3;
- };
-
timbreid = callPackage ../applications/audio/pd-plugins/timbreid {
fftw = fftwSinglePrec;
};
@@ -24590,19 +24609,6 @@ in
xsynth_dssi = callPackage ../applications/audio/xsynth-dssi { };
- xterm = callPackage ../applications/terminal-emulators/xterm { };
-
- mlterm = callPackage ../applications/terminal-emulators/mlterm {
- libssh2 = null;
- openssl = null;
- };
-
- roxterm = callPackage ../applications/terminal-emulators/roxterm { };
-
- termonad-with-packages = callPackage ../applications/terminal-emulators/termonad {
- inherit (haskellPackages) ghcWithPackages;
- };
-
xtrace = callPackage ../tools/X11/xtrace { };
xtruss = callPackage ../tools/X11/xtruss { };
@@ -28128,8 +28134,6 @@ in
imatix_gsl = callPackage ../development/tools/imatix_gsl {};
- iterm2 = callPackage ../applications/terminal-emulators/iterm2 {};
-
sccache = callPackage ../development/tools/misc/sccache { };
sequeler = callPackage ../applications/misc/sequeler { };
@@ -28193,8 +28197,6 @@ in
houdini = callPackage ../applications/misc/houdini {};
- xtermcontrol = callPackage ../applications/terminal-emulators/xtermcontrol {};
-
openfst = callPackage ../development/libraries/openfst {};
opengrm-ngram = callPackage ../development/libraries/opengrm-ngram {};
From 7559a99131a41d23bc084863ef026e18547ac9df Mon Sep 17 00:00:00 2001
From: Tom Repetti <trepetti@cs.columbia.edu>
Date: Thu, 15 Oct 2020 18:25:19 -0400
Subject: [PATCH 422/590] marker: init at 2020.04.04
---
pkgs/applications/editors/marker/default.nix | 49 ++++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 +
2 files changed, 51 insertions(+)
create mode 100644 pkgs/applications/editors/marker/default.nix
diff --git a/pkgs/applications/editors/marker/default.nix b/pkgs/applications/editors/marker/default.nix
new file mode 100644
index 000000000000..758cb0c30eba
--- /dev/null
+++ b/pkgs/applications/editors/marker/default.nix
@@ -0,0 +1,49 @@
+{ stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, pkg-config
+, wrapGAppsHook
+, gtk3
+, gtksourceview
+, gtkspell3
+, webkitgtk
+, pandoc
+}:
+
+stdenv.mkDerivation rec {
+ pname = "marker";
+ version = "2020.04.04";
+
+ src = fetchFromGitHub {
+ owner = "fabiocolacio";
+ repo = "Marker";
+ rev = "${version}";
+ fetchSubmodules = true;
+ sha256 = "1iy7izyprf050bix8am1krqivgyxnhx3jm775v8f80cgbqxy7m5r";
+ };
+
+ nativeBuildInputs = [
+ meson
+ ninja
+ pkg-config
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gtk3
+ gtksourceview
+ gtkspell3
+ webkitgtk
+ pandoc
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://fabiocolacio.github.io/Marker/";
+ description = "Markdown editor for the Linux desktop";
+ maintainers = with maintainers; [ trepetti ];
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ changelog = "https://github.com/fabiocolacio/Marker/releases/tag/${version}";
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab0a1cf5c2f5..76e9a478108a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21187,6 +21187,8 @@ in
lwm = callPackage ../applications/window-managers/lwm { };
+ marker = callPackage ../applications/editors/marker { };
+
musikcube = callPackage ../applications/audio/musikcube {};
pinboard-notes-backup = haskell.lib.overrideCabal
From c69407d60608b239a8f90f04e66fc8f9aa91c7db Mon Sep 17 00:00:00 2001
From: dawidsowa <dawid_sowa@posteo.net>
Date: Thu, 29 Oct 2020 04:49:39 +0100
Subject: [PATCH 423/590] gallery-dl: 1.15.1 -> 1.15.2 (#101977)
* gallery-dl: 1.15.1 -> 1.15.2
---
pkgs/applications/misc/gallery-dl/default.nix | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix
index ffe7d4ec47de..8135dce4d7a3 100644
--- a/pkgs/applications/misc/gallery-dl/default.nix
+++ b/pkgs/applications/misc/gallery-dl/default.nix
@@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "gallery_dl";
- version = "1.15.1";
+ version = "1.15.2";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "1pysh0gz3f3dxk5bfkzaii4myrgik396mf6vlks50inpbnslmqsl";
+ sha256 = "0f2d1ixg0ir7ispxxggv378dc0m55k9y19075swf893maxf07f35";
};
propagatedBuildInputs = with python3Packages; [ requests ];
@@ -15,6 +15,7 @@ python3Packages.buildPythonApplication rec {
pytestFlagsArray = [
# requires network access
"--ignore=test/test_results.py"
+ "--ignore=test/test_downloader.py"
];
meta = {
From 4d5c38797de0ef78aa4bca1fb2612fb14faab214 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@users.noreply.github.com>
Date: Thu, 29 Oct 2020 05:51:18 +0200
Subject: [PATCH 424/590] gotools: 2020-04-21 -> 2020-10-27 (#101961)
---
pkgs/development/tools/gotools/default.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix
index 11926b3b0c66..606092e8cdcb 100644
--- a/pkgs/development/tools/gotools/default.nix
+++ b/pkgs/development/tools/gotools/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gotools-unstable";
- version = "2020-04-21";
- rev = "72e4a01eba4315301fd9ce00c8c2f492580ded8a";
+ version = "2020-10-27";
+ rev = "eafbe7b904eb2418efc832e36ac634dc09084f10";
src = fetchgit {
inherit rev;
url = "https://go.googlesource.com/tools";
- sha256 = "0a8c7j4w784w441j3j3bh640vy1g6g214641qv485wyi0xj49anf";
+ sha256 = "0884znfbm44f4ddjkm0g7qg2a257kwzv1ismd2m225f3c69n3mdg";
};
# The gopls folder contains a Go submodule which causes a build failure.
@@ -25,7 +25,7 @@ buildGoModule rec {
rm -rf gopls
'';
- vendorSha256 = "0pplmqxrnc8qnr5708igx4dm7rb0hicvhg6lh5hj8zkx38nb19s0";
+ vendorSha256 = "18qpjmmjpk322fvf81cafkpl3spv7hpdpymhympmld9isgzggfyz";
doCheck = false;
From 2ccfc2962ea81b40dae4fc1f2b191ea6daba5284 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 22 Oct 2020 08:14:16 +0200
Subject: [PATCH 425/590] opa: build with OCaml 4.03
---
pkgs/development/compilers/opa/default.nix | 6 +++-
.../compilers/opa/ocaml-4.03.patch | 35 +++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 +-
3 files changed, 41 insertions(+), 2 deletions(-)
create mode 100644 pkgs/development/compilers/opa/ocaml-4.03.patch
diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix
index c20e0d0ef991..864bb8e1b263 100644
--- a/pkgs/development/compilers/opa/default.nix
+++ b/pkgs/development/compilers/opa/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
sha256 = "1qs91rq9xrafv2mf2v415k8lv91ab3ycz0xkpjh1mng5ca3pjlf3";
};
+ patches = [ ./ocaml-4.03.patch ];
+
# Paths so the opa compiler code generation will use the same programs as were
# used to build opa.
codeGeneratorPaths = stdenv.lib.makeBinPath [ ocamlPackages.ocaml gcc binutils gnumake nodejs ];
@@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
patchShebangs .
(
cat ./compiler/buildinfos/buildInfos.ml.pre
- ./compiler/buildinfos/generate_buildinfos.sh . --release --version ./compiler/buildinfos/version_major.txt
+ ./compiler/buildinfos/generate_buildinfos.sh . --release --version ./compiler/buildinfos/version_major.txt
echo let opa_git_version = ${version}
echo 'let opa_git_sha = "xxxx"'
cat ./compiler/buildinfos/buildInfos.ml.post
@@ -34,6 +36,8 @@ stdenv.mkDerivation rec {
done
export CAMLP4O=${ocamlPackages.camlp4}/bin/camlp4o
export CAMLP4ORF=${ocamlPackages.camlp4}/bin/camlp4orf
+ export OCAMLBUILD=${ocamlPackages.ocamlbuild}/bin/ocamlbuild
+ substituteInPlace _tags --replace ', warn_error_A' ""
'';
prefixKey = "-prefix ";
diff --git a/pkgs/development/compilers/opa/ocaml-4.03.patch b/pkgs/development/compilers/opa/ocaml-4.03.patch
new file mode 100644
index 000000000000..5e2a3e2522e6
--- /dev/null
+++ b/pkgs/development/compilers/opa/ocaml-4.03.patch
@@ -0,0 +1,35 @@
+--- a/compiler/passes/surfaceAstRenaming.ml
++++ b/compiler/passes/surfaceAstRenaming.ml
+@@ -1110,7 +1110,7 @@ let find_opt_local_or_global name all_env =
+ | None -> find_opt_global name all_env
+ | v -> v
+
+-let path_expr_to_module_aux p = function
++let path_expr_to_module_aux p : _ -> _ result = function
+ | Some (OpenedIdent (tree, ident, path)) ->
+ (match Tree.get_path_opt tree p with
+ (* the path is not in the tree, which means a 'dot' access
+diff --git a/ocamllib/libbase/baseInt64.mli b/ocamllib/libbase/baseInt64.mli
+index fb544706..734437f9 100644
+--- a/ocamllib/libbase/baseInt64.mli
++++ b/ocamllib/libbase/baseInt64.mli
+@@ -40,7 +40,9 @@ external shift_right_logical : int64 -> int -> int64 = "%int64_lsr"
+ external of_int : int -> int64 = "%int64_of_int"
+ external to_int : int64 -> int = "%int64_to_int"
+ external of_float : float -> int64 = "caml_int64_of_float"
++ "caml_int64_of_float_unboxed" [@@unboxed] [@@noalloc]
+ external to_float : int64 -> float = "caml_int64_to_float"
++ "caml_int64_to_float_unboxed" [@@unboxed] [@@noalloc]
+ external of_int32 : int32 -> int64 = "%int64_of_int32"
+ external to_int32 : int64 -> int32 = "%int64_to_int32"
+ external of_nativeint : nativeint -> int64 = "%int64_of_nativeint"
+@@ -48,7 +50,9 @@ external to_nativeint : int64 -> nativeint = "%int64_to_nativeint"
+ external of_string : string -> int64 = "caml_int64_of_string"
+ val to_string : int64 -> string
+ external bits_of_float : float -> int64 = "caml_int64_bits_of_float"
++ "caml_int64_bits_of_float_unboxed" [@@unboxed] [@@noalloc]
+ external float_of_bits : int64 -> float = "caml_int64_float_of_bits"
++ "caml_int64_float_of_bits_unboxed" [@@unboxed] [@@noalloc]
+ type t = int64
+ val compare : t -> t -> int
+ external format : string -> int64 -> string = "caml_int64_format"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f70602bc361..104f8e8d4cb2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9698,7 +9698,7 @@ in
ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { };
opa = callPackage ../development/compilers/opa {
- ocamlPackages = ocaml-ng.ocamlPackages_4_02;
+ ocamlPackages = ocaml-ng.ocamlPackages_4_03;
};
opaline = callPackage ../development/tools/ocaml/opaline { };
From 1b27fadae0f52c576942f9ea23312d878be655e5 Mon Sep 17 00:00:00 2001
From: Vladimir Serov <me@cab404.ru>
Date: Thu, 29 Oct 2020 08:43:43 +0300
Subject: [PATCH 426/590] super-slicer: 2.2.54.1 -> 2.2.54.2
Signed-off-by: Vladimir Serov <me@cab404.ru>
---
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 1e8f9fc99528..2bc59e855a08 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.1";
+ version = "2.2.54.2";
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-0NWrck9nqAlc8xX3nTrRlnzjso4MRRjJSW7bUvCX6Y4=";
+ sha256 = "sha256-ThmsxFXI1uReK+JwpHrIWzHpBdIOP77kDjv+QaK+Azk=";
rev = version;
};
From 8f897b0f9c47fd04e71221505e28225998310002 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Thu, 29 Oct 2020 08:34:13 +0100
Subject: [PATCH 427/590] pdns-recursor: 4.3.5 -> 4.4.0
---
pkgs/servers/dns/pdns-recursor/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix
index d3b440f1d09a..df886ffe9dc9 100644
--- a/pkgs/servers/dns/pdns-recursor/default.nix
+++ b/pkgs/servers/dns/pdns-recursor/default.nix
@@ -8,11 +8,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "pdns-recursor";
- version = "4.3.5";
+ version = "4.4.0";
src = fetchurl {
url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2";
- sha256 = "0mggqi4588mg6vpgplk9b4ak6msdf279lxkblv563l2vjiyfmfcc";
+ sha256 = "12z59xf63iskid08c3y55h238ma2chgvcbks0zprag7i00p97g06";
};
nativeBuildInputs = [ pkgconfig ];
From 438a67de33a02724d995c33fd9d46c59305582f3 Mon Sep 17 00:00:00 2001
From: Raghav Sood <r@raghavsood.com>
Date: Thu, 29 Oct 2020 15:38:47 +0800
Subject: [PATCH 428/590] electrum-ltc: enable hardware wallets
---
pkgs/applications/misc/electrum/ltc.nix | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix
index 2c6fb39fa433..7d6480b4696c 100644
--- a/pkgs/applications/misc/electrum/ltc.nix
+++ b/pkgs/applications/misc/electrum/ltc.nix
@@ -27,6 +27,8 @@ python3Packages.buildPythonApplication rec {
dnspython
jsonrpclib-pelix
pysocks
+ trezor
+ btchip
];
preBuild = ''
From b0a06f1786a6bba1e2b55be8c7570f003c4d82fb Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Thu, 29 Oct 2020 08:53:31 +0100
Subject: [PATCH 429/590] monero-gui: fixup of 7a498ab
The INSTALL_PATH has been fixed upstream and this was causing
the binary to be under $out/bin/bin/.
---
pkgs/applications/blockchains/monero-gui/default.nix | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix
index 431d667d1534..8cd03f34286f 100644
--- a/pkgs/applications/blockchains/monero-gui/default.nix
+++ b/pkgs/applications/blockchains/monero-gui/default.nix
@@ -75,11 +75,7 @@ stdenv.mkDerivation rec {
'add_subdirectory(monero EXCLUDE_FROM_ALL)'
'';
- preConfigure = ''
- # because $out needs to be expanded
- cmakeFlagsArray+=("-DCMAKE_INSTALL_PREFIX=$out/bin")
- cmakeFlagsArray+=("-DARCH=${arch}")
- '';
+ cmakeFlags = [ "-DARCH=${arch}" ];
desktopItem = makeDesktopItem {
name = "monero-wallet-gui";
From fe3041b879a27aa1d7c00c1363885adf8d366ae5 Mon Sep 17 00:00:00 2001
From: Even Brenden <evenbrenden@gmail.com>
Date: Thu, 29 Oct 2020 09:26:00 +0100
Subject: [PATCH 430/590] jotta-cli: 0.6.24251 -> 0.7.33634
---
pkgs/applications/misc/jotta-cli/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix
index 70ca28b46783..a924bd181c0e 100644
--- a/pkgs/applications/misc/jotta-cli/default.nix
+++ b/pkgs/applications/misc/jotta-cli/default.nix
@@ -5,10 +5,10 @@ let
in
stdenv.mkDerivation rec {
pname = "jotta-cli";
- version = "0.6.24251";
+ version = "0.7.33634";
src = fetchzip {
url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz";
- sha256 = "0f26fg5fqpz0f6jxp72cj5f2kf76jah5iaqlqsl87250y0hm330g";
+ sha256 = "0apbdk4fvmn52w9qyh6hvpk3k0sa810jvvndpsbysnlmi7gv5w62";
stripRoot = false;
};
From bf62d8f6294d4520a47b0d8f7acdd45ae90435f7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 08:31:05 +0000
Subject: [PATCH 431/590] android-udev-rules: 20200613 -> 20201003
---
pkgs/os-specific/linux/android-udev-rules/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix
index 946aa7beea41..b6fe86d1b26a 100644
--- a/pkgs/os-specific/linux/android-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/android-udev-rules/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "android-udev-rules";
- version = "20200613";
+ version = "20201003";
src = fetchFromGitHub {
owner = "M0Rf30";
repo = "android-udev-rules";
rev = version;
- sha256 = "0cf5br8x6iwxc1cifv0i1klw7skgs8hghdx6qlqby68kyqg81bb2";
+ sha256 = "07s5fdjbk5q4km6gz9759ngdavrqdgbnkd2b7z9z5lqw1q0b2422";
};
installPhase = ''
From a3d3a1ec750fa5654e55131218015fdcd8d5ebd7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 08:39:11 +0000
Subject: [PATCH 432/590] atlantis: 0.15.0 -> 0.15.1
---
pkgs/applications/networking/cluster/atlantis/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix
index d3e18ce691f1..15c5f0e97c4c 100644
--- a/pkgs/applications/networking/cluster/atlantis/default.nix
+++ b/pkgs/applications/networking/cluster/atlantis/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "atlantis";
- version = "0.15.0";
+ version = "0.15.1";
src = fetchFromGitHub {
owner = "runatlantis";
repo = "atlantis";
rev = "v${version}";
- sha256 = "0nb0dm4yn6f5pw7clgb2d1khcwcxiidqyc0sdh38wwqg0zyil0cz";
+ sha256 = "0xxg48f28ac7x6kap6w1hgsimdc604ivkck4dx7p5p7xd3s7gld5";
};
vendorSha256 = null;
From 2eb161072503ac6d319ce6383e353c5225eb87b9 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Thu, 29 Oct 2020 09:50:26 +0100
Subject: [PATCH 433/590] neovimUtils: neovim utilities to handle more usecases
Current nixpkgs always wraps neovim with the "-u" which has sideeffects as explained in https://github.com/NixOS/nixpkgs/issues/55376 :
1. vim won't set the variable $MYVIMRC as explained #34215
2. vim skips loading folder-specific .vimrc / .nvimrc
I wanted to provide a way for users to better control what flags are used to wrap neovim. This is achived by introducing wrapNeovimUnstable et neovimUtils, utilities to help with that. We provide a compatibility layer so that wrapNeovim still works and to let us experiment with wrapNeovimUnstable to better control neovim configuration, plugin dependencies, haskell environment etc so that it becomes easier to generate per-project neovim config.
With this commit, it's possible for instance for home-manager to wrap neovim without the `-u` and just write the config in the
expected $XDG_CONFIG_HOME/nvim/init.vim .
Expect wrapNeovimUnstable interface to evolve in the upcoming months.
---
pkgs/applications/editors/neovim/utils.nix | 163 +++++++++++++++++++
pkgs/applications/editors/neovim/wrapper.nix | 128 +++------------
pkgs/top-level/all-packages.nix | 8 +-
3 files changed, 196 insertions(+), 103 deletions(-)
create mode 100644 pkgs/applications/editors/neovim/utils.nix
diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix
new file mode 100644
index 000000000000..1c49f6e0fbe1
--- /dev/null
+++ b/pkgs/applications/editors/neovim/utils.nix
@@ -0,0 +1,163 @@
+{ lib
+, vimUtils
+, nodejs
+, neovim-unwrapped
+, bundlerEnv
+, ruby
+, pythonPackages
+, python3Packages
+, writeText
+, wrapNeovimUnstable
+}:
+let
+ # returns everything needed for the caller to wrap its own neovim:
+ # - the generated content of the future init.vim
+ # - the arguments to wrap neovim with
+ # The caller is responsible for writing the init.vim and adding it to the wrapped
+ # arguments (["-u" writeText "init.vim" GENERATEDRC)]).
+ # This makes it possible to write the config anywhere: on a per-project basis
+ # .nvimrc or in $XDG_CONFIG_HOME/nvim/init.vim to avoid sideeffects.
+ # Indeed, note that wrapping with `-u init.vim` has sideeffects like .nvimrc wont be loaded
+ # anymore, $MYVIMRC wont be set etc
+ makeNeovimConfig =
+ {
+ withPython2 ? false
+ /* the function you would have passed to python.withPackages */
+ , extraPython2Packages ? (_: [ ])
+ , withPython3 ? true
+ /* the function you would have passed to python3.withPackages */
+ , extraPython3Packages ? (_: [ ])
+ , withNodeJs ? false
+ , withRuby ? true
+
+ # same values as in vimUtils.vimrcContent
+ , configure ? { }
+
+ # for forward compability, when adding new environments, haskell etc.
+ , ...
+ }:
+ let
+ rubyEnv = bundlerEnv {
+ name = "neovim-ruby-env";
+ gemdir = ./ruby_provider;
+ postBuild = ''
+ ln -sf ${ruby}/bin/* $out/bin
+ '';
+ };
+
+
+ requiredPlugins = vimUtils.requiredPlugins configure;
+ getDeps = attrname: map (plugin: plugin.${attrname} or (_: [ ]));
+
+ pluginPython2Packages = getDeps "pythonDependencies" requiredPlugins;
+ python2Env = pythonPackages.python.withPackages (ps:
+ [ ps.pynvim ]
+ ++ (extraPython2Packages ps)
+ ++ (lib.concatMap (f: f ps) pluginPython2Packages));
+
+ pluginPython3Packages = getDeps "python3Dependencies" requiredPlugins;
+ python3Env = python3Packages.python.withPackages (ps:
+ [ ps.pynvim ]
+ ++ (extraPython3Packages ps)
+ ++ (lib.concatMap (f: f ps) pluginPython3Packages));
+
+
+ # Mapping a boolean argument to a key that tells us whether to add or not to
+ # add to nvim's 'embedded rc' this:
+ # let g:<key>_host_prog=$out/bin/nvim-<key>
+ # Or this:
+ # let g:loaded_${prog}_provider=1
+ # While the latter tells nvim that this provider is not available
+ hostprog_check_table = {
+ node = withNodeJs;
+ python = withPython2;
+ python3 = withPython3;
+ ruby = withRuby;
+ };
+ ## Here we calculate all of the arguments to the 1st call of `makeWrapper`
+ # We start with the executable itself NOTE we call this variable "initial"
+ # because if configure != {} we need to call makeWrapper twice, in order to
+ # avoid double wrapping, see comment near finalMakeWrapperArgs
+ makeWrapperArgs =
+ let
+ binPath = lib.makeBinPath (lib.optionals withRuby [ rubyEnv ] ++ lib.optionals withNodeJs [ nodejs ]);
+
+ flags = lib.concatLists (lib.mapAttrsToList (
+ prog: withProg: [
+ "--cmd" (genProviderSettings prog withProg)
+ ]
+ )
+ hostprog_check_table);
+ in
+ [
+ "--argv0" "$0" "--add-flags" (lib.escapeShellArgs flags)
+ ] ++ lib.optionals withRuby [
+ "--set" "GEM_HOME" "${rubyEnv}/${rubyEnv.ruby.gemPath}"
+ ] ++ lib.optionals (binPath != "") [
+ "--suffix" "PATH" ":" binPath
+ ];
+
+ manifestRc = vimUtils.vimrcContent (configure // { customRC = ""; });
+ neovimRcContent = vimUtils.vimrcContent configure;
+ in
+ {
+ wrapperArgs = makeWrapperArgs;
+ inherit neovimRcContent;
+ inherit manifestRc;
+ inherit rubyEnv;
+ inherit python2Env;
+ inherit python3Env;
+ };
+
+ genProviderSettings = prog: withProg:
+ if withProg then
+ "let g:${prog}_host_prog='${placeholder "out"}/bin/nvim-${prog}'"
+ else
+ "let g:loaded_${prog}_provider=1"
+ ;
+
+ # to keep backwards compatibility
+ legacyWrapper = neovim: {
+ extraMakeWrapperArgs ? []
+ , withPython ? true
+ /* the function you would have passed to python.withPackages */
+ , extraPythonPackages ? (_: [])
+ /* the function you would have passed to python.withPackages */
+ , withPython3 ? true, extraPython3Packages ? (_: [])
+ , withNodeJs ? false
+ , withRuby ? true
+ , vimAlias ? false
+ , viAlias ? false
+ , configure ? {}
+ }:
+ let
+ /* for compatibility with passing extraPythonPackages as a list; added 2018-07-11 */
+ compatFun = funOrList: (if builtins.isList funOrList then
+ (_: lib.warn "passing a list as extraPythonPackages to the neovim wrapper is deprecated, pass a function as to python.withPackages instead" funOrList)
+ else funOrList);
+
+ res = makeNeovimConfig {
+ withPython2 = withPython;
+ extraPythonPackages = compatFun extraPythonPackages;
+ inherit withPython3;
+ extraPython3Packages = compatFun extraPython3Packages;
+ inherit withNodeJs withRuby;
+
+ inherit configure;
+ };
+ in
+ wrapNeovimUnstable neovim (res // {
+ wrapperArgs = res.wrapperArgs
+ ++ [
+ "--add-flags" "-u ${writeText "init.vim" res.neovimRcContent}"
+ ]
+ ++ (if builtins.isList extraMakeWrapperArgs then extraMakeWrapperArgs
+ else lib.warn "Passing a string as extraMakeWrapperArgs to the neovim wrapper is
+ deprecated, please use a list instead")
+ ;
+ });
+in
+{
+ inherit makeNeovimConfig;
+ inherit legacyWrapper;
+}
diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix
index cdc9a441dc5d..06ef920e2767 100644
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@@ -13,124 +13,41 @@ neovim:
let
wrapper = {
- extraMakeWrapperArgs ? ""
- , withPython ? true, extraPythonPackages ? (_: []) /* the function you would have passed to python.withPackages */
- , withPython3 ? true, extraPython3Packages ? (_: []) /* the function you would have passed to python.withPackages */
+ # should contain all args but the binary
+ wrapperArgs ? []
+ , manifestRc ? null
+ , withPython2 ? true, python2Env ? null
+ , withPython3 ? true, python3Env ? null
, withNodeJs? false
- , withRuby ? true
+ , withRuby ? true, rubyEnv ? null
, vimAlias ? false
, viAlias ? false
- , configure ? {}
+ , ...
}:
let
- rubyEnv = bundlerEnv {
- name = "neovim-ruby-env";
- gemdir = ./ruby_provider;
- postBuild = ''
- ln -sf ${ruby}/bin/* $out/bin
- '';
- };
-
- /* for compatibility with passing extraPythonPackages as a list; added 2018-07-11 */
- compatFun = funOrList: (if builtins.isList funOrList then
- (_: lib.warn "passing a list as extraPythonPackages to the neovim wrapper is deprecated, pass a function as to python.withPackages instead" funOrList)
- else funOrList);
- extraPythonPackagesFun = compatFun extraPythonPackages;
- extraPython3PackagesFun = compatFun extraPython3Packages;
-
- requiredPlugins = vimUtils.requiredPlugins configure;
- getDeps = attrname: map (plugin: plugin.${attrname} or (_:[]));
-
- pluginPythonPackages = getDeps "pythonDependencies" requiredPlugins;
- pythonEnv = pythonPackages.python.withPackages(ps:
- [ ps.pynvim ]
- ++ (extraPythonPackagesFun ps)
- ++ (concatMap (f: f ps) pluginPythonPackages));
-
- pluginPython3Packages = getDeps "python3Dependencies" requiredPlugins;
- python3Env = python3Packages.python.withPackages (ps:
- [ ps.pynvim ]
- ++ (extraPython3PackagesFun ps)
- ++ (concatMap (f: f ps) pluginPython3Packages));
-
- binPath = makeBinPath (optionals withRuby [rubyEnv] ++ optionals withNodeJs [nodejs]);
-
- # Mapping a boolean argument to a key that tells us whether to add or not to
- # add to nvim's 'embedded rc' this:
- #
- # let g:<key>_host_prog=$out/bin/nvim-<key>
- #
- # Or this:
- #
- # let g:loaded_${prog}_provider=1
- #
- # While the later tells nvim that this provider is not available
- #
- hostprog_check_table = {
- node = withNodeJs;
- python = withPython;
- python3 = withPython3;
- ruby = withRuby;
- };
- ## Here we calculate all of the arguments to the 1st call of `makeWrapper`
- # We start with the executable itself NOTE we call this variable "initial"
- # because if configure != {} we need to call makeWrapper twice, in order to
- # avoid double wrapping, see comment near finalMakeWrapperArgs
- initialMakeWrapperArgs =
- let
- flags = lib.concatLists (lib.mapAttrsToList (
- prog:
- withProg:
- [
- "--cmd"
- (if withProg then
- "let g:${prog}_host_prog='${placeholder "out"}/bin/nvim-${prog}'"
- else
- "let g:loaded_${prog}_provider=1"
- )
- ]
- ) hostprog_check_table);
- in [
- "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim"
- "--argv0" "$0"
- "--add-flags" (lib.escapeShellArgs flags)
- ] ++ lib.optionals withRuby [
- "--set" "GEM_HOME" "${rubyEnv}/${rubyEnv.ruby.gemPath}"
- ] ++ lib.optionals (binPath != "") [
- "--suffix" "PATH" ":" binPath
- ];
# If configure != {}, we can't generate the rplugin.vim file with e.g
# NVIM_SYSTEM_RPLUGIN_MANIFEST *and* NVIM_RPLUGIN_MANIFEST env vars set in
# the wrapper. That's why only when configure != {} (tested both here and
# when postBuild is evaluated), we call makeWrapper once to generate a
# wrapper with most arguments we need, excluding those that cause problems to
# generate rplugin.vim, but still required for the final wrapper.
- finalMakeWrapperArgs = initialMakeWrapperArgs
- # this relies on a patched neovim, see
- # https://github.com/neovim/neovim/issues/9413
- ++ lib.optionals (configure != {}) [
- "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim"
- "--add-flags" "-u ${configFile}"
- ];
- configFile = writeText "init.vim" "${vimUtils.vimrcContent configure}";
+ finalMakeWrapperArgs =
+ [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim" ] ++ wrapperArgs ++
+ [ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" ];
in
symlinkJoin {
name = "neovim-${stdenv.lib.getVersion neovim}";
# Remove the symlinks created by symlinkJoin which we need to perform
# extra actions upon
- postBuild = ''
- rm $out/bin/nvim
- makeWrapper ${lib.escapeShellArgs initialMakeWrapperArgs} ${extraMakeWrapperArgs}
- ''
- + lib.optionalString stdenv.isLinux ''
+ postBuild = lib.optionalString stdenv.isLinux ''
rm $out/share/applications/nvim.desktop
substitute ${neovim}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \
--replace 'TryExec=nvim' "TryExec=$out/bin/nvim" \
--replace 'Name=Neovim' 'Name=WrappedNeovim'
''
- + optionalString withPython ''
- makeWrapper ${pythonEnv}/bin/python $out/bin/nvim-python --unset PYTHONPATH
+ + optionalString withPython2 ''
+ makeWrapper ${python2Env}/bin/python $out/bin/nvim-python --unset PYTHONPATH
''
+ optionalString withPython3 ''
makeWrapper ${python3Env}/bin/python3 $out/bin/nvim-python3 --unset PYTHONPATH
@@ -147,9 +64,14 @@ let
+ optionalString viAlias ''
ln -s $out/bin/nvim $out/bin/vi
''
- + optionalString (configure != {}) ''
+ + optionalString (manifestRc != null) (let
+ manifestWrapperArgs =
+ [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim-wrapper" ] ++ wrapperArgs;
+ in ''
echo "Generating remote plugin manifest"
export NVIM_RPLUGIN_MANIFEST=$out/rplugin.vim
+ makeWrapper ${lib.escapeShellArgs manifestWrapperArgs}
+
# Some plugins assume that the home directory is accessible for
# initializing caches, temporary files, etc. Even if the plugin isn't
# actively used, it may throw an error as soon as Neovim is launched
@@ -165,8 +87,8 @@ let
# (swap/viminfo) and redirect errors to stderr.
# Only display the log on error since it will contain a few normally
# irrelevant messages.
- if ! $out/bin/nvim \
- -u ${vimUtils.vimrcFile (configure // { customRC = ""; })} \
+ if ! $out/bin/nvim-wrapper \
+ -u ${writeText "manifest.vim" manifestRc} \
-i NONE -n \
-E -V1rplugins.log -s \
+UpdateRemotePlugins +quit! > outfile 2>&1; then
@@ -174,7 +96,11 @@ let
echo -e "\nGenerating rplugin.vim failed!"
exit 1
fi
- makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ${extraMakeWrapperArgs}
+ rm "${placeholder "out"}/bin/nvim-wrapper"
+ '')
+ + ''
+ rm $out/bin/nvim
+ makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs}
'';
paths = [ neovim ];
@@ -182,7 +108,7 @@ let
preferLocalBuild = true;
buildInputs = [makeWrapper];
- passthru = { unwrapped = neovim; inherit configFile; };
+ passthru = { unwrapped = neovim; };
meta = neovim.meta // {
# To prevent builds on hydra
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 104f8e8d4cb2..11a8a1ccae33 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23972,8 +23972,11 @@ in
vimpc = callPackage ../applications/audio/vimpc { };
- wrapNeovim = callPackage ../applications/editors/neovim/wrapper.nix { };
-
+ # this is a lower-level alternative to wrapNeovim conceived to handle
+ # more usecases when wrapping neovim. The interface is being actively worked on
+ # so expect breakage. use wrapNeovim instead if you want a stable alternative
+ wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { };
+ wrapNeovim = neovimUtils.legacyWrapper;
neovim-unwrapped = callPackage ../applications/editors/neovim {
lua =
# neovim doesn't work with luajit on aarch64: https://github.com/neovim/neovim/issues/7879
@@ -23981,6 +23984,7 @@ in
luajit;
};
+ neovimUtils = callPackage ../applications/editors/neovim/utils.nix { };
neovim = wrapNeovim neovim-unwrapped { };
neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { };
From 451e41f6ef369254b72b3be8fc12ebc02ae5aa58 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 08:55:03 +0000
Subject: [PATCH 434/590] azure-storage-azcopy: 10.6.0 -> 10.6.1
---
pkgs/development/tools/azcopy/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix
index 3d0fe8513c8a..096e321fe700 100644
--- a/pkgs/development/tools/azcopy/default.nix
+++ b/pkgs/development/tools/azcopy/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "azure-storage-azcopy";
- version = "10.6.0";
+ version = "10.6.1";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-storage-azcopy";
rev = "v${version}";
- sha256 = "0izjnbldgf0597j4rh2ir9jsc2nzp9vwxcgllvkm5lh1xqf6i0nf";
+ sha256 = "1gmpdyc55mkzdkkhyzvy9517znvcj8hd9x3rpkpr86vfzgjv9qyv";
};
subPackages = [ "." ];
From a74a5c9d9237abfe8c2312e9ca9e2574cbab9e58 Mon Sep 17 00:00:00 2001
From: braunse <sebastien@sebbraun.de>
Date: Thu, 29 Oct 2020 10:01:18 +0100
Subject: [PATCH 435/590] CastXML: refactor to avoid python2 dependency
(#101996)
Switch pythonPackages.sphinx to python3Packages.sphinx. Should
only affect the build of the man-page.
---
pkgs/development/tools/castxml/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix
index 0a455b4d7cdf..90be513bd50f 100644
--- a/pkgs/development/tools/castxml/default.nix
+++ b/pkgs/development/tools/castxml/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub
-, pythonPackages
+, python3Packages
, cmake
, llvmPackages
, libffi, libxml2, zlib
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "0ypj67xrgj228myp7l1gsjw1ja97q68nmj98dsd33srmiayqraj4";
};
- nativeBuildInputs = [ cmake ] ++ stdenv.lib.optionals withMan [ pythonPackages.sphinx ];
+ nativeBuildInputs = [ cmake ] ++ stdenv.lib.optionals withMan [ python3Packages.sphinx ];
clangVersion = lib.getVersion llvmPackages.clang;
From b64d91e92e95fba388b54ca634466c3a55e92506 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Thu, 29 Oct 2020 10:02:35 +0100
Subject: [PATCH 436/590] promscale: 0.1.0 -> 0.1.1
Changelog:
- Add QueryRow to our connection interface
- Add SQL API for managing metric compression setting
- Add code documentation for query/read path of the connector
- Adds support for checking pg version on startup
- BUGFIX reset pendingBuffer epoch when we're done
- Epoch-Based cache validation
- First pass documenting the write path
- Fix bug with deletion of metric name labels.
- Fix erroneous PromQL query in end-to-end tests
- Fix error reporting to prevent panic
- Fix golden file tests
- Fix logging output to match rest of the project
- Fix views on Vanilla PG and add tests
- Make example docker-compose clearer (#305)
- Mask password while printing config
- Prepare for the 0.1.1 release
- Prepare for the next development cycle
- REFACTOR rearrange mocks
- REFACTOR switch TestPGXInserterInsertData to the new mock
- REFACTOR switch TestPGXInserterInsertSeries to the new mock
- Start a pgmodel Readme
Source: https://github.com/timescale/promscale/releases/tag/0.1.1
---
pkgs/servers/monitoring/prometheus/promscale.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/servers/monitoring/prometheus/promscale.nix b/pkgs/servers/monitoring/prometheus/promscale.nix
index 1bf5d511e287..37e3ec0375cb 100644
--- a/pkgs/servers/monitoring/prometheus/promscale.nix
+++ b/pkgs/servers/monitoring/prometheus/promscale.nix
@@ -5,20 +5,20 @@
buildGoModule rec {
pname = "promscale";
- version = "0.1.0";
+ version = "0.1.1";
src = fetchFromGitHub {
owner = "timescale";
repo = pname;
rev = "${version}";
- sha256 = "sha256:0535sq640b9x9vi2sfazi9qs6arwjdn7nff16km2agncvs449dn4";
+ sha256 = "sha256:00mhkp3nf6h2zsvmmwyza1lahvmm05isfi7rqkx24c0dmkmif3x9";
};
vendorSha256 = "sha256:1ilciwf08678sciwwrjalwvcs5bp7x254nxc3nhdf88cf0bp2nxi";
buildFlagsArray = [ "-ldflags=-s -w -X github.com/timescale/promscale/pkg/version.Version=${version} -X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}" ];
- doCheck = false;
+ doCheck = false; # Requires access to a docker daemon
meta = with stdenv.lib; {
description = "An open-source analytical platform for Prometheus metrics";
From 0cc9ad72d46f19292d3fae576c77edc547aafab2 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 29 Oct 2020 13:26:44 +0800
Subject: [PATCH 437/590] ffmpeg-full: patch for libsrt deprecated API
---
pkgs/development/libraries/ffmpeg-full/default.nix | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index c23fb87f2fae..df7043cd44ed 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -244,6 +244,15 @@ stdenv.mkDerivation rec {
pname = "ffmpeg-full";
inherit (ffmpeg) src version;
+ # this should go away in the next release
+ patches = [
+ (fetchpatch {
+ url = "https://git.videolan.org/?p=ffmpeg.git;a=patch;h=7c59e1b0f285cd7c7b35fcd71f49c5fd52cf9315";
+ sha256 = "sha256-dqpmpDFETTuWHWolMoLaubU4BeDEuQaBNA0wmzL1f8o=";
+ name = "fix_libsrt.patch";
+ })
+ ];
+
prePatch = ''
patchShebangs .
'' + stdenv.lib.optionalString stdenv.isDarwin ''
From d55feede21ac95817ab229467044e061b0146f42 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 09:06:48 +0000
Subject: [PATCH 438/590] bazel-kazel: 0.1.1 -> 0.1.2
---
pkgs/development/tools/bazel-kazel/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/tools/bazel-kazel/default.nix b/pkgs/development/tools/bazel-kazel/default.nix
index 20b17de0c211..516ad2a64a09 100644
--- a/pkgs/development/tools/bazel-kazel/default.nix
+++ b/pkgs/development/tools/bazel-kazel/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "bazel-kazel";
- version = "0.1.1";
+ version = "0.1.2";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "repo-infra";
rev = "v${version}";
- sha256 = "0d59kf0y12sa1bki7gzcb2nzppwj3gxlv133bsnl9gc8vx1d8ldg";
+ sha256 = "1fn6ppyjgg3v80n9rc9712xms5yq3xkkd95zyd64l5gh9mshjn86";
};
vendorSha256 = "1pzkjh4n9ai8yqi98bkdhicjdr2l8j3fckl5n90c2gdcwqyxvgkf";
From 835fd4ffa6828c423d3bdcea7bb7e92916d22d0d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 09:14:28 +0000
Subject: [PATCH 439/590] bazelisk: 1.7.3 -> 1.7.4
---
pkgs/development/tools/bazelisk/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix
index eba096644a11..2a20888426d0 100644
--- a/pkgs/development/tools/bazelisk/default.nix
+++ b/pkgs/development/tools/bazelisk/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "bazelisk";
- version = "1.7.3";
+ version = "1.7.4";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = pname;
rev = "v${version}";
- sha256 = "0l4y8z44hwd6rnhnyk6l9abrvk342w72bah9k9zz6caa5i4xz2vz";
+ sha256 = "1mc1l2g2qrg9djpyyz203a6dpx5fxllisybmhrpmikyza15w935q";
};
vendorSha256 = "116wy1a7gmi2w8why9hszhcybfvpwp4iq62vshb25cdcma6q4mjh";
From fc856b89e5b4c8a90d643f71029a125c72a244a2 Mon Sep 17 00:00:00 2001
From: Philipp <philipp+dev@xndr.de>
Date: Thu, 29 Oct 2020 10:32:04 +0100
Subject: [PATCH 440/590] nixos/murmur: add murmur group, don't run as nogroup
fixes #101980
---
nixos/modules/misc/ids.nix | 2 +-
nixos/modules/services/networking/murmur.nix | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index cd21a1609c91..4e0f8ba718eb 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -468,7 +468,7 @@ in
#minecraft = 114; # unused
vault = 115;
#ripped = 116; # unused
- #murmur = 117; # unused
+ murmur = 117;
foundationdb = 118;
newrelic = 119;
starbound = 120;
diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
index b384f436861d..c6e5649ec479 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@@ -278,6 +278,10 @@ in
home = "/var/lib/murmur";
createHome = true;
uid = config.ids.uids.murmur;
+ group = "murmur";
+ };
+ users.groups.murmur = {
+ gid = config.ids.gids.murmur;
};
systemd.services.murmur = {
@@ -300,6 +304,7 @@ in
RuntimeDirectory = "murmur";
RuntimeDirectoryMode = "0700";
User = "murmur";
+ Group = "murmur";
};
};
};
From 019fa5f6086b2744c5c0f3ce6a756f9a8aa70e74 Mon Sep 17 00:00:00 2001
From: Renato Alves <alves.rjc@gmail.com>
Date: Thu, 29 Oct 2020 11:18:29 +0100
Subject: [PATCH 441/590] htslib: 1.10.2 -> 1.11 (#100812)
---
pkgs/development/libraries/science/biology/htslib/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix
index 7ee63e9bb413..9da6595e7a43 100644
--- a/pkgs/development/libraries/science/biology/htslib/default.nix
+++ b/pkgs/development/libraries/science/biology/htslib/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "htslib";
- version = "1.10.2";
+ version = "1.11";
src = fetchurl {
url = "https://github.com/samtools/htslib/releases/download/${version}/${pname}-${version}.tar.bz2";
- sha256 = "0f8rglbvf4aaw41i2sxlpq7pvhly93sjqiz0l4q3hwki5zg47dg3";
+ sha256 = "1mrq4mihzx37yqhj3sfz6da6mw49niia808bzsw2gkkgmadxvyng";
};
# perl is only used during the check phase.
From 4e35d03c8ec32e7fb386e655d944134879eb4eae Mon Sep 17 00:00:00 2001
From: wheelsandmetal <jakob@schmutz.co.uk>
Date: Thu, 29 Oct 2020 10:19:10 +0000
Subject: [PATCH 442/590] add myselft to maintainers
---
maintainers/maintainer-list.nix | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index eeb23378b6a2..bb9c1f460c6d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9210,6 +9210,12 @@
email = "kirill.wedens@gmail.com";
name = "wedens";
};
+ wheelsandmetal = {
+ email = "jakob@schmutz.co.uk";
+ github = "wheelsandmetal";
+ githubId = 13031455;
+ name = "Jakob Schmutz";
+ };
WhittlesJr = {
email = "alex.joseph.whitt@gmail.com";
github = "WhittlesJr";
From 166eadee60ade4793b8209ec1aca3b57e114df94 Mon Sep 17 00:00:00 2001
From: wheelsandmetal <jakob@schmutz.co.uk>
Date: Thu, 29 Oct 2020 10:24:59 +0000
Subject: [PATCH 443/590] nuraft: init at 1.1.2
---
pkgs/development/libraries/nuraft/default.nix | 24 +++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 ++
2 files changed, 26 insertions(+)
create mode 100644 pkgs/development/libraries/nuraft/default.nix
diff --git a/pkgs/development/libraries/nuraft/default.nix b/pkgs/development/libraries/nuraft/default.nix
new file mode 100644
index 000000000000..1554e1678156
--- /dev/null
+++ b/pkgs/development/libraries/nuraft/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, cmake, boost172, asio, openssl, zlib }:
+
+stdenv.mkDerivation rec {
+ pname = "nuraft";
+ version = "1.1.2";
+
+ src = fetchFromGitHub {
+ owner = "eBay";
+ repo = "NuRaft";
+ rev = "v${version}";
+ sha256 = "sha256-l6rG8f+JAWfAJxEZPKRHZo2k8x9WbtSJC3gGCSMHYfs=";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ boost172 asio openssl zlib ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/eBay/NuRaft";
+ description = "C++ implementation of Raft core logic as a replication library";
+ license = licenses.asl20;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ wheelsandmetal ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3065dcb8069c..b53ef40c8114 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14671,6 +14671,8 @@ in
ntrack = callPackage ../development/libraries/ntrack { };
+ nuraft = callPackage ../development/libraries/nuraft { };
+
nuspell = callPackage ../development/libraries/nuspell { };
nuspellWithDicts = dicts: callPackage ../development/libraries/nuspell/wrapper.nix { inherit dicts; };
From af7ee3031920aaa9709bf8b68400314933d3f43b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 10:40:21 +0000
Subject: [PATCH 444/590] cargo-tarpaulin: 0.14.3 -> 0.15.0
---
pkgs/development/tools/analysis/cargo-tarpaulin/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
index 48805d168089..099837fbafa2 100644
--- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
+++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-tarpaulin";
- version = "0.14.3";
+ version = "0.15.0";
src = fetchFromGitHub {
owner = "xd009642";
repo = "tarpaulin";
rev = "${version}";
- sha256 = "03d8h5b174699yivaamlvaqzck9zs119jk29yf70dvxw7cs0nngv";
+ sha256 = "0ga2zfq4365hxvr3wd3isc146ibivy3bfcy24rb6cq3av3b90a8k";
};
nativeBuildInputs = [
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
];
buildInputs = [ openssl ];
- cargoSha256 = "0zzp2wyq48j6n64fm37qfl65cg4yzf9ysichhkmkc6viq8x0f66d";
+ cargoSha256 = "1ij1bic95315kba7k7igix33kmwr2va0c2hbysjs0bl5kcnai4f7";
#checkFlags = [ "--test-threads" "1" ];
doCheck = false;
From 4b8611c959408c12a4ceefa53c43c738a22f1ae5 Mon Sep 17 00:00:00 2001
From: 1000101 <b1000101@pm.me>
Date: Thu, 29 Oct 2020 11:16:31 +0100
Subject: [PATCH 445/590] blockbook-frontend: fix&update extraConfig example
---
.../networking/blockbook-frontend.nix | 24 ++++++++++++-------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/nixos/modules/services/networking/blockbook-frontend.nix b/nixos/modules/services/networking/blockbook-frontend.nix
index dde24522756a..ca323e495ec1 100644
--- a/nixos/modules/services/networking/blockbook-frontend.nix
+++ b/nixos/modules/services/networking/blockbook-frontend.nix
@@ -158,15 +158,21 @@ let
type = types.attrs;
default = {};
example = literalExample '' {
- alternative_estimate_fee = "whatthefee-disabled";
- alternative_estimate_fee_params = "{\"url\": \"https://whatthefee.io/data.json\", \"periodSeconds\": 60}";
- fiat_rates = "coingecko";
- fiat_rates_params = "{\"url\": \"https://api.coingecko.com/api/v3\", \"coin\": \"bitcoin\", \"periodSeconds\": 60}";
- coin_shortcut = "BTC";
- coin_label = "Bitcoin";
- xpub_magic = 76067358;
- xpub_magic_segwit_p2sh = 77429938;
- xpub_magic_segwit_native = 78792518;
+ "alternative_estimate_fee" = "whatthefee-disabled";
+ "alternative_estimate_fee_params" = "{\"url\": \"https://whatthefee.io/data.json\", \"periodSeconds\": 60}";
+ "fiat_rates" = "coingecko";
+ "fiat_rates_params" = "{\"url\": \"https://api.coingecko.com/api/v3\", \"coin\": \"bitcoin\", \"periodSeconds\": 60}";
+ "coin_shortcut" = "BTC";
+ "coin_label" = "Bitcoin";
+ "parse" = true;
+ "subversion" = "";
+ "address_format" = "";
+ "xpub_magic" = 76067358;
+ "xpub_magic_segwit_p2sh" = 77429938;
+ "xpub_magic_segwit_native" = 78792518;
+ "mempool_workers" = 8;
+ "mempool_sub_workers" = 2;
+ "block_addresses_to_keep" = 300;
}'';
description = ''
Additional configurations to be appended to <filename>coin.conf</filename>.
From 9019cf90332fc2160f001a49e502a48cf8b1d9ed Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 10:58:56 +0000
Subject: [PATCH 446/590] cfssl: 1.4.1 -> 1.5.0
---
pkgs/tools/security/cfssl/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix
index 1aef7b5bd567..d926aaca68fb 100644
--- a/pkgs/tools/security/cfssl/default.nix
+++ b/pkgs/tools/security/cfssl/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cfssl";
- version = "1.4.1";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cfssl";
rev = "v${version}";
- sha256 = "07qacg95mbh94fv64y577zyr4vk986syf8h5l8lbcmpr0zcfk0pd";
+ sha256 = "1yzxz2l7h2d3f8j6l9xlm7g9659gsa17zf4q0883s0jh3l3xgs5n";
};
subPackages = [
From a15f5f379bd082d958babd985777aec40c064cc7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 12:31:08 +0000
Subject: [PATCH 447/590] croc: 8.5.2 -> 8.6.5
---
pkgs/tools/networking/croc/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix
index 36fc5583439f..6d6c08a1efe0 100644
--- a/pkgs/tools/networking/croc/default.nix
+++ b/pkgs/tools/networking/croc/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "croc";
- version = "8.5.2";
+ version = "8.6.5";
src = fetchFromGitHub {
owner = "schollz";
repo = pname;
rev = "v${version}";
- sha256 = "0i71p3cwm8w3zlw10if3cbpfb65rq407nw4yva1l58ck7sbp61ha";
+ sha256 = "1lzprv4qbmv2jjjp02z87819k54wdlsf8i6zvl3vchkqvygdkk6v";
};
- vendorSha256 = "0afg645hs7lf3036c2g6sn956zz9s08r747c0czb1aj0jrbf7fs8";
+ vendorSha256 = "02mai9bp9pizbq6b8dj05rngxp3lfm9gh37zs8jknx56gas90j9i";
doCheck = false;
From a90362c888c67af6366e69ba1d5bf6cf03615ee8 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 29 Oct 2020 13:40:12 +0100
Subject: [PATCH 448/590] google-chrome: Add myself as maintainer
Mainly to get pinged on PRs/issues as well.
---
.../networking/browsers/google-chrome/default.nix | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index fb261c286072..727090a4c5c3 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -150,7 +150,10 @@ in stdenv.mkDerivation {
description = "A freeware web browser developed by Google";
homepage = "https://www.google.com/chrome/browser/";
license = licenses.unfree;
- maintainers = [ maintainers.msteen ];
+ maintainers = with maintainers; [ primeos msteen ];
+ # Note from primeos: By updating Chromium I also update Google Chrome and
+ # will try to merge PRs and respond to issues but I'm not actually using
+ # Google Chrome. msteen is the actual user/maintainer.
platforms = [ "x86_64-linux" ];
};
}
From 8b1d379ee3ee6e3a3915b334c1140e83106c56f0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 12:41:41 +0000
Subject: [PATCH 449/590] ctop: 0.7.3 -> 0.7.4
---
pkgs/tools/system/ctop/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/tools/system/ctop/default.nix
index 6cb8e4821608..68e7562975f3 100644
--- a/pkgs/tools/system/ctop/default.nix
+++ b/pkgs/tools/system/ctop/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ctop";
- version = "0.7.3";
+ version = "0.7.4";
src = fetchFromGitHub {
owner = "bcicen";
repo = pname;
rev = "v${version}";
- sha256 = "0y72l65xgfqrgghzbm1zcy776l5m31z0gn6vfr689zyi3k3f4kh8";
+ sha256 = "0zslxd00pypn6ri7r420mqxjqy3i6qv944f7899saapsb2m08w7j";
};
- vendorSha256 = "1x4li44vg0l1x205v9a971cgphplxhsrn59q97gmj9cfy4m7jdfw";
+ vendorSha256 = "0a5rwnf251jbp7jz2ln8z9hqp0112c6kx0y09nncvlcki35qq9sh";
doCheck = false;
From 7c700c9ff670b5166582078d0782d0ee0dcaf10c Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 29 Oct 2020 13:48:38 +0100
Subject: [PATCH 450/590] chromium: Drop useVaapi (was deprecated)
---
.../networking/browsers/chromium/default.nix | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 43e4717f82f6..f83cb1d209d7 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -14,7 +14,6 @@
, proprietaryCodecs ? true
, enablePepperFlash ? false
, enableWideVine ? false
-, useVaapi ? false # Deprecated, use enableVaapi instead!
, enableVaapi ? false # Disabled by default due to unofficial support
, useOzone ? false
, cupsSupport ? true
@@ -148,13 +147,6 @@ let
''
else browser;
- optionalVaapiFlags = if useVaapi # TODO: Remove after 20.09:
- then throw ''
- Chromium's useVaapi was replaced by enableVaapi and you don't need to pass
- "--ignore-gpu-blacklist" anymore (also no rebuilds are required anymore).
- '' else lib.optionalString
- (enableVaapi)
- "--add-flags --enable-accelerated-video-decode";
in stdenv.mkDerivation {
name = "chromium${suffix}-${version}";
inherit version;
@@ -181,7 +173,7 @@ in stdenv.mkDerivation {
eval makeWrapper "${browserBinary}" "$out/bin/chromium" \
--add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \
- ${optionalVaapiFlags} \
+ ${lib.optionalString enableVaapi "--add-flags --enable-accelerated-video-decode"} \
${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled}
ed -v -s "$out/bin/chromium" << EOF
From 59a7a55e104c8ceb46471bf6a50f3091e32422a4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 13:28:35 +0000
Subject: [PATCH 451/590] doctl: 1.48.1 -> 1.49.0
---
pkgs/development/tools/doctl/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix
index ba42f3914b4a..b30bd8d29909 100644
--- a/pkgs/development/tools/doctl/default.nix
+++ b/pkgs/development/tools/doctl/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "doctl";
- version = "1.48.1";
+ version = "1.49.0";
vendorSha256 = null;
@@ -32,7 +32,7 @@ buildGoModule rec {
owner = "digitalocean";
repo = "doctl";
rev = "v${version}";
- sha256 = "1bykvwv1zhiki7c86hycwck78s8gqw4dzd7smfp4iz609wyk1wqb";
+ sha256 = "1z7424am1fb1l9bz8q1lfzmhz84c29v7k5p391m4hhbl8h46x6ca";
};
meta = with lib; {
From 89507db3bc2c607a6de5792f1399cf546f1a78a0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 13:48:13 +0000
Subject: [PATCH 452/590] dstask: 0.22 -> 0.23
---
pkgs/applications/misc/dstask/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/misc/dstask/default.nix b/pkgs/applications/misc/dstask/default.nix
index c9b3e2dd8983..0eeb0d9cab6e 100644
--- a/pkgs/applications/misc/dstask/default.nix
+++ b/pkgs/applications/misc/dstask/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dstask";
- version = "0.22";
+ version = "0.23";
src = fetchFromGitHub {
owner = "naggie";
repo = pname;
rev = "v${version}";
- sha256 = "0vwkar827ncwmva091q37gq8fvs9jz1765zdxrcvhczlj5a0qdgi";
+ sha256 = "15hr0ivwvm2lzpi8l5y5a3hya3i7r85pxna961m24gd4f8gs4cjl";
};
# Set vendorSha256 to null because dstask vendors its dependencies (meaning
From e589cc0afcfaf24ee5a25203c4847cfaee3ab385 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 14:06:51 +0000
Subject: [PATCH 453/590] emplace: 0.3.7 -> 0.3.8
---
pkgs/tools/package-management/emplace/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix
index c794566e19f1..3356e7cf1021 100644
--- a/pkgs/tools/package-management/emplace/default.nix
+++ b/pkgs/tools/package-management/emplace/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "emplace";
- version = "0.3.7";
+ version = "0.3.8";
src = fetchFromGitHub {
owner = "tversteeg";
repo = pname;
rev = "v${version}";
- sha256 = "0ihx6hrzs7wkdz9wzgarmm73dz1fb2bhssmxrgv5nzmkhygn4xfy";
+ sha256 = "1g7xrsw0ji3nbrj1a2hywxwy7f33fgbvzp7k4l9ls2icg0xsw9a3";
};
- cargoSha256 = "0yqg2hagsjaxvrj96qg6k1llkmqdqp792c2844h7fhnhlx6v2wd2";
+ cargoSha256 = "1phr0k05dxwdhj1i71v8lr91qanjvp2zgi9wjpppzixpnpcsrbrb";
meta = with lib; {
description = "Mirror installed software on multiple machines";
From bf92b1ba10cd413026d184c3cf1a5e62c39c1388 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 14:19:08 +0000
Subject: [PATCH 454/590] ergo: 3.3.4 -> 3.3.5
---
pkgs/applications/blockchains/ergo/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix
index 685a562f21b1..706acebba553 100644
--- a/pkgs/applications/blockchains/ergo/default.nix
+++ b/pkgs/applications/blockchains/ergo/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ergo";
- version = "3.3.4";
+ version = "3.3.5";
src = fetchurl {
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
- sha256 = "0psq0nxb4c0fsxjzjxb4sy6lh4kj4w8aizd81r92fdv8izbm25sk";
+ sha256 = "0bxzpwwb42bppqli3zggx3lah7g6kwmy6k6k6dinypj6x0bafqcg";
};
nativeBuildInputs = [ makeWrapper ];
From 1c8206d39ba115f05166a6272f329c3e982e98cf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 15:01:54 +0000
Subject: [PATCH 455/590] flow: 0.136.0 -> 0.137.0
---
pkgs/development/tools/analysis/flow/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 44ecfceb8dfe..27675652eb87 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
- version = "0.136.0";
+ version = "0.137.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "refs/tags/v${version}";
- sha256 = "1gpf9jk4ny5jps93scfcndzg1r93kz3hq8pijpfk4ab8qray83g6";
+ sha256 = "1bwrm0jab3pjq1md584szdb3vk4r2cka49qn6f9znnb1ji589x5q";
};
installPhase = ''
From 0d9f7f2e5fa2c9ab6d4f6ebe98b20a4e688b7b25 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 15:14:37 +0000
Subject: [PATCH 456/590] flyctl: 0.0.144 -> 0.0.145
---
pkgs/development/web/flyctl/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix
index 32be24f954af..dbc6bfb9a037 100644
--- a/pkgs/development/web/flyctl/default.nix
+++ b/pkgs/development/web/flyctl/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "flyctl";
- version = "0.0.144";
+ version = "0.0.145";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
- sha256 = "1wg8dgz930hj3q448gg5kxri31q078w5nshvlfkga7vzn8pdg3bk";
+ sha256 = "00by00jslj9nkq89iwvc5f0jcn4lv8i6xs9y9l2x044rq525q08q";
};
preBuild = ''
@@ -17,7 +17,7 @@ buildGoModule rec {
subPackages = [ "." ];
- vendorSha256 = "0ryb97cwknxwhascz74filvx3wfwd0dhm6x36n4d7z2kiw7fgmh9";
+ vendorSha256 = "018vffgi85aqzb93hbld2f3lrc01jxb9aj5j5ss5c0a689g83gmq";
doCheck = false;
From 2a184865c54db013f6937fcedc99b23eb832495f Mon Sep 17 00:00:00 2001
From: Matthew Piziak <matthew.piziak@gmail.com>
Date: Thu, 29 Oct 2020 11:17:57 -0400
Subject: [PATCH 457/590] tdlib: 1.6.0 -> 1.6.9
fix hash
version 1.6.9 is not released, so use revision hash
add a comment to the rev about why we are not using `v${version}` anymore
use unstable-2020-10-25
update version, not revision
---
pkgs/development/libraries/tdlib/default.nix | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix
index f430b10c64c0..165506f96472 100644
--- a/pkgs/development/libraries/tdlib/default.nix
+++ b/pkgs/development/libraries/tdlib/default.nix
@@ -1,18 +1,18 @@
{ fetchFromGitHub, gperf, openssl, readline, zlib, cmake, stdenv }:
stdenv.mkDerivation rec {
- version = "1.6.9";
+ version = "unstable-2020-10-25";
pname = "tdlib";
src = fetchFromGitHub {
owner = "tdlib";
repo = "td";
- # At version 1.6.0, this line was `rev = "v${version}". Version 1.6.9 uses an explicit revision because 1.6.9 is not
- # a tdlib GitHub release, and is therefore not hosted at `https://github.com/tdlib/td/releases/tag/v1.6.9`. Please
- # return to the `rev = "v${version}"` style on the next version bump if you can, since that will allow
- # `nixpkgs-update` to update the package automatically.
- rev = "unstable-2020-10-25";
+ # At version 1.6.0, this line was `rev = "v${version}". Version 1.6.9 (here called `unstable-2020-10-25`) uses an
+ # explicit revision because 1.6.9 is not a tdlib GitHub release, and is therefore not hosted at
+ # `https://github.com/tdlib/td/releases/tag/v1.6.9`. Please return to the `rev = "v${version}"` style on the next
+ # version bump if you can, since that will allow `nixpkgs-update` to update the package automatically.
+ rev = "32f2338bd199dd06a1b4b5f1ad14f2d4f2868f01";
sha256 = "0wv03hlgzrsc04kcwnwz6dsmkdzvhb0i1wjs08gzivwxw06pkq4n";
};
From 59c53bc62e1e25015bd8deedd7252ee5037314b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 29 Oct 2020 16:21:57 +0100
Subject: [PATCH 458/590] servant: generate docs using python3
---
pkgs/development/haskell-modules/configuration-common.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 26cbf7f78c39..1e694a8801b7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -694,7 +694,7 @@ self: super: {
postPatch = ''
substituteInPlace conf.py --replace "'.md': CommonMarkParser," ""
'';
- nativeBuildInputs = with pkgs.buildPackages.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ];
+ nativeBuildInputs = with pkgs.buildPackages.python3Packages; [ sphinx recommonmark sphinx_rtd_theme ];
makeFlags = [ "html" ];
installPhase = ''
mv _build/html $out
From afcbed0f66a402eab5c09961c190912f3b0d434f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20=C5=BDlender?= <pub.git@zlender.si>
Date: Thu, 29 Oct 2020 16:32:23 +0100
Subject: [PATCH 459/590] maintainers: change szlend email
---
maintainers/maintainer-list.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 119e4594b160..4b77ffca8846 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8364,7 +8364,7 @@
name = "Szczyp";
};
szlend = {
- email = "pub+nix@zlender.si";
+ email = "pub.nix@zlender.si";
github = "szlend";
githubId = 7301807;
name = "Simon Žlender";
From 8842a03edde38b0f026bc87daa88d952380914ba Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 15:36:42 +0000
Subject: [PATCH 460/590] fsmon: 1.8.1 -> 1.8.2
---
pkgs/tools/misc/fsmon/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/misc/fsmon/default.nix b/pkgs/tools/misc/fsmon/default.nix
index 668fa463adb3..a3e3eddcda9e 100644
--- a/pkgs/tools/misc/fsmon/default.nix
+++ b/pkgs/tools/misc/fsmon/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fsmon";
- version = "1.8.1";
+ version = "1.8.2";
src = fetchFromGitHub {
owner = "nowsecure";
repo = "fsmon";
rev = version;
- sha256 = "0i7irqs4100j0g19jh64p2plbwipl6p3ld6w4sscc7n8lwkxmj03";
+ sha256 = "0y0gqb07girhz3r7gn9yrrysvhj5fapdafim0q8n7krk5y23hmh0";
};
installPhase = ''
From e2dbf1ee5f2f6df7627c5a380b83eadf992134eb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 07:41:57 +0000
Subject: [PATCH 461/590] python37Packages.py_stringmatching: 0.4.1 -> 0.4.2
---
pkgs/development/python-modules/py_stringmatching/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/py_stringmatching/default.nix b/pkgs/development/python-modules/py_stringmatching/default.nix
index fda497b7962b..79d09daba9cc 100644
--- a/pkgs/development/python-modules/py_stringmatching/default.nix
+++ b/pkgs/development/python-modules/py_stringmatching/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "py_stringmatching";
- version = "0.4.1";
+ version = "0.4.2";
src = fetchPypi {
inherit pname version;
- sha256 = "c46db1e855cef596dfbbe1bd48fcabb30736479eff602c2bf88af10f998f1532";
+ sha256 = "c87f62698fba1612a18f8f44bd57f0c4e70aac2d7ca6dfb6ed46dabd2194453c";
};
checkInputs = [ nose ];
From c1b0ffe325ec770211b8e5aa414596c280f7e86d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 07:14:41 +0000
Subject: [PATCH 462/590] python37Packages.bids-validator: 1.5.6 -> 1.5.7
---
pkgs/development/python-modules/bids-validator/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix
index f97fffe93f05..b139a88820e6 100644
--- a/pkgs/development/python-modules/bids-validator/default.nix
+++ b/pkgs/development/python-modules/bids-validator/default.nix
@@ -4,12 +4,12 @@
}:
buildPythonPackage rec {
- version = "1.5.6";
+ version = "1.5.7";
pname = "bids-validator";
src = fetchPypi {
inherit pname version;
- sha256 = "ef9476ded8226c86fe1d6e6b9f380666ada7a0f4ae39bd5afd7eabbbc6979ab7";
+ sha256 = "624fade609636c64e7829ff072bdf12f93512948a803059b059e5c90df894be2";
};
# needs packages which are not available in nixpkgs
From 3e8c98e128012fc5b756ab311d7c40145e01391f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 16:01:39 +0000
Subject: [PATCH 463/590] geoipupdate: 4.3.0 -> 4.5.0
---
pkgs/applications/misc/geoipupdate/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix
index ee6ed27ddda8..1f2c275b13d1 100644
--- a/pkgs/applications/misc/geoipupdate/default.nix
+++ b/pkgs/applications/misc/geoipupdate/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "geoipupdate";
- version = "4.3.0";
+ version = "4.5.0";
src = fetchFromGitHub {
owner = "maxmind";
repo = "geoipupdate";
rev = "v${version}";
- sha256 = "08h14bf4z2gx9sy34jpi2pvxv3i8g9ypl222hzdjsp2ixhl0jia9";
+ sha256 = "0lhz7i4lprsik3s41y19vphsyc29vz6cbxikmvkmy6xjn40khjfr";
};
- vendorSha256 = "0q4byhvs1c1xm4qjvs2vyf98vdv121qn0z51arcf7k4ayrys5xcx";
+ vendorSha256 = "1f858k8cl0dgiw124jv0p9jhi9aqxnc3nmc7hksw70fla2nzjrv0";
doCheck = false;
From 452312ec15f8e5f640d2a929d0a089c97ddc5de3 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Thu, 29 Oct 2020 23:44:35 +0700
Subject: [PATCH 464/590] mozwire: 0.5.2 -> 0.7.0
---
pkgs/tools/networking/mozwire/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/networking/mozwire/default.nix b/pkgs/tools/networking/mozwire/default.nix
index 3f50ed41f49c..58afc833ea0e 100644
--- a/pkgs/tools/networking/mozwire/default.nix
+++ b/pkgs/tools/networking/mozwire/default.nix
@@ -2,18 +2,18 @@
rustPlatform.buildRustPackage rec {
pname = "MozWire";
- version = "0.5.2";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "NilsIrl";
repo = pname;
rev = "v${version}";
- sha256 = "0r3x8y1qxxkkac9lqgd0s339zbrm9zmir1f6qs0r5f0bw3ngzqc4";
+ sha256 = "01bj3c34x9ywxygsz4rdyw5gc9cz8x6zzl5fd7db8qy8bx2lhlr9";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
- cargoSha256 = "0hyps2wi4wmpllfams3p59jpccwa0ylgzxq7qdn6g6zvf0cajpc0";
+ cargoSha256 = "0yxnpnxwis46wz4j5rjzyyzrvh94hn8vzxmmrcmrdz3gkakg77hg";
meta = with stdenv.lib; {
description = "MozillaVPN configuration manager giving Linux, macOS users (among others), access to MozillaVPN";
From 1b5ee955d3d96ba58a02ca9c8d3e4377bae0ced2 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Thu, 29 Oct 2020 17:07:26 +0000
Subject: [PATCH 465/590] terraform-providers.cloudfoundry: init at 0.12.6
(#99960)
---
.../cloudfoundry/default.nix | 29 +++++++++++++++++++
.../cluster/terraform-providers/default.nix | 1 +
2 files changed, 30 insertions(+)
create mode 100644 pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix
diff --git a/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix b/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix
new file mode 100644
index 000000000000..7e807d2ed5ce
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "terraform-provider-cloudfoundry";
+ version = "0.12.6";
+
+ src = fetchFromGitHub {
+ owner = "cloudfoundry-community";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0n5ybpzk6zkrnd9vpmbjlkm8fdp7nbfr046wih0jk72pmiyrcygi";
+ };
+
+ vendorSha256 = "01lfsd9aw9w3kr1a2a5b7ac6d8jaij83lhxl4y4qsnjlqk86fbxq";
+
+ # needs a running cloudfoundry
+ doCheck = false;
+
+ postInstall = "mv $out/bin/terraform-provider-cloudfoundry{,_v${version}}";
+
+ passthru = { provider-source-address = "registry.terraform.io/cloudfoundry-community/cloudfoundry"; };
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/cloudfoundry-community/terraform-provider-cloudfoundry";
+ description = "Terraform provider for cloudfoundry";
+ license = licenses.mpl20;
+ maintainers = with maintainers; [ ris ];
+ };
+}
diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index 24c6dd21cdef..a75500c8eb37 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -161,6 +161,7 @@ let
# Packages that don't fit the default model
ansible = callPackage ./ansible {};
+ cloudfoundry = callPackage ./cloudfoundry {};
elasticsearch = callPackage ./elasticsearch {};
gandi = callPackage ./gandi {};
keycloak = callPackage ./keycloak {};
From 75ddf65fff7832f7231e00ec5898d8f032d71629 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 17:25:25 +0000
Subject: [PATCH 466/590] gosec: 2.4.0 -> 2.5.0
---
pkgs/development/tools/gosec/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix
index ffbd98a45772..44862bb3311d 100644
--- a/pkgs/development/tools/gosec/default.nix
+++ b/pkgs/development/tools/gosec/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "gosec";
- version = "2.4.0";
+ version = "2.5.0";
subPackages = [ "cmd/gosec" ];
@@ -10,10 +10,10 @@ buildGoModule rec {
owner = "securego";
repo = pname;
rev = "v${version}";
- sha256 = "0mqijzr3vj4wycykqpjz9xw9fhpbnzz988z2q3nldb5ax0pyrxca";
+ sha256 = "0hwa4sxw9sqzivg80nqsi9g1hz8apnnck73x5dvnn1zbwvycx3g9";
};
- vendorSha256 = "063dpq1k5lykp18gshlgg098yvppicv3cz8gjn1mvfhac2rl9yqr";
+ vendorSha256 = "1lldi56kah689xf8n1hfpk9qy0gbci62xnjs5jrh54kbgka23gvw";
doCheck = false;
From a28e5b0a4f5799e14ed3079e10d481e5b5b4faa9 Mon Sep 17 00:00:00 2001
From: Renato Alves <alves.rjc@gmail.com>
Date: Sat, 17 Oct 2020 12:26:20 +0200
Subject: [PATCH 467/590] samtools: 1.10 -> 1.11
---
pkgs/applications/science/biology/samtools/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix
index e750eea89ac9..27ed79a1f6ca 100644
--- a/pkgs/applications/science/biology/samtools/default.nix
+++ b/pkgs/applications/science/biology/samtools/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "samtools";
- version = "1.10";
+ version = "1.11";
src = fetchurl {
url = "https://github.com/samtools/samtools/releases/download/${version}/${pname}-${version}.tar.bz2";
- sha256 = "119ms0dpydw8dkh3zc4yyw9zhdzgv12px4l2kayigv31bpqcb7kv";
+ sha256 = "1dp5wknak4arnw5ghhif9mmljlfnw5bgm91wib7z0j8wdjywx0z2";
};
nativeBuildInputs = [ perl ];
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
homepage = "http://www.htslib.org/";
platforms = platforms.unix;
- maintainers = [ maintainers.mimame ];
+ maintainers = with maintainers; [ mimame unode ];
};
}
From c473bbbe33d7bc8f0ff8a30c0a2634a3747dd86b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 17:31:59 +0000
Subject: [PATCH 468/590] gotestsum: 0.5.4 -> 0.6.0
---
pkgs/development/tools/gotestsum/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix
index bc0b331c54da..8ccc1b593fd7 100644
--- a/pkgs/development/tools/gotestsum/default.nix
+++ b/pkgs/development/tools/gotestsum/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gotestsum";
- version = "0.5.4";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "gotestyourself";
repo = "gotestsum";
rev = "v${version}";
- sha256 = "1nmx91a5faixj1pzg9wbmxn8z1mphmdcvd6lajqy1ds21fzn2g1i";
+ sha256 = "0w0s2qvwnb69s18gvkkbwsx9zh7yi8ksnnrfpl8az8sybk6m1iaz";
};
- vendorSha256 = "02av4z3lxfb6xrv3ij1alf5k8xhxz0dasnf2farbcszz021bzfrq";
+ vendorSha256 = "09cifc69z1ashjw1mqgbi0gh90h2sypqyl0jswxxcqk89ibgy3am";
doCheck = false;
From c6174c208a793c523bba42a3c974f9ad1d4424ed Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 26 Oct 2020 00:38:16 +0100
Subject: [PATCH 469/590] pythonPackages.spotipy: 2.16.0 -> 2.16.1
---
pkgs/development/python-modules/spotipy/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix
index 1e003be1f5e7..fee4f093d085 100644
--- a/pkgs/development/python-modules/spotipy/default.nix
+++ b/pkgs/development/python-modules/spotipy/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "spotipy";
- version = "2.16.0";
+ version = "2.16.1";
src = fetchPypi {
inherit pname version;
- sha256 = "315eadd1248053ed336b4d3adbf2e3c32895fdbb0cfcd170542c848c8fd45649";
+ sha256 = "1f50xczv8kgly6wz6zrvqzwdj6nvhdlgx8wnrhmbipjrb6qacr25";
};
propagatedBuildInputs = [ requests six ];
From b034c434f60da4f8e98a12c7eb551b68eb0f39e5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 26 Oct 2020 00:49:30 +0100
Subject: [PATCH 470/590] pythonPackages.spotipy: disable tests and cleanup
Tests require network access.
---
.../python-modules/spotipy/default.nix | 24 +++++++++++--------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix
index fee4f093d085..63ec4abcac42 100644
--- a/pkgs/development/python-modules/spotipy/default.nix
+++ b/pkgs/development/python-modules/spotipy/default.nix
@@ -1,4 +1,8 @@
-{ stdenv, buildPythonPackage, fetchPypi, requests, six, mock }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+, six }:
buildPythonPackage rec {
pname = "spotipy";
@@ -10,19 +14,19 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [ requests six ];
- checkInputs = [ mock ];
- preConfigure = ''
- substituteInPlace setup.py \
- --replace "mock==2.0.0" "mock"
- '';
+ # tests want to access the spotify API
+ doCheck = false;
+ pythonImportsCheck = [
+ "spotipy"
+ "spotipy.oauth2"
+ ];
- pythonImportsCheck = [ "spotipy" ];
-
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = "https://spotipy.readthedocs.org/";
+ changelog = "https://github.com/plamere/spotipy/blob/${version}/CHANGELOG.md";
description = "A light weight Python library for the Spotify Web API";
license = licenses.mit;
- maintainers = [ maintainers.rvolosatovs ];
+ maintainers = with maintainers; [ rvolosatovs ];
};
}
From fed1b43c6ffc9b9eff17562751aa2d5b16227781 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 28 Oct 2020 20:43:51 +0100
Subject: [PATCH 471/590] python3Packages.httpcore: 0.10.2 -> 0.12.0
Also clean up the package and enable tests.
---
.../python-modules/httpcore/default.nix | 42 +++++++++++++------
1 file changed, 30 insertions(+), 12 deletions(-)
diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix
index 9ac9b76d2e36..aa15c2555e67 100644
--- a/pkgs/development/python-modules/httpcore/default.nix
+++ b/pkgs/development/python-modules/httpcore/default.nix
@@ -1,34 +1,52 @@
-{ stdenv
+{ lib
, buildPythonPackage
+, pythonOlder
, fetchFromGitHub
-, isPy27
, h11
+, h2
+, pproxy
+, pytestCheckHook
+, pytestcov
, sniffio
+, uvicorn
}:
buildPythonPackage rec {
pname = "httpcore";
- version = "0.10.2";
- disabled = isPy27;
+ version = "0.12.0";
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
- sha256 = "00gn8nfv814rg6fj7xv97mrra3fvx6fzjcgx9y051ihm6hxljdsi";
+ sha256 = "0bwxn7m7r7h6k41swxj0jqj3nzi76wqxwbnry6y7d4qfh4m26g2j";
};
- propagatedBuildInputs = [ h11 sniffio ];
+ propagatedBuildInputs = [
+ h11
+ h2
+ sniffio
+ ];
+
+ checkInputs = [
+ pproxy
+ pytestCheckHook
+ pytestcov
+ uvicorn
+ ];
+
+ pytestFlagsArray = [
+ # these tests fail during dns lookups: httpcore.ConnectError: [Errno -2] Name or service not known
+ "--ignore=tests/sync_tests/test_interfaces.py"
+ ];
- # tests require pythonic access to mitmproxy, which isn't (yet?) packaged as
- # a pythonPackage.
- doCheck = false;
pythonImportsCheck = [ "httpcore" ];
- meta = with stdenv.lib; {
- description = "A minimal HTTP client";
+ meta = with lib; {
+ description = "A minimal low-level HTTP client";
homepage = "https://github.com/encode/httpcore";
license = licenses.bsd3;
- maintainers = [ maintainers.ris ];
+ maintainers = with maintainers; [ ris ];
};
}
From 7f096a9feb7ee37d6ce8c601e933973d8b87f558 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 28 Oct 2020 20:54:55 +0100
Subject: [PATCH 472/590] python3Packages.httpx: 0.14.2 -> 0.16.1
Clean up package and convert tests to pytestCheckHook.
---
.../python-modules/httpx/default.nix | 42 +++++++------------
1 file changed, 16 insertions(+), 26 deletions(-)
diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix
index 5361e047207a..1f527b47ec08 100644
--- a/pkgs/development/python-modules/httpx/default.nix
+++ b/pkgs/development/python-modules/httpx/default.nix
@@ -1,71 +1,61 @@
{ lib
, buildPythonPackage
+, pythonOlder
, fetchFromGitHub
-, fetchpatch
+, brotli
, certifi
-, chardet
-, h11
, h2
, httpcore
-, idna
, rfc3986
, sniffio
-, isPy27
-, pytest
+, pytestCheckHook
, pytest-asyncio
, pytest-trio
, pytestcov
, trustme
, uvicorn
-, brotli
}:
buildPythonPackage rec {
pname = "httpx";
- version = "0.14.2";
- disabled = isPy27;
+ version = "0.16.1";
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
- sha256 = "08b6k5g8car3bic90aw4ysb2zvsa5nm8qk3hk4dgamllnnxzl5br";
+ sha256 = "00gmq45fckcqkj910bvd7pyqz1mvgsdvz4s0k7dzbnc5czzq1f4a";
};
- patches = [
- (fetchpatch {
- name = "fix-cookie-test-timestamp.patch";
- url = "https://github.com/encode/httpx/pull/1270.patch";
- sha256 = "1hgrynac6226sgnyzmsr1nr15rn49gbfmk4c2kx3dwkbh6vr7jpd";
- })
- ];
-
propagatedBuildInputs = [
+ brotli
certifi
- chardet
- h11
h2
httpcore
- idna
rfc3986
sniffio
];
checkInputs = [
- pytest
+ pytestCheckHook
pytest-asyncio
pytest-trio
pytestcov
trustme
uvicorn
- brotli
];
- checkPhase = ''
- PYTHONPATH=.:$PYTHONPATH pytest -k 'not (test_connect_timeout or test_elapsed_timer)'
- '';
pythonImportsCheck = [ "httpx" ];
+ disabledTests = [
+ # httpcore.ConnectError: [Errno 101] Network is unreachable
+ "test_connect_timeout"
+ # httpcore.ConnectError: [Errno -2] Name or service not known
+ "test_async_proxy_close"
+ "test_sync_proxy_close"
+ ];
+
meta = with lib; {
description = "The next generation HTTP client";
homepage = "https://github.com/encode/httpx";
From c8d6c254e814d07096d473daaafd0c6e2d561c06 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 28 Oct 2020 20:12:49 +0100
Subject: [PATCH 473/590] homeassistant: 0.116.4 -> 0.117.0
---
.../home-assistant/component-packages.nix | 23 +++++++++++--------
pkgs/servers/home-assistant/default.nix | 16 ++++---------
pkgs/servers/home-assistant/frontend.nix | 4 ++--
3 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index a55b695b4576..326cc480fddc 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "0.116.4";
+ version = "0.117.0";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];
@@ -11,6 +11,7 @@
"actiontec" = ps: with ps; [ ];
"adguard" = ps: with ps; [ adguardhome ];
"ads" = ps: with ps; [ pyads ];
+ "advantage_air" = ps: with ps; [ ]; # missing inputs: advantage_air
"aftership" = ps: with ps; [ pyaftership ];
"agent_dvr" = ps: with ps; [ ]; # missing inputs: agent-py
"air_quality" = ps: with ps; [ ];
@@ -91,7 +92,6 @@
"bme680" = ps: with ps; [ ]; # missing inputs: bme680 smbus-cffi
"bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280
"bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected
- "bom" = ps: with ps; [ ]; # missing inputs: bomradarloop
"bond" = ps: with ps; [ ]; # missing inputs: bond-api
"braviatv" = ps: with ps; [ bravia-tv ];
"broadlink" = ps: with ps; [ broadlink ];
@@ -107,7 +107,7 @@
"calendar" = ps: with ps; [ aiohttp-cors ];
"camera" = ps: with ps; [ aiohttp-cors ];
"canary" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: py-canary
- "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa mutagen PyChromecast zeroconf ];
+ "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa mutagen plexapi plexauth plexwebsocket PyChromecast pysonos zeroconf ];
"cert_expiry" = ps: with ps; [ ];
"channels" = ps: with ps; [ ]; # missing inputs: pychannels
"circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook
@@ -163,7 +163,7 @@
"device_automation" = ps: with ps; [ ];
"device_sun_light_trigger" = ps: with ps; [ aiohttp-cors pillow ];
"device_tracker" = ps: with ps; [ ];
- "devolo_home_control" = ps: with ps; [ ]; # missing inputs: devolo-home-control-api
+ "devolo_home_control" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: devolo-home-control-api
"dexcom" = ps: with ps; [ ]; # missing inputs: pydexcom
"dht" = ps: with ps; [ ]; # missing inputs: Adafruit-DHT
"dialogflow" = ps: with ps; [ aiohttp-cors ];
@@ -301,7 +301,7 @@
"gitlab_ci" = ps: with ps; [ python-gitlab ];
"gitter" = ps: with ps; [ ]; # missing inputs: gitterpy
"glances" = ps: with ps; [ ]; # missing inputs: glances_api
- "gntp" = ps: with ps; [ ]; # missing inputs: gntp
+ "gntp" = ps: with ps; [ gntp ];
"goalfeed" = ps: with ps; [ ]; # missing inputs: pysher
"goalzero" = ps: with ps; [ ]; # missing inputs: goalzero
"gogogate2" = ps: with ps; [ ]; # missing inputs: gogogate2-api
@@ -318,6 +318,7 @@
"gpsd" = ps: with ps; [ ]; # missing inputs: gps3
"gpslogger" = ps: with ps; [ aiohttp-cors ];
"graphite" = ps: with ps; [ ];
+ "gree" = ps: with ps; [ ]; # missing inputs: greeclimate
"greeneye_monitor" = ps: with ps; [ ]; # missing inputs: greeneye_monitor
"greenwave" = ps: with ps; [ ]; # missing inputs: greenwavereality
"griddy" = ps: with ps; [ ]; # missing inputs: griddypower
@@ -470,7 +471,7 @@
"mastodon" = ps: with ps; [ ]; # missing inputs: Mastodon.py
"matrix" = ps: with ps; [ matrix-client ];
"maxcube" = ps: with ps; [ ]; # missing inputs: maxcube-api
- "mcp23017" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-blinka adafruit-circuitpython-mcp230xx
+ "mcp23017" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-mcp230xx
"media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light ];
"media_player" = ps: with ps; [ aiohttp-cors ];
"media_source" = ps: with ps; [ aiohttp-cors ];
@@ -527,7 +528,7 @@
"nederlandse_spoorwegen" = ps: with ps; [ ]; # missing inputs: nsapi
"nello" = ps: with ps; [ ]; # missing inputs: pynello
"ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient
- "nest" = ps: with ps; [ python-nest ];
+ "nest" = ps: with ps; [ aiohttp-cors python-nest ]; # missing inputs: google-nest-sdm
"netatmo" = ps: with ps; [ aiohttp-cors hass-nabucasa pyatmo ];
"netdata" = ps: with ps; [ ]; # missing inputs: netdata
"netgear" = ps: with ps; [ ]; # missing inputs: pynetgear
@@ -568,7 +569,7 @@
"ombi" = ps: with ps; [ ]; # missing inputs: pyombi
"omnilogic" = ps: with ps; [ ]; # missing inputs: omnilogic
"onboarding" = ps: with ps; [ aiohttp-cors pillow ]; # missing inputs: home-assistant-frontend
- "onewire" = ps: with ps; [ ]; # missing inputs: pyownet
+ "onewire" = ps: with ps; [ ]; # missing inputs: pi1wire pyownet
"onkyo" = ps: with ps; [ onkyo-eiscp ];
"onvif" = ps: with ps; [ ha-ffmpeg zeep ]; # missing inputs: WSDiscovery onvif-zeep-async
"openalpr_cloud" = ps: with ps; [ ];
@@ -622,6 +623,7 @@
"point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint
"poolsense" = ps: with ps; [ ]; # missing inputs: poolsense
"powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall
+ "profiler" = ps: with ps; [ pyprof2calltree ];
"progettihwsw" = ps: with ps; [ ]; # missing inputs: progettihwsw
"proliphix" = ps: with ps; [ ]; # missing inputs: proliphix
"prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ];
@@ -688,6 +690,7 @@
"rpi_rf" = ps: with ps; [ ]; # missing inputs: rpi-rf
"rss_feed_template" = ps: with ps; [ aiohttp-cors ];
"rtorrent" = ps: with ps; [ ];
+ "ruckus_unleashed" = ps: with ps; [ ]; # missing inputs: pyruckus
"russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio
"russound_rnet" = ps: with ps; [ ]; # missing inputs: russound
"sabnzbd" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: pysabnzbd
@@ -809,6 +812,7 @@
"tank_utility" = ps: with ps; [ ]; # missing inputs: tank_utility
"tankerkoenig" = ps: with ps; [ ]; # missing inputs: pytankerkoenig
"tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff
+ "tasmota" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: hatasmota
"tautulli" = ps: with ps; [ ]; # missing inputs: pytautulli
"tcp" = ps: with ps; [ ];
"ted5000" = ps: with ps; [ xmltodict ];
@@ -932,6 +936,7 @@
"wunderground" = ps: with ps; [ ];
"x10" = ps: with ps; [ ];
"xbee" = ps: with ps; [ ]; # missing inputs: xbee-helper
+ "xbox" = ps: with ps; [ aiohttp-cors ]; # missing inputs: xbox-webapi
"xbox_live" = ps: with ps; [ ]; # missing inputs: xboxapi
"xeoma" = ps: with ps; [ ]; # missing inputs: pyxeoma
"xfinity" = ps: with ps; [ ]; # missing inputs: xfinity-gateway
@@ -950,7 +955,7 @@
"yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower
"yessssms" = ps: with ps; [ ]; # missing inputs: YesssSMS
"yi" = ps: with ps; [ aioftp ha-ffmpeg ];
- "zabbix" = ps: with ps; [ ]; # missing inputs: pyzabbix
+ "zabbix" = ps: with ps; [ ]; # missing inputs: py-zabbix
"zamg" = ps: with ps; [ ];
"zengge" = ps: with ps; [ ]; # missing inputs: zengge
"zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index e2a7df26efee..98f5fe943247 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -67,7 +67,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
- hassVersion = "0.116.4";
+ hassVersion = "0.117.0";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@@ -83,28 +83,20 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
- sha256 = "1wcr2afvq1l6xlws3jgzfyh4kx61i0x9n985fiq3ls29w9lpshk4";
+ sha256 = "1f5axspj5hffmaqhpmrrflyd0c62lww36yvd2wr999yix7jhsfnc";
};
- patches = [
- (fetchpatch {
- # Fix group tests when run in parallel, remove >= 0.117.0
- url = "https://github.com/home-assistant/core/pull/41446/commits/c79dc478b7136b6df43707bf0ad6b53419c8a909.patch";
- sha256 = "1cl81swq960vd2f733dcqq60c0jjzrkm0l2sibcblhmyw597b4vj";
- })
- ];
-
postPatch = ''
substituteInPlace setup.py \
--replace "bcrypt==3.1.7" "bcrypt>=3.1.7" \
- --replace "cryptography==2.9.2" "cryptography" \
+ --replace "cryptography==3.2.0" "cryptography" \
--replace "ruamel.yaml==0.15.100" "ruamel.yaml>=0.15.100"
substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"'
'';
propagatedBuildInputs = [
# From setup.py
- aiohttp astral async-timeout attrs bcrypt certifi ciso8601 jinja2
+ aiohttp astral async-timeout attrs bcrypt certifi ciso8601 httpx jinja2
pyjwt cryptography pip python-slugify pytz pyyaml requests ruamel_yaml
setuptools voluptuous voluptuous-serialize yarl
# From default_config. frontend, http, image, mobile_app and recorder components as well as
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 8dd99d94ee0f..2ca94066dbcb 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -4,11 +4,11 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
- version = "20201001.2";
+ version = "20201021.3";
src = fetchPypi {
inherit pname version;
- sha256 = "1wyac980d8j8bk4bzh9y3a5c4xqfn3062wj5m45kwsx1f5rfx26j";
+ sha256 = "04z8rvmnpmy7xx90pvqcr58hsxjsc10mrrjcx7ppspglb91b9cpb";
};
# no Python tests implemented
From c44af1ebd72958cf2c99d30fdea31860752dcb52 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 29 Oct 2020 18:13:47 +0100
Subject: [PATCH 474/590] python3Packages.asgi-csrf: disable tests
The packages tests import a private module from httpx, that does not
exist anymore in newer versions.
---
.../python-modules/asgi-csrf/default.nix | 23 ++++++++++++++-----
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/pkgs/development/python-modules/asgi-csrf/default.nix b/pkgs/development/python-modules/asgi-csrf/default.nix
index 12c94aee1573..257e7314af9e 100644
--- a/pkgs/development/python-modules/asgi-csrf/default.nix
+++ b/pkgs/development/python-modules/asgi-csrf/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, isPy27, fetchFromGitHub, itsdangerous, python-multipart
-, pytest, starlette, httpx, pytest-asyncio }:
+, pytestCheckHook, starlette, httpx, pytest-asyncio }:
buildPythonPackage rec {
version = "0.7";
@@ -14,12 +14,23 @@ buildPythonPackage rec {
sha256 = "1vf4lh007790836cp3hd6wf8wsgj045dcg0w1cm335p08zz6j4k7";
};
- propagatedBuildInputs = [ itsdangerous python-multipart ];
+ propagatedBuildInputs = [
+ itsdangerous
+ python-multipart
+ ];
+
+ checkInputs = [
+ httpx
+ pytest-asyncio
+ pytestCheckHook
+ starlette
+ ];
+
+ # tests fail while importing a private module from httpx
+ # E ModuleNotFoundError: No module named 'httpx._content_streams'
+ # https://github.com/simonw/asgi-csrf/issues/18
+ doCheck = false;
- checkInputs = [ pytest starlette httpx pytest-asyncio ];
- checkPhase = ''
- pytest test_asgi_csrf.py
- '';
pythonImportsCheck = [ "asgi_csrf" ];
meta = with stdenv.lib; {
From 90a47bad3e9cda105e0f6ebbdcb9fad39d5187db Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 29 Oct 2020 18:16:10 +0100
Subject: [PATCH 475/590] python3Packages.asgi-csrf: 0.7 -> 0.7.1
---
pkgs/development/python-modules/asgi-csrf/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/asgi-csrf/default.nix b/pkgs/development/python-modules/asgi-csrf/default.nix
index 257e7314af9e..e838ec787c31 100644
--- a/pkgs/development/python-modules/asgi-csrf/default.nix
+++ b/pkgs/development/python-modules/asgi-csrf/default.nix
@@ -2,7 +2,7 @@
, pytestCheckHook, starlette, httpx, pytest-asyncio }:
buildPythonPackage rec {
- version = "0.7";
+ version = "0.7.1";
pname = "asgi-csrf";
disabled = isPy27;
@@ -11,7 +11,7 @@ buildPythonPackage rec {
owner = "simonw";
repo = pname;
rev = version;
- sha256 = "1vf4lh007790836cp3hd6wf8wsgj045dcg0w1cm335p08zz6j4k7";
+ sha256 = "1hhqrb9r46y6i3d3w6hc9zm6yyikdyd2k5pcbyw0r9fl959yi4hf";
};
propagatedBuildInputs = [
From 9fb7ea1f17bd7dd02e84f4feca77c6989886cb19 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 17:54:46 +0000
Subject: [PATCH 476/590] batsignal: 1.1.2 -> 1.1.3
---
pkgs/applications/misc/batsignal/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix
index 56c508eaca92..77eb32166fe4 100644
--- a/pkgs/applications/misc/batsignal/default.nix
+++ b/pkgs/applications/misc/batsignal/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "batsignal";
- version = "1.1.2";
+ version = "1.1.3";
src = fetchFromGitHub {
owner = "electrickite";
repo = "batsignal";
rev = "${version}";
- sha256 = "0ss5dw7wpqsf96dig6r7x4fhf6brmjdy54jyyf5nk1h9kzw4d69r";
+ sha256 = "12hj0j18db34x0xzgj6xmhvxm966d05z0rl3d9rlrcd2q96lilwf";
};
buildInputs = [ libnotify glib ];
From ca6dc681539394a534b8ff21287a3a71efcab44e Mon Sep 17 00:00:00 2001
From: Jon Roberts <jon@emptyflask.net>
Date: Thu, 29 Oct 2020 13:13:09 -0500
Subject: [PATCH 477/590] zoom-us: 5.3.469451.0927 -> 5.4.53350.1027
---
.../networking/instant-messengers/zoom-us/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 3109db89ff37..6c072118bc88 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
let
inherit (stdenv.lib) concatStringsSep makeBinPath optional;
- version = "5.3.469451.0927";
+ version = "5.4.53350.1027";
srcs = {
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
- sha256 = "0qb9jx2zd5p6jk1g0xmh1f6xlf4gfl38ns6ixpc653qfimy8b0av";
+ sha256 = "11va3px42y81bwy10mxm7mk0kf2sni9gwb422pq9djck2dgchw5x";
};
};
From b8d59e93c8c2cc941caa4eec17a72303f5ef84f4 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 29 Oct 2020 19:47:42 +0100
Subject: [PATCH 478/590] nixos/networkd: allow RouteMetric= in [DHCPv6]
section
---
nixos/modules/system/boot/networkd.nix | 2 ++
1 file changed, 2 insertions(+)
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 47689b2a4700..3b01bc00bafa 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -648,11 +648,13 @@ let
"RapidCommit"
"ForceDHCPv6PDOtherInformation"
"PrefixDelegationHint"
+ "RouteMetric"
])
(assertValueOneOf "UseDNS" boolValues)
(assertValueOneOf "UseNTP" boolValues)
(assertValueOneOf "RapidCommit" boolValues)
(assertValueOneOf "ForceDHCPv6PDOtherInformation" boolValues)
+ (assertInt "RouteMetric")
];
sectionDHCPServer = checkUnitConfig "DHCPServer" [
From 0f03d8f0d94c9cf5b0540336fcb7e141b89efcc8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 19:19:05 +0000
Subject: [PATCH 479/590] _1password-gui: 0.9.0 -> 0.9.1
---
pkgs/tools/security/1password-gui/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix
index c3d406ce3aad..b9e668aaa403 100644
--- a/pkgs/tools/security/1password-gui/default.nix
+++ b/pkgs/tools/security/1password-gui/default.nix
@@ -13,11 +13,11 @@ in
stdenv.mkDerivation rec {
pname = "1password";
- version = "0.9.0";
+ version = "0.9.1";
src = fetchurl {
url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
- sha256 = "109jsls4515y78zhhsxqlgms30i5rzhi60p3b9wx6y8v0iq331wp";
+ sha256 = "04hv7hw4s3f65kf3ggh9l0nrx25k5yj2kqv83nl7pvam5lvnv8sz";
};
nativeBuildInputs = [ makeWrapper ];
From 8d936595b892cebc6ad66c542359ff356b21e57c Mon Sep 17 00:00:00 2001
From: Shawn Dooley <shawn@shawndooley.net>
Date: Thu, 29 Oct 2020 15:51:43 -0400
Subject: [PATCH 480/590] fldigi: 4.1.14 -> 4.1.15
---
pkgs/applications/radio/fldigi/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix
index af93b7ee65d6..97a8369468da 100644
--- a/pkgs/applications/radio/fldigi/default.nix
+++ b/pkgs/applications/radio/fldigi/default.nix
@@ -2,12 +2,12 @@
libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }:
stdenv.mkDerivation rec {
- version = "4.1.14";
+ version = "4.1.15";
pname = "fldigi";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
- sha256 = "0hr6xbv01xf7z4r2jxxhn8xjdmca2198q4m9glh4877dllvfq6xj";
+ sha256 = "260a61be714d9a7274adb78a822f210a589f4c344d5444c5f2cbbcd7c466ebbb";
};
buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio
From b40ad04c9d8d1e05542e5551190bcc690aa8e3e1 Mon Sep 17 00:00:00 2001
From: Jonathan Wilkins <jonathan@wilkins.tech>
Date: Thu, 29 Oct 2020 19:25:49 +0000
Subject: [PATCH 481/590] vimPlugins.telescope-nvim: init at 2020-10-28
---
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 eab8804fd6ee..91cbb9d83cb6 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -3383,6 +3383,18 @@ let
meta.homepage = "https://github.com/tomtom/tcomment_vim/";
};
+ telescope-nvim = buildVimPluginFrom2Nix {
+ pname = "telescope-nvim";
+ version = "2020-10-28";
+ src = fetchFromGitHub {
+ owner = "nvim-lua";
+ repo = "telescope.nvim";
+ rev = "78cf7ebd7f2dcfcf6fec1d0195ccf46cb479d72c";
+ sha256 = "1wl30nqdbl90a9zky524k1cszwii4vg5rhlrrvg4n6hdw9kkyi4m";
+ };
+ meta.homepage = "https://github.com/nvim-lua/telescope.nvim/";
+ };
+
tender-vim = buildVimPluginFrom2Nix {
pname = "tender-vim";
version = "2020-06-29";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index a95ee209f94d..de4cd959dee4 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -371,6 +371,7 @@ nvie/vim-flake8
nvim-lua/completion-nvim
nvim-lua/diagnostic-nvim
nvim-lua/lsp_extensions.nvim
+nvim-lua/telescope.nvim
nvim-treesitter/completion-treesitter
nvim-treesitter/nvim-treesitter
ocaml/vim-ocaml
From ec2bd3c95cae85593a29863f5b941e86b4e95f6d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 19:29:35 +0000
Subject: [PATCH 482/590] beancount: 2.3.2 -> 2.3.3
---
pkgs/development/python-modules/beancount/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix
index b3232f8eca54..f1dc7a5349d9 100644
--- a/pkgs/development/python-modules/beancount/default.nix
+++ b/pkgs/development/python-modules/beancount/default.nix
@@ -4,14 +4,14 @@
, ply, python_magic, pytest, requests }:
buildPythonPackage rec {
- version = "2.3.2";
+ version = "2.3.3";
pname = "beancount";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "1wfpf2b0sha84rz0qgkanc82wharjqr2nr7xxg1rngrci2h0aqhd";
+ sha256 = "0767ap2n9vk9dz40njndfhaprajr75fvzx7igbd1szc6x8wri8nr";
};
# Tests require files not included in the PyPI archive.
From bd31e0dd0bf6b2befc70f8eb9dd6cbaec939ac98 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Thu, 29 Oct 2020 13:38:50 -0700
Subject: [PATCH 483/590] prometheus-pushgateway: 1.2.0 -> 1.3.0
---
pkgs/servers/monitoring/prometheus/pushgateway.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix
index 1425fccdca4b..d2d59c5e5ded 100644
--- a/pkgs/servers/monitoring/prometheus/pushgateway.nix
+++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "pushgateway";
- version = "1.2.0";
+ version = "1.3.0";
rev = "v${version}";
goPackagePath = "github.com/prometheus/pushgateway";
@@ -11,7 +11,7 @@ buildGoPackage rec {
inherit rev;
owner = "prometheus";
repo = "pushgateway";
- sha256 = "0q57pvdfapi1xx8mw7ykvxs64alypyqbxwvrqjcrgv2jidbcd1mm";
+ sha256 = "0ll6s8yqcx3fgn6gzmfb1bsfykl0ra6383nyw1kjbj260w200gls";
};
buildUser = "nix@nixpkgs";
From 4e3da4adc82fec01e75fdbd0f9a94b547b7a5692 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Thu, 29 Oct 2020 12:59:03 -0700
Subject: [PATCH 484/590] blackbox-exporter: 0.17.0 -> 0.18.0
---
pkgs/servers/monitoring/prometheus/blackbox-exporter.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
index 45d70d47d6e8..e1fd31c3202f 100644
--- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "blackbox_exporter";
- version = "0.17.0";
+ version = "0.18.0";
rev = version;
goPackagePath = "github.com/prometheus/blackbox_exporter";
@@ -11,7 +11,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "prometheus";
repo = "blackbox_exporter";
- sha256 = "00ganz6wfwyb9avkp2fr4bwpzvfiffsmpgndl8zp80bk7m1b3mnz";
+ sha256 = "1h4s0ww1drh14slrj9m7mx224qx9c6hyjav8sj959r75902i9491";
};
# dns-lookup is performed for the tests
From 218809ef122f5e5f6ddfea8c330cf78ba416117b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 29 Oct 2020 16:41:39 -0400
Subject: [PATCH 485/590] linux: 4.14.202 -> 4.14.203
---
pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index cdbedb34f8d8..a28531ee4012 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.14.202";
+ version = "4.14.203";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0a739g3s0lc579zp4478xr645qzvhmrm1w19x0rj7p8bbfmigiwm";
+ sha256 = "0c9r1s83mrn9lzgrr4wzvk4d72q70sbgf7lql6z9ivkf12v3p5mc";
};
} // (args.argsOverride or {}))
From 65b969b076f48d940cb0a836193505f478c3b30b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 29 Oct 2020 16:42:50 -0400
Subject: [PATCH 486/590] linux: 4.19.152 -> 4.19.153
---
pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 4c0d7b06ef4d..23438f7e29c7 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.19.152";
+ version = "4.19.153";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0p857b1gmmc2bv8limrdbfb3zsnchvg275sx5fkyy4185jfam9m5";
+ sha256 = "18sxs6vnxkjgyr6sk07bbhfccfm5wfj5pzvf1ciwc3kmsv92h4mj";
};
} // (args.argsOverride or {}))
From 822c60b2fb6c67804d57273b52f55cd0e70cfe26 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 29 Oct 2020 16:43:37 -0400
Subject: [PATCH 487/590] linux: 4.4.240 -> 4.4.241
---
pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 539a783e0af2..64d011461805 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.4.240";
+ version = "4.4.241";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "131pamgxxmx4ba4gn2qxczv8w3lxrmwlqg0a7pdjzg0sy9lirygk";
+ sha256 = "054jd6jgymxbkjfmk8wbckihl355gjimjg2xi5yr4v2343qi9zij";
};
} // (args.argsOverride or {}))
From bc6185c207212bd70aedddd7b9b30bf814c052ab Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 29 Oct 2020 16:44:20 -0400
Subject: [PATCH 488/590] linux: 4.9.240 -> 4.9.241
---
pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 58ae2945427b..2d81826d6c36 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.9.240";
+ version = "4.9.241";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0vvpvw5wsvjnwch5ci63x08qc7qyzpyxbiaxx4521nl8d7371r06";
+ sha256 = "0b5k9cwz7vpaybw4nd03pn2z4d8qbhmhd9mx4j2yd0fqj57x1in4";
};
} // (args.argsOverride or {}))
From 6a4d9c16babe298c3d66fa9d7d58c3c66e81ee03 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 29 Oct 2020 16:45:17 -0400
Subject: [PATCH 489/590] linux: 5.4.72 -> 5.4.73
---
pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 9203321f1f78..ad3334d7c938 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.4.72";
+ version = "5.4.73";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0whi5kr1ziy9y20p42adnmqks41cavsraa36g9dbbrbgsmdn890f";
+ sha256 = "1cknwnzpimjfacjbb39ay9j4lv3767j2858xz9yvwsvj7d04nhjs";
};
} // (args.argsOverride or {}))
From 844f488498df87cfad379e64d44082e16cd6370f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 29 Oct 2020 16:46:06 -0400
Subject: [PATCH 490/590] linux: 5.8.16 -> 5.8.17
---
pkgs/os-specific/linux/kernel/linux-5.8.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/kernel/linux-5.8.nix b/pkgs/os-specific/linux/kernel/linux-5.8.nix
index 35bc489c3c55..ee58f02db876 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.8.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.8.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.8.16";
+ version = "5.8.17";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "1icxa0pgqhji924ryz37mpjjf4zlkrm8bidanjyn2mzbar7migzx";
+ sha256 = "00rwvsrmklvkzch8bl6z29vch4dyvzxrs97pr1qd13afw7y6912n";
};
} // (args.argsOverride or {}))
From 1ab68981ef9959c2db9c5e3331762c4bd53e2cf9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 29 Oct 2020 16:46:53 -0400
Subject: [PATCH 491/590] linux: 5.9.1 -> 5.9.2
---
pkgs/os-specific/linux/kernel/linux-5.9.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/kernel/linux-5.9.nix b/pkgs/os-specific/linux/kernel/linux-5.9.nix
index d96dd841d8a9..05c594f7efba 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.9.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.9.1";
+ version = "5.9.2";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0dn0xz81pphca5dkg6zh8c78p05f63rrr5ihqqsmhc4n73li2jms";
+ sha256 = "0dh2ciyrm2ac7r4pybxa1cq3pfw3z3ilj50gdaa0clm9j7nyrx2i";
};
} // (args.argsOverride or {}))
From e57cbfc0484759d741d8f11708ca0c78867adcf9 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 29 Oct 2020 11:47:29 -0700
Subject: [PATCH 492/590] libguestfs: inherit hydraPlatforms from appliance
(cherry picked from commit 265f2f576f94d7cbc3149304f2d6d7406b6ee8db)
---
pkgs/development/libraries/libguestfs/default.nix | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index d8a037aa5f15..b875b3579037 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -91,5 +91,7 @@ stdenv.mkDerivation rec {
homepage = "https://libguestfs.org/";
maintainers = with maintainers; [offline];
platforms = platforms.linux;
+ # this is to avoid "output size exceeded"
+ hydraPlatforms = if appliance != null then appliance.meta.hydraPlatforms else platforms.linux;
};
}
From 6a9f56b82d72437b4d028beedbfd19ba0eb3ac4e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 21:42:11 +0000
Subject: [PATCH 493/590] abcl: 1.7.1 -> 1.8.0
---
pkgs/development/compilers/abcl/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix
index edcf722f2553..f27abda03d18 100644
--- a/pkgs/development/compilers/abcl/default.nix
+++ b/pkgs/development/compilers/abcl/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, ant, jre, jdk}:
stdenv.mkDerivation rec {
pname = "abcl";
- version = "1.7.1";
+ version = "1.8.0";
# or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
src = fetchurl {
url = "https://common-lisp.net/project/armedbear/releases/${version}/${pname}-src-${version}.tar.gz";
- sha256 = "09wjcjvriagml740krg9nva5v6bsc3sav86dmb55pjvfpsr1846m";
+ sha256 = "0wpfj7q9vq2k2mkp2wx2yvrcq0v8229ddyk8viiaizs7msn588ac";
};
configurePhase = ''
mkdir nix-tools
From 05659a44ceb009f9c0c7060c3c1456276a2b3472 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 29 Oct 2020 21:10:12 +0800
Subject: [PATCH 494/590] nmapsi4: 0.4.80-20180430 -> 0.5-alpha2
---
pkgs/tools/security/nmap/qt.nix | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/pkgs/tools/security/nmap/qt.nix b/pkgs/tools/security/nmap/qt.nix
index 2dcd7fed0c4b..216186daa5be 100644
--- a/pkgs/tools/security/nmap/qt.nix
+++ b/pkgs/tools/security/nmap/qt.nix
@@ -1,16 +1,24 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook
-, dnsutils, nmap
-, qtbase, qtscript, qtwebengine }:
+{ stdenv
+, fetchFromGitHub
+, cmake
+, pkgconfig
+, wrapQtAppsHook
+, dnsutils
+, nmap
+, qtbase
+, qtscript
+, qtwebengine
+}:
stdenv.mkDerivation rec {
pname = "nmapsi4";
- version = "0.4.80-20180430";
+ version = "0.5-alpha2";
src = fetchFromGitHub {
owner = "nmapsi4";
repo = "nmapsi4";
- rev = "d7f18e4c1e38dcf9c29cb4496fe14f9ff172861a";
- sha256 = "10wqyrjzmad1g7lqa65rymbkna028xbp4xcpj442skw8gyrs3994";
+ rev = "v${version}";
+ sha256 = "sha256-q3XfwJ4TGK4E58haN0Q0xRH4GDpKD8VZzyxHe/VwBqY=";
};
nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];
@@ -47,7 +55,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Qt frontend for nmap";
- license = licenses.gpl2;
+ license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg ];
inherit (src.meta) homepage;
};
From 126fe379216b083db17a3a72f84e018e64c31ba6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 22:44:05 +0000
Subject: [PATCH 495/590] consul: 1.8.4 -> 1.8.5
---
pkgs/servers/consul/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index c153cc390732..8912ce847883 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "consul";
- version = "1.8.4";
+ version = "1.8.5";
rev = "v${version}";
# Note: Currently only release tags are supported, because they have the Consul UI
@@ -17,7 +17,7 @@ buildGoModule rec {
owner = "hashicorp";
repo = pname;
inherit rev;
- sha256 = "0rm6qf8jnn6khrx9dy8r4ji1yd89hai52d9zggb5r99k7m9wd291";
+ sha256 = "1cf3zvb3xh97hz5hav9f1q3b22lwryw6a7gcmm7cphk6bdrdiva5";
};
passthru.tests.consul = nixosTests.consul;
@@ -26,7 +26,7 @@ buildGoModule rec {
# has a split module structure in one repo
subPackages = ["." "connect/certgen"];
- vendorSha256 = "1g3a9m6aqarq0rqf7qrp9yxcsc3sjnx0vbypakzmrq1ndgdivk16";
+ vendorSha256 = "1zz3hhngvx7989m73cp5a9j6spg42hgqd9vs8v332fvcr277lyxj";
doCheck = false;
From ff4a1cf4d8a8c3566b059786ca3326b1ce282b47 Mon Sep 17 00:00:00 2001
From: MetaDark <kira.bruneau@gmail.com>
Date: Thu, 29 Oct 2020 18:10:39 -0400
Subject: [PATCH 496/590] git-review: build with python3
Also updated source to the new repo and added myself as a maintainer
---
.../version-management/git-review/default.nix | 21 +++++++++----------
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix
index c7702cfa1951..d0bbca15ea17 100644
--- a/pkgs/applications/version-management/git-review/default.nix
+++ b/pkgs/applications/version-management/git-review/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, pythonPackages} :
+{ lib, fetchurl, buildPythonApplication, pbr, requests, setuptools }:
-pythonPackages.buildPythonApplication rec {
+buildPythonApplication rec {
pname = "git-review";
version = "1.28.0";
@@ -8,21 +8,20 @@ pythonPackages.buildPythonApplication rec {
# upstream repository (and we are installing from tarball instead)
PBR_VERSION = version;
- src = fetchFromGitHub {
- owner = "openstack-infra";
- repo = pname;
- rev = version;
- sha256 = "1hgw1dkl94m3idv4izc7wf2j7al2c7nnsqywy7g53nzkv9pfv47s";
+ src = fetchurl {
+ url = "https://opendev.org/opendev/${pname}/archive/${version}.tar.gz";
+ sha256 = "1y1jzb0hlprynwwr4q5y4x06641qrhj0k69mclabnmhfam9g8ygm";
};
- propagatedBuildInputs = with pythonPackages; [ pbr requests setuptools ];
+ propagatedBuildInputs = [ pbr requests setuptools ];
# Don't do tests because they require gerrit which is not packaged
doCheck = false;
- meta = {
- homepage = "https://github.com/openstack-infra/git-review";
+ meta = with lib; {
+ homepage = "https://opendev.org/opendev/git-review";
description = "Tool to submit code to Gerrit";
- license = stdenv.lib.licenses.asl20;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ metadark ];
};
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a37fab7ec3db..64c08133c688 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21055,7 +21055,7 @@ in
git-quick-stats = callPackage ../development/tools/git-quick-stats {};
- git-review = callPackage ../applications/version-management/git-review { };
+ git-review = python3Packages.callPackage ../applications/version-management/git-review { };
github-cli = gitAndTools.gh;
From 8bdb5204be1e2d7168cdb44d28d57c4a09286bf7 Mon Sep 17 00:00:00 2001
From: Sebastien Braun <sebastien@sebbraun.de>
Date: Wed, 28 Oct 2020 22:57:33 +0100
Subject: [PATCH 497/590] aria2: refactor to avoid python2 dependency
Use python3 Sphinx package instead of python2 Sphinx package,
to avoid build-time dependency on python 2, as per
https://github.com/NixOS/nixpkgs/issues/101964
---
pkgs/top-level/all-packages.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 64c08133c688..ff3444cd47b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1326,7 +1326,7 @@ in
aria2 = callPackage ../tools/networking/aria2 {
inherit (darwin.apple_sdk.frameworks) Security;
- inherit (pythonPackages) sphinx;
+ inherit (python3Packages) sphinx;
};
aria = aria2;
From 8975bd93b75c865c525ede2bce3c39af9146fffb Mon Sep 17 00:00:00 2001
From: Shawn Dooley <shawn@shawndooley.net>
Date: Thu, 29 Oct 2020 20:15:50 -0400
Subject: [PATCH 498/590] fldigi: 4.1.14 -> 4.1.15 Corrected hash format
---
pkgs/applications/radio/fldigi/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix
index 97a8369468da..3811c8fd6f26 100644
--- a/pkgs/applications/radio/fldigi/default.nix
+++ b/pkgs/applications/radio/fldigi/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
- sha256 = "260a61be714d9a7274adb78a822f210a589f4c344d5444c5f2cbbcd7c466ebbb";
+ sha256 = "1fzbcv2dgg6byb2l8m2d6i69yn0a44pq52mpmms756jdf6z622i6";
};
buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio
From 6e19ed0a526598087c08bd4ea389394115a6360f Mon Sep 17 00:00:00 2001
From: Renato Alves <alves.rjc@gmail.com>
Date: Thu, 29 Oct 2020 13:27:45 +0100
Subject: [PATCH 499/590] lumpy: 0.3.0 -> 0.3.1
---
pkgs/applications/science/biology/lumpy/default.nix | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/science/biology/lumpy/default.nix b/pkgs/applications/science/biology/lumpy/default.nix
index 04512e8e372e..f6267a2e017f 100644
--- a/pkgs/applications/science/biology/lumpy/default.nix
+++ b/pkgs/applications/science/biology/lumpy/default.nix
@@ -7,13 +7,14 @@ let
in stdenv.mkDerivation rec {
pname = "lumpy";
- version = "0.3.0";
+ version = "0.3.1";
src = fetchFromGitHub {
owner = "arq5x";
repo = "lumpy-sv";
- rev = version;
- sha256 = "0azhzvmh9az9jcq0xprlzdz6w16azgszv4kshb903bwbnqirmk18";
+ rev = "v${version}";
+ sha256 = "0r71sg7qch8r6p6dw995znrqdj6q49hjdylhzbib2qmv8nvglhs9";
+ fetchSubmodules = true;
};
nativeBuildInputs = [ which ];
@@ -26,6 +27,8 @@ in stdenv.mkDerivation rec {
# Use Nix htslib over bundled version
sed -i 's/lumpy_filter: htslib/lumpy_filter:/' Makefile
sed -i 's|../../lib/htslib/libhts.a|-lhts|' src/filter/Makefile
+ # Also make sure we use the includes from Nix's htslib
+ sed -i 's|../../lib/htslib/|${htslib}|' src/filter/Makefile
'';
# Upstream's makefile doesn't have an install target
From 459c5ec3b19767b96ef11225d60b0964c467f3b1 Mon Sep 17 00:00:00 2001
From: Renato Alves <alves.rjc@gmail.com>
Date: Thu, 29 Oct 2020 16:20:23 +0100
Subject: [PATCH 500/590] pythonPackages.pysam: Disable failing tests unrelated
to packaging
These will be fixed upstream and are due to format changes introduced
in samtools and htslib 1.11
---
pkgs/development/python-modules/pysam/default.nix | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix
index 2802b6d0e0ff..2f40a2973332 100644
--- a/pkgs/development/python-modules/pysam/default.nix
+++ b/pkgs/development/python-modules/pysam/default.nix
@@ -80,13 +80,19 @@ buildPythonPackage rec {
--deselect tests/AlignmentFileHeader_test.py::TestHeaderBAM::test_header_content_is_as_expected \
--deselect tests/AlignmentFileHeader_test.py::TestHeaderCRAM::test_dictionary_access_works \
--deselect tests/AlignmentFileHeader_test.py::TestHeaderCRAM::test_header_content_is_as_expected \
- --deselect tests/AlignmentFile_test.py::TestIO::testBAM2SAM \
- --deselect tests/AlignmentFile_test.py::TestIO::testSAM2BAM \
- --deselect tests/AlignmentFile_test.py::TestIO::testWriteUncompressedBAMFile \
--deselect tests/AlignmentFile_test.py::TestDeNovoConstruction::testBAMWholeFile \
--deselect tests/AlignmentFile_test.py::TestEmptyHeader::testEmptyHeader \
--deselect tests/AlignmentFile_test.py::TestHeaderWithProgramOptions::testHeader \
+ --deselect tests/AlignmentFile_test.py::TestIO::testBAM2BAM \
+ --deselect tests/AlignmentFile_test.py::TestIO::testBAM2CRAM \
+ --deselect tests/AlignmentFile_test.py::TestIO::testBAM2SAM \
+ --deselect tests/AlignmentFile_test.py::TestIO::testFetchFromClosedFileObject \
+ --deselect tests/AlignmentFile_test.py::TestIO::testOpenFromFilename \
+ --deselect tests/AlignmentFile_test.py::TestIO::testSAM2BAM \
+ --deselect tests/AlignmentFile_test.py::TestIO::testWriteUncompressedBAMFile \
+ --deselect tests/AlignmentFile_test.py::TestIteratorRowAllBAM::testIterate \
--deselect tests/StreamFiledescriptors_test.py::StreamTest::test_text_processing \
+ --deselect tests/compile_test.py::BAMTest::testCount \
tests/
'';
From ffde641ac935580f504e1d163a32b769deee7927 Mon Sep 17 00:00:00 2001
From: Matthew Kenigsberg <matthewkenigsberg@gmail.com>
Date: Thu, 29 Oct 2020 17:58:40 -0500
Subject: [PATCH 501/590] alibuild: use python3
Helps #101964
---
pkgs/top-level/all-packages.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff3444cd47b0..4f5c62ac0bd5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28271,7 +28271,7 @@ in
undervolt = callPackage ../os-specific/linux/undervolt { };
alibuild = callPackage ../development/tools/build-managers/alibuild {
- python = python27;
+ python = python3;
};
tsung = callPackage ../applications/networking/tsung {};
From a86b58192b6361f7098cdf71bd828928c9fde0aa Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Fri, 30 Oct 2020 09:59:23 +0900
Subject: [PATCH 502/590] spago: 0.16.0 -> 0.17.0
---
.../tools/purescript/spago/spago.nix | 20 +++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix
index b36bc26433d3..4a5ad361e9fd 100644
--- a/pkgs/development/tools/purescript/spago/spago.nix
+++ b/pkgs/development/tools/purescript/spago/spago.nix
@@ -2,20 +2,20 @@
, base, bower-json, bytestring, Cabal, containers, dhall, directory
, either, exceptions, extra, fetchgit, file-embed, filepath, foldl
, fsnotify, github, Glob, hpack, hspec, hspec-discover
-, hspec-megaparsec, http-client, http-conduit, lens-family-core
-, megaparsec, mtl, network-uri, open-browser, optparse-applicative
-, prettyprinter, process, QuickCheck, retry, rio, rio-orphans, safe
-, semver-range, stdenv, stm, tar, template-haskell, temporary, text
-, time, transformers, turtle, unliftio, unordered-containers
-, vector, versions, with-utf8, zlib
+, hspec-megaparsec, http-client, http-conduit, http-types
+, lens-family-core, megaparsec, mtl, network-uri, open-browser
+, optparse-applicative, prettyprinter, process, QuickCheck, retry
+, rio, rio-orphans, safe, semver-range, stdenv, stm, tar
+, template-haskell, temporary, text, time, transformers, turtle
+, unliftio, unordered-containers, vector, versions, with-utf8, zlib
}:
mkDerivation {
pname = "spago";
- version = "0.16.0";
+ version = "0.17.0";
src = fetchgit {
url = "https://github.com/purescript/spago.git";
- sha256 = "0z4s0z14n1v9wajs7mj2b295rrrw24gdca79drzlv6x1y6dj7sxh";
- rev = "71b093cdf5e48ded645303281ab4a3ea5b730f5d";
+ sha256 = "1w9y1gvk307f92gixs5g02zbg0xwhrshwmc5j97pxhbzzg9qjidy";
+ rev = "3309afdef25e3e77f991a079eed78ff2f750e463";
fetchSubmodules = true;
};
isLibrary = true;
@@ -24,7 +24,7 @@ mkDerivation {
aeson aeson-pretty ansi-terminal async-pool base bower-json
bytestring Cabal containers dhall directory either exceptions
file-embed filepath foldl fsnotify github Glob http-client
- http-conduit lens-family-core megaparsec mtl network-uri
+ http-conduit http-types lens-family-core megaparsec mtl network-uri
open-browser optparse-applicative prettyprinter process retry rio
rio-orphans safe semver-range stm tar template-haskell temporary
text time transformers turtle unliftio unordered-containers vector
From b62111d73a55efffa648f1c30ff1984e6b0839c0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 30 Oct 2020 01:03:01 +0000
Subject: [PATCH 503/590] cargo-audit: 0.12.1 -> 0.13.1
---
pkgs/tools/package-management/cargo-audit/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/tools/package-management/cargo-audit/default.nix
index 8fd5c38ed55a..df492863a142 100644
--- a/pkgs/tools/package-management/cargo-audit/default.nix
+++ b/pkgs/tools/package-management/cargo-audit/default.nix
@@ -1,16 +1,16 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "cargo-audit";
- version = "0.12.1";
+ version = "0.13.1";
src = fetchFromGitHub {
owner = "RustSec";
repo = "cargo-audit";
rev = "v${version}";
- sha256 = "1rhwr2wp4rl2acx4is8aajxd12haph2mdarr8qiwaimsawndaxrw";
+ sha256 = "1q8i2c3f8ir1pxkvla4dshz7n0cl97mjydc64xis5pph39f69yc1";
};
- cargoSha256 = "0m8za771b14vj5w3i906qwhcz43233fjsywlikfl0iv9n5m9k1ab";
+ cargoSha256 = "1b62mcj4gjz2arjf3r30k9qcg81i5x0149a4bfj39xdrz55gg0wh";
buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ];
nativeBuildInputs = [ pkg-config ];
From 0f1a83cf55ebc4109e569095d486ac67aa96c1fb Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Fri, 30 Oct 2020 02:22:09 +0100
Subject: [PATCH 504/590] attica: drop
as far as I can tell, this file is completely unused.
Everything that uses attica uses it from pkgs/development/libraries/kde-frameworks/attica.nix
---
pkgs/development/libraries/attica/default.nix | 20 -------------------
pkgs/top-level/all-packages.nix | 2 --
2 files changed, 22 deletions(-)
delete mode 100644 pkgs/development/libraries/attica/default.nix
diff --git a/pkgs/development/libraries/attica/default.nix b/pkgs/development/libraries/attica/default.nix
deleted file mode 100644
index d883100fd3ce..000000000000
--- a/pkgs/development/libraries/attica/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4 }:
-
-stdenv.mkDerivation rec {
- name = "attica-0.4.2";
-
- src = fetchurl {
- url = "mirror://kde/stable/attica/${name}.tar.bz2";
- sha256 = "1y74gsyzi70dfr9d1f1b08k130rm3jaibsppg8dv5h3211vm771v";
- };
-
- buildInputs = [ qt4 ];
- nativeBuildInputs = [ cmake ];
-
- meta = with stdenv.lib; {
- description = "Library to access Open Collaboration Service providers";
- license = "LGPL";
- maintainers = [ maintainers.sander maintainers.phreedom ];
- inherit (qt4.meta) platforms;
- };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a37fab7ec3db..d051824148c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12072,8 +12072,6 @@ in
aspell = aspell.override { searchNixProfiles = false; };
};
- attica = callPackage ../development/libraries/attica { };
-
attr = callPackage ../development/libraries/attr { };
at-spi2-core = callPackage ../development/libraries/at-spi2-core { };
From 69f235c3aa229ad4e1fa3f7500974caad2a1e982 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 30 Oct 2020 01:22:13 +0000
Subject: [PATCH 505/590] bpytop: 1.0.44 -> 1.0.47
---
pkgs/tools/system/bpytop/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/tools/system/bpytop/default.nix
index 8788080e998a..e395b3c5d611 100644
--- a/pkgs/tools/system/bpytop/default.nix
+++ b/pkgs/tools/system/bpytop/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bpytop";
- version = "1.0.44";
+ version = "1.0.47";
src = fetchFromGitHub {
owner = "aristocratos";
repo = pname;
rev = "v${version}";
- sha256 = "1fb7n0p364sj8pzsg35lrgl5wga3v4d0b4nynkfs5g8rfnmb0rr0";
+ sha256 = "1zsxqnisb9zyji6xwl4b7r722mr0g4hs3a74xsfghd5kafvgzj24";
};
buildInputs = [ makeWrapper ];
From 43662810755ce7814c5398ee6551ea337cb40403 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Thu, 29 Oct 2020 20:22:29 -0400
Subject: [PATCH 506/590] writers.writeNginxConfig: fix cross-compilation
Native versions of awk, sed and gixy need to be used.
---
pkgs/build-support/writers/default.nix | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix
index 495a56b41974..9c709921d210 100644
--- a/pkgs/build-support/writers/default.nix
+++ b/pkgs/build-support/writers/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib }:
+{ pkgs, lib, gawk, gnused, gixy }:
with lib;
rec {
@@ -219,10 +219,11 @@ rec {
writeNginxConfig = name: text: pkgs.runCommandLocal name {
inherit text;
passAsFile = [ "text" ];
+ nativeBuildInputs = [ gawk gnused gixy ];
} /* sh */ ''
# nginx-config-formatter has an error - https://github.com/1connect/nginx-config-formatter/issues/16
- ${pkgs.gawk}/bin/awk -f ${awkFormatNginx} "$textPath" | ${pkgs.gnused}/bin/sed '/^\s*$/d' > $out
- ${pkgs.gixy}/bin/gixy $out
+ awk -f ${awkFormatNginx} "$textPath" | sed '/^\s*$/d' > $out
+ gixy $out
'';
# writePerl takes a name an attributeset with libraries and some perl sourcecode and
From c0bcfebaef6a3ad8517bf09d6e65a3ec81c90a18 Mon Sep 17 00:00:00 2001
From: Sebastien Braun <sebastien@sebbraun.de>
Date: Thu, 29 Oct 2020 11:44:56 +0100
Subject: [PATCH 507/590] rmlint: Use Python3 sphinx for docs
Eliminates a python2 dependency.
---
pkgs/top-level/all-packages.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f5c62ac0bd5..261b78f38325 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6824,7 +6824,7 @@ in
rkrlv2 = callPackage ../applications/audio/rkrlv2 {};
rmlint = callPackage ../tools/misc/rmlint {
- inherit (pythonPackages) sphinx;
+ inherit (python3Packages) sphinx;
};
rng-tools = callPackage ../tools/security/rng-tools { };
From aa98d660e7c5d6f73b9b5af7d75cd17456b4b59b Mon Sep 17 00:00:00 2001
From: Finn Behrens <me@kloenk.de>
Date: Thu, 29 Oct 2020 20:45:58 +0100
Subject: [PATCH 508/590] openbgpd: 6.7p0 -> 6.8p0
---
pkgs/servers/openbgpd/default.nix | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/pkgs/servers/openbgpd/default.nix b/pkgs/servers/openbgpd/default.nix
index 7ca71c127754..02c1c607eab8 100644
--- a/pkgs/servers/openbgpd/default.nix
+++ b/pkgs/servers/openbgpd/default.nix
@@ -1,27 +1,27 @@
-{ stdenv, fetchFromGitHub, autoconf, automake
-, libtool, m4, yacc }:
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, m4, yacc }:
let
- openbsd_version = "OPENBSD_6_7"; # This has to be equal to ${src}/OPENBSD_BRANCH
+ openbsd_version =
+ "OPENBSD_6_8"; # This has to be equal to ${src}/OPENBSD_BRANCH
openbsd = fetchFromGitHub {
+ name = "portable";
owner = "openbgpd-portable";
repo = "openbgpd-openbsd";
rev = openbsd_version;
- sha256 = "sha256-YJTHUsn6s4xLcLQuxCLmEkIE8ozxzooj71cJ5Wl+0lI=";
+ sha256 = "sha256-vCVK5k4g6aW2z2fg7Kv0uvkX7f34aRc8K2myb3jjl6w=";
};
in stdenv.mkDerivation rec {
pname = "opengpd";
- version = "6.7p0";
+ version = "6.8p0";
src = fetchFromGitHub {
owner = "openbgpd-portable";
repo = "openbgpd-portable";
rev = version;
- sha256 = "sha256-10DfK45BsSHeyANB0OJLKog1mEj0mydXSDAT9G6u1gM";
+ sha256 = "sha256-TKs6tt/SCWes6kYAGIrSShZgOLf7xKh26xG3Zk7wCCw=";
};
- nativeBuildInputs =
- [ autoconf automake libtool m4 yacc ];
+ nativeBuildInputs = [ autoconf automake libtool m4 yacc ];
preConfigure = ''
mkdir ./openbsd
@@ -36,7 +36,8 @@ in stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "A free implementation of the Border Gateway Protocol, Version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol";
+ description =
+ "A free implementation of the Border Gateway Protocol, Version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol";
license = licenses.isc;
homepage = "http://www.openbgpd.org/";
maintainers = with maintainers; [ kloenk ];
From 89b4c4597643bc8b44085c4014a3996a20af38f5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 30 Oct 2020 02:09:54 +0000
Subject: [PATCH 509/590] broot: 1.0.3 -> 1.0.4
---
pkgs/tools/misc/broot/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix
index 3027537dd873..077d5dc777c1 100644
--- a/pkgs/tools/misc/broot/default.nix
+++ b/pkgs/tools/misc/broot/default.nix
@@ -11,14 +11,14 @@
rustPlatform.buildRustPackage rec {
pname = "broot";
- version = "1.0.3";
+ version = "1.0.4";
src = fetchCrate {
inherit pname version;
- sha256 = "046yg270hnwzhap2rraihywpqjq5s3qxmyfcvfgfayz25216jmvc";
+ sha256 = "06gq7xn9g5wk6d5p732998q7lxbw2g6qb8vsv95jcnybarf88n1v";
};
- cargoSha256 = "02l6cdfx2sglygsdgnm474vmpbmpm2a1s6srd9cy66k6hjm1m0bn";
+ cargoSha256 = "1cbvi3jgj78gly3xkqbn8ai0ra5hpdphpdy7cphlrym0aj77ck4a";
nativeBuildInputs = [
makeWrapper
From 4506d174c68a0f3d6d4ad009b21d202b5fe52f32 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Thu, 29 Oct 2020 07:04:23 -0400
Subject: [PATCH 510/590] zenith: 0.10.1 -> 0.11.0
---
pkgs/tools/system/zenith/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/system/zenith/default.nix b/pkgs/tools/system/zenith/default.nix
index 084dd044feba..35498c4cb563 100644
--- a/pkgs/tools/system/zenith/default.nix
+++ b/pkgs/tools/system/zenith/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "zenith";
- version = "0.10.1";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "bvaisvil";
repo = pname;
rev = version;
- sha256 = "0jz0pjibjiyg0rjmpihxxjhg9cbccvqfr5si5rji585l0zrpdwsg";
+ sha256 = "1cxmgpq07q6vfasnkx3grpx1y0f0dg6irb9kdn17nwrypy44l92d";
};
- cargoSha256 = "1zkx6sr5xlj7pb91bxvqjib5awscy1rmv4g89xb76dahac8fan6z";
+ cargoSha256 = "1kgjj11fwvlk700yp9046b3kiq9ay47fiwqpqfhmlbxw3lsh8qvq";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
From 57ea265674f8e23ede036bd72cf437da7e110c4d Mon Sep 17 00:00:00 2001
From: "S. Nordin Abouzahra" <abouzahra.9@wright.edu>
Date: Wed, 21 Oct 2020 21:47:30 -0400
Subject: [PATCH 511/590] firefox: place alsaLib in lib search patch
libcubeb has dlopened libraries for awhile now. In nixpkgs there was
support for the PulseAudio backend doing this, however the ALSA backend
support was missed and caused issue #79310 (no sound with ALSA). This
gives ALSA users the ability to hear sound once again.
---
pkgs/applications/networking/browsers/firefox/common.nix | 1 +
pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index c787fb5754d5..03cf35e1a6be 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -333,6 +333,7 @@ buildStdenv.mkDerivation ({
version = ffversion;
isFirefox3Like = true;
gtk = gtk2;
+ inherit alsaSupport;
inherit nspr;
inherit ffmpegSupport;
inherit gssSupport;
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 424c45d305e8..9c8625495b20 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -2,7 +2,7 @@
## various stuff that can be plugged in
, flashplayer, hal-flash
-, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd
+, ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd
, gnome3/*.gnome-shell*/
, browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow
, tridactyl-native
@@ -39,6 +39,7 @@ let
enableAdobeFlash = cfg.enableAdobeFlash or false;
ffmpegSupport = browser.ffmpegSupport or false;
gssSupport = browser.gssSupport or false;
+ alsaSupport = browser.alsaSupport or false;
plugins =
let
@@ -76,6 +77,7 @@ let
(with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ])
++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash
++ lib.optional (config.pulseaudio or true) libpulseaudio
+ ++ lib.optional alsaSupport alsaLib
++ pkcs11Modules;
gtk_modules = [ libcanberra-gtk2 ];
From 5a2d63f5e2742b9013f2fb18293ef7a074a186ae Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 30 Oct 2020 04:20:00 +0000
Subject: [PATCH 512/590] tmux: update completions
---
pkgs/tools/misc/tmux/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index 12ea456b9f7e..29c659ff8190 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -13,8 +13,8 @@ let
bashCompletion = fetchFromGitHub {
owner = "imomaliev";
repo = "tmux-bash-completion";
- rev = "fcda450d452f07d36d2f9f27e7e863ba5241200d";
- sha256 = "092jpkhggjqspmknw7h3icm0154rg21mkhbc71j5bxfmfjdxmya8";
+ rev = "f5d53239f7658f8e8fbaf02535cc369009c436d6";
+ sha256 = "0sq2g3w0h3mkfa6qwqdw93chb5f1hgkz5vdl8yw8mxwdqwhsdprr";
};
in
From fcc6849bcd58073b365848031335abf58c7331cd Mon Sep 17 00:00:00 2001
From: Alex Whitt <alex.joseph.whitt@gmail.com>
Date: Mon, 31 Aug 2020 16:52:41 -0400
Subject: [PATCH 513/590] bacnet-stack: init at 1.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Update pkgs/tools/networking/bacnet-stack/default.nix
Co-authored-by: Daniel Løvbrøtte Olsen <daniel.olsen99+GitHub@gmail.com>
bacnet-stack: Add maintainer and use the original GitHub repo
bacnet-stack: Alphabetize
Update pkgs/top-level/all-packages.nix
Co-authored-by: Jon <jonringer@users.noreply.github.com>
---
.../tools/networking/bacnet-stack/default.nix | 31 +++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 ++
2 files changed, 33 insertions(+)
create mode 100644 pkgs/tools/networking/bacnet-stack/default.nix
diff --git a/pkgs/tools/networking/bacnet-stack/default.nix b/pkgs/tools/networking/bacnet-stack/default.nix
new file mode 100644
index 000000000000..596b30d03e89
--- /dev/null
+++ b/pkgs/tools/networking/bacnet-stack/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ name = "bacnet-stack";
+ version = "1.0.0";
+
+ src = fetchFromGitHub {
+ owner = "bacnet-stack";
+ repo = "bacnet-stack";
+ rev = "bacnet-stack-${version}";
+ sha256 = "078p7qsy9v6fl7pzwgcr72pgjqxfxmfxyqajih2zqlb5g5sf88vh";
+ };
+
+ hardeningDisable = [ "all" ];
+
+ buildPhase = ''
+ make BUILD=debug BACNET_PORT=linux BACDL_DEFINE=-DBACDL_BIP=1 BACNET_DEFINES=" -DPRINT_ENABLED=1 -DBACFILE -DBACAPP_ALL -DBACNET_PROPERTY_LISTS"
+ '';
+
+ installPhase = ''
+ mkdir $out
+ cp -r bin $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "BACnet open source protocol stack for embedded systems, Linux, and Windows";
+ platforms = platforms.linux;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ WhittlesJr ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e85382c7891b..2d0fc9f2aa6e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -144,6 +144,8 @@ in
avro-tools = callPackage ../development/tools/avro-tools { };
+ bacnet-stack = callPackage ../tools/networking/bacnet-stack {};
+
# Zip file format only allows times after year 1980, which makes e.g. Python wheel building fail with:
# ValueError: ZIP does not support timestamps before 1980
ensureNewerSourcesForZipFilesHook = ensureNewerSourcesHook { year = "1980"; };
From 3e4878370e8b24015d08ee2101993b49301ca151 Mon Sep 17 00:00:00 2001
From: Alex Eyre <hi@alexey.re>
Date: Fri, 30 Oct 2020 07:45:03 +0000
Subject: [PATCH 514/590] python-modules/coordinates: remove mildlyincompetent
from the maintainers list
also removed from maintainers-list.nix, motivation for change is
that he was a friend, and he unfortunately passed away earlier this year.
---
maintainers/maintainer-list.nix | 6 ------
pkgs/development/python-modules/coordinates/default.nix | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4b77ffca8846..d81993d59669 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5689,12 +5689,6 @@
githubId = 1387206;
name = "Mike Sperber";
};
- mildlyincompetent = {
- email = "nix@kch.dev";
- github = "mildlyincompetent";
- githubId = 19479662;
- name = "Kajetan Champlewski";
- };
millerjason = {
email = "mailings-github@millerjason.com";
github = "millerjason";
diff --git a/pkgs/development/python-modules/coordinates/default.nix b/pkgs/development/python-modules/coordinates/default.nix
index 44a41b92c4e5..c7a24a0c3e90 100644
--- a/pkgs/development/python-modules/coordinates/default.nix
+++ b/pkgs/development/python-modules/coordinates/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
description = "Convenience class for doing maths with explicit coordinates";
homepage = "https://github.com/clbarnes/coordinates";
license = licenses.mit;
- maintainers = [ maintainers.mildlyincompetent ];
+ maintainers = [ ];
};
}
From 7f8f1fc1823ad7c01d5925426030104a7058864f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 23 Oct 2020 21:22:34 +0200
Subject: [PATCH 515/590] ocamlPackages.re: use released source rather than a
git snapshot
This fixes the version information in the META file
---
pkgs/development/ocaml-modules/re/default.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix
index 8881821490ab..ca3cf1e82675 100644
--- a/pkgs/development/ocaml-modules/re/default.nix
+++ b/pkgs/development/ocaml-modules/re/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchzip, buildDunePackage, ocaml, ounit, seq }:
+{ lib, fetchurl, buildDunePackage, ocaml, ounit, seq }:
buildDunePackage rec {
pname = "re";
@@ -6,9 +6,9 @@ buildDunePackage rec {
minimumOCamlVersion = "4.02";
- src = fetchzip {
- url = "https://github.com/ocaml/ocaml-re/archive/${version}.tar.gz";
- sha256 = "07ycb103mr4mrkxfd63cwlsn023xvcjp0ra0k7n2gwrg0mwxmfss";
+ src = fetchurl {
+ url = "https://github.com/ocaml/ocaml-re/releases/download/${version}/re-${version}.tbz";
+ sha256 = "1gas4ky49zgxph3870nffzkr6y41kkpqp4nj38pz1gh49zcf12aj";
};
buildInputs = lib.optional doCheck ounit;
From 557094a10c5f570631e1f91f92078f1d7e0f107a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 23 Oct 2020 21:23:38 +0200
Subject: [PATCH 516/590] =?UTF-8?q?ocamlPackages.ocp-build:=201.99.19-beta?=
=?UTF-8?q?=20=E2=86=92=201.99.21-beta?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../tools/ocaml/ocp-build/default.nix | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix
index 4ebea6766211..57db51612245 100644
--- a/pkgs/development/tools/ocaml/ocp-build/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-build/default.nix
@@ -1,24 +1,19 @@
-{ stdenv, fetchpatch, fetchFromGitHub, ocaml, findlib, ncurses }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses, cmdliner, re }:
let
- version = "1.99.19-beta";
+ version = "1.99.21";
in
stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-ocp-build-${version}";
+ name = "ocaml${ocaml.version}-ocp-build-${version}-beta";
src = fetchFromGitHub {
owner = "OCamlPro";
repo = "ocp-build";
- rev = version;
- sha256 = "162k5l0cxyqanxlml5v8mqapdq5qbqc9m4b8wdjq7mf523b3h2zj";
+ rev = "v${version}";
+ sha256 = "1641xzik98c7xnjwxpacijd6d9jzx340fmdn6i372z8h554jjlg9";
};
- patches = stdenv.lib.optional (stdenv.lib.versionAtLeast ocaml.version "4.08") (fetchpatch {
- url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocp-pp/ocp-pp.1.99.19-beta/files/0001-Fix-ocp-pp-for-changes-in-compiler-libs.patch";
- sha256 = "0s0s2hh4d7cmwd6i7ixjgb79vij0r1v54m0vwwi26b3fips09qyn";
- });
-
- buildInputs = [ ocaml findlib ];
+ buildInputs = [ ocaml findlib cmdliner re ];
propagatedBuildInputs = [ ncurses ];
preInstall = "mkdir -p $out/bin";
preConfigure = ''
From 525e15efaec83aa7cbb8a9c27b01e029b87cb2dd Mon Sep 17 00:00:00 2001
From: Ash <ext0l@riseup.net>
Date: Fri, 30 Oct 2020 05:04:28 -0700
Subject: [PATCH 517/590] gajim: strictDeps = false (#102141)
* gajim: strictDeps = false
Without this it doesn't find GSettings schemas, which causes it to crash when (for example) you try to change your avatar.
---
.../networking/instant-messengers/gajim/default.nix | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 2ee017dfdbaf..eef24f75f155 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -60,6 +60,9 @@ python3.pkgs.buildPythonApplication rec {
${python3.interpreter} setup.py test
'';
+ # necessary for wrapGAppsHook
+ strictDeps = false;
+
meta = {
homepage = "http://gajim.org/";
description = "Jabber client written in PyGTK";
From 879dc6a6bcc71394ea5725f82b6c978539739324 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 30 Oct 2020 07:16:00 -0500
Subject: [PATCH 518/590] tmux: 3.1b -> 3.1c
---
pkgs/tools/misc/tmux/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index 29c659ff8190..7fa33ed82f21 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -21,7 +21,7 @@ in
stdenv.mkDerivation rec {
pname = "tmux";
- version = "3.1b";
+ version = "3.1c";
outputs = [ "out" "man" ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
owner = "tmux";
repo = "tmux";
rev = version;
- sha256 = "0jvyq4r691bn0wsr8i6c0q0lzss25vm9nx8sv3fhw9cs63ncq04y";
+ sha256 = "1fqgpzfas85dn0sxlvvg6rj488jwgnxs8d3gqcm8lgs211m9qhcf";
};
nativeBuildInputs = [
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- homepage = "http://tmux.github.io/";
+ homepage = "https://tmux.github.io/";
description = "Terminal multiplexer";
longDescription =
From bee3fb885fa3476fc6cd5274b1600f80bc278e51 Mon Sep 17 00:00:00 2001
From: Eric Dallo <ericdallo06@hotmail.com>
Date: Tue, 6 Oct 2020 23:54:12 -0300
Subject: [PATCH 519/590] flutter: Add dart cache to flutter
---
.../development/compilers/flutter/default.nix | 28 +++++++++------
.../development/compilers/flutter/flutter.nix | 11 ++++--
.../{beta => dev}/disable-auto-update.patch | 8 ++---
.../patches/{beta => dev}/move-cache.patch | 34 +++++++++----------
.../patches/stable/disable-auto-update.patch | 28 +++++++--------
.../flutter/patches/stable/move-cache.patch | 16 ++++-----
.../development/interpreters/dart/default.nix | 8 +++++
pkgs/top-level/all-packages.nix | 2 ++
8 files changed, 78 insertions(+), 57 deletions(-)
rename pkgs/development/compilers/flutter/patches/{beta => dev}/disable-auto-update.patch (88%)
rename pkgs/development/compilers/flutter/patches/{beta => dev}/move-cache.patch (63%)
diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
index 9b9d1f7481d1..baab0583fb0c 100644
--- a/pkgs/development/compilers/flutter/default.nix
+++ b/pkgs/development/compilers/flutter/default.nix
@@ -1,6 +1,9 @@
-{ callPackage }:
+{ callPackage, dart }:
let
+ dart_stable = dart.override { version = "2.10.0"; };
+ dart_beta = dart.override { version = "2.10.0"; };
+ dart_dev = dart.override { version = "2.11.0-161.0.dev"; };
mkFlutter = opts: callPackage (import ./flutter.nix opts) { };
getPatches = dir:
let files = builtins.attrNames (builtins.readDir dir);
@@ -10,25 +13,28 @@ in {
stable = mkFlutter rec {
pname = "flutter";
channel = "stable";
- version = "1.17.5";
+ version = "1.22.0";
filename = "flutter_linux_${version}-${channel}.tar.xz";
- sha256Hash = "0kapja3nh7dfhjbn2np02wghijrjnpzsv4hz10fj54hs8hdx19di";
+ sha256Hash = "0ryrx458ss8ryhmspcfrhjvad2pl46bxh1qk5vzwzhxiqdc79vm8";
patches = getPatches ./patches/stable;
+ dart = dart_stable;
};
beta = mkFlutter rec {
- pname = "flutter-beta";
+ pname = "flutter";
channel = "beta";
- version = "1.20.0-7.2.pre";
+ version = "1.22.0-12.3.pre";
filename = "flutter_linux_${version}-${channel}.tar.xz";
- sha256Hash = "0w89ig5vi4spa95mf08r4vvwni7bzzdlyhvr9sy1a35qmf7j9s6f";
- patches = getPatches ./patches/beta;
+ sha256Hash = "1axzz137z4lgpa09h7bjf52i6dij6a9wmjbha1182db23r09plzh";
+ patches = getPatches ./patches/stable;
+ dart = dart_beta;
};
dev = mkFlutter rec {
- pname = "flutter-dev";
+ pname = "flutter";
channel = "dev";
- version = "1.21.0-1.0.pre";
+ version = "1.23.0-7.0.pre";
filename = "flutter_linux_${version}-${channel}.tar.xz";
- sha256Hash = "14rx89jp6ivk3ai7iwbznkr5q445ndh8fppzbxg520kq10s2208r";
- patches = getPatches ./patches/beta;
+ sha256Hash = "166qb4qbv051bc71yj7c0vrkamhvzz3fp3mz318qzm947mydwjj5";
+ patches = getPatches ./patches/dev;
+ dart = dart_dev;
};
}
diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix
index fad2a646a165..20146541ed33 100644
--- a/pkgs/development/compilers/flutter/flutter.nix
+++ b/pkgs/development/compilers/flutter/flutter.nix
@@ -1,5 +1,5 @@
-{ channel, pname, version, sha256Hash, patches
-, filename ? "flutter_linux_v${version}-${channel}.tar.xz" }:
+{ channel, pname, version, sha256Hash, patches, dart
+, filename ? "flutter_linux_${version}-${channel}.tar.xz"}:
{ bash, buildFHSUserEnv, cacert, coreutils, git, makeWrapper, runCommand, stdenv
, fetchurl, alsaLib, dbus, expat, libpulseaudio, libuuid, libX11, libxcb
@@ -72,6 +72,7 @@ let
with pkgs; [
bash
curl
+ dart
git
unzip
which
@@ -119,11 +120,15 @@ in runCommand drvName {
homepage = "https://flutter.dev";
license = licenses.bsd3;
platforms = [ "x86_64-linux" ];
- maintainers = with maintainers; [ babariviere ];
+ maintainers = with maintainers; [ babariviere ericdallo ];
};
} ''
mkdir -p $out/bin
echo -n "$startScript" > $out/bin/${pname}
chmod +x $out/bin/${pname}
+
+ mkdir -p $out/bin/cache/dart-sdk/
+ cp -r ${dart}/* $out/bin/cache/dart-sdk/
+ ln $out/bin/cache/dart-sdk/bin/dart $out/bin/dart
''
diff --git a/pkgs/development/compilers/flutter/patches/beta/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch
similarity index 88%
rename from pkgs/development/compilers/flutter/patches/beta/disable-auto-update.patch
rename to pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch
index cd01577cc10f..f9ac00d1d323 100644
--- a/pkgs/development/compilers/flutter/patches/beta/disable-auto-update.patch
+++ b/pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch
@@ -1,8 +1,8 @@
diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh
-index 702bd9ed5..4d4dc94c6 100755
+index 22efe87443..c6954575c5 100644
--- a/bin/internal/shared.sh
+++ b/bin/internal/shared.sh
-@@ -204,8 +204,6 @@ function shared::execute() {
+@@ -212,8 +212,6 @@ function shared::execute() {
# FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS"
# FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432"
@@ -12,10 +12,10 @@ index 702bd9ed5..4d4dc94c6 100755
case "$BIN_NAME" in
flutter*)
diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-index 21be933e1..2ea73c4c0 100644
+index fb1616ba96..b973b3fd58 100644
--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-@@ -294,13 +294,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
+@@ -291,13 +291,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
globals.flutterUsage.suppressAnalytics = true;
}
diff --git a/pkgs/development/compilers/flutter/patches/beta/move-cache.patch b/pkgs/development/compilers/flutter/patches/dev/move-cache.patch
similarity index 63%
rename from pkgs/development/compilers/flutter/patches/beta/move-cache.patch
rename to pkgs/development/compilers/flutter/patches/dev/move-cache.patch
index 64950d4476ef..eb6ff5cf582e 100644
--- a/pkgs/development/compilers/flutter/patches/beta/move-cache.patch
+++ b/pkgs/development/compilers/flutter/patches/dev/move-cache.patch
@@ -1,21 +1,21 @@
diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart
-index 8e511eefd..fef3cca8b 100644
+index a059a8e992..b664a7070c 100644
--- a/dev/devicelab/lib/framework/runner.dart
+++ b/dev/devicelab/lib/framework/runner.dart
-@@ -126,7 +126,7 @@ Future<void> cleanupSystem() async {
- print('\nTelling Gradle to shut down (JAVA_HOME=$javaHome)');
- final String gradlewBinaryName = Platform.isWindows ? 'gradlew.bat' : 'gradlew';
- final Directory tempDir = Directory.systemTemp.createTempSync('flutter_devicelab_shutdown_gradle.');
-- recursiveCopy(Directory(path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'gradle_wrapper')), tempDir);
-+ recursiveCopy(Directory(path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'gradle_wrapper')), tempDir);
- copy(File(path.join(path.join(flutterDirectory.path, 'packages', 'flutter_tools'), 'templates', 'app', 'android.tmpl', 'gradle', 'wrapper', 'gradle-wrapper.properties')), Directory(path.join(tempDir.path, 'gradle', 'wrapper')));
- if (!Platform.isWindows) {
- await exec(
+@@ -137,7 +137,7 @@ Future<void> cleanupSystem() async {
+ print('\nTelling Gradle to shut down (JAVA_HOME=$javaHome)');
+ final String gradlewBinaryName = Platform.isWindows ? 'gradlew.bat' : 'gradlew';
+ final Directory tempDir = Directory.systemTemp.createTempSync('flutter_devicelab_shutdown_gradle.');
+- recursiveCopy(Directory(path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'gradle_wrapper')), tempDir);
++ recursiveCopy(Directory(path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'gradle_wrapper')), tempDir);
+ copy(File(path.join(path.join(flutterDirectory.path, 'packages', 'flutter_tools'), 'templates', 'app', 'android.tmpl', 'gradle', 'wrapper', 'gradle-wrapper.properties')), Directory(path.join(tempDir.path, 'gradle', 'wrapper')));
+ if (!Platform.isWindows) {
+ await exec(
diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart
-index c680de599..480abfb77 100644
+index 36714c5fb4..c0cc049ee1 100644
--- a/packages/flutter_tools/lib/src/asset.dart
+++ b/packages/flutter_tools/lib/src/asset.dart
-@@ -8,6 +8,7 @@ import 'package:meta/meta.dart';
+@@ -6,6 +6,7 @@ import 'package:meta/meta.dart';
import 'package:package_config/package_config.dart';
import 'package:yaml/yaml.dart';
@@ -23,20 +23,20 @@ index c680de599..480abfb77 100644
import 'base/context.dart';
import 'base/file_system.dart';
import 'base/utils.dart';
-@@ -392,7 +393,7 @@ List<_Asset> _getMaterialAssets(String fontSet) {
+@@ -397,7 +398,7 @@ List<_Asset> _getMaterialAssets(String fontSet) {
for (final Map<dynamic, dynamic> font in (family['fonts'] as List<dynamic>).cast<Map<dynamic, dynamic>>()) {
final Uri entryUri = globals.fs.path.toUri(font['asset'] as String);
result.add(_Asset(
- baseDir: globals.fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'),
-+ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'),
++ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'),
relativeUri: Uri(path: entryUri.pathSegments.last),
entryUri: entryUri,
package: null,
diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
-index c0946782c..bdbc35cb8 100644
+index aaca036d78..43ff428f8d 100644
--- a/packages/flutter_tools/lib/src/cache.dart
+++ b/packages/flutter_tools/lib/src/cache.dart
-@@ -202,8 +202,15 @@ class Cache {
+@@ -226,8 +226,15 @@ class Cache {
return;
}
assert(_lock == null);
@@ -53,7 +53,7 @@ index c0946782c..bdbc35cb8 100644
try {
_lock = lockFile.openSync(mode: FileMode.write);
} on FileSystemException catch (e) {
-@@ -306,7 +313,7 @@ class Cache {
+@@ -330,7 +337,7 @@ class Cache {
if (_rootOverride != null) {
return _fileSystem.directory(_fileSystem.path.join(_rootOverride.path, 'bin', 'cache'));
} else {
diff --git a/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch
index c77357ea13c5..35ce5b367350 100644
--- a/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch
+++ b/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch
@@ -1,24 +1,24 @@
-diff --git a/bin/flutter b/bin/flutter
-index cdf974233..1f7de1c1b 100755
---- a/bin/flutter
-+++ b/bin/flutter
-@@ -185,8 +185,6 @@ fi
- # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS"
- # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432"
+diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh
+index 8d613de739..a673466726 100644
+--- a/bin/internal/shared.sh
++++ b/bin/internal/shared.sh
+@@ -204,8 +204,6 @@ function shared::execute() {
+ # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS"
+ # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432"
--(upgrade_flutter) 3< "$PROG_NAME"
+- upgrade_flutter 7< "$PROG_NAME"
-
- # FLUTTER_TOOL_ARGS isn't quoted below, because it is meant to be considered as
- # separate space-separated args.
- "$DART" --packages="$FLUTTER_TOOLS_DIR/.packages" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" "$@"
+ BIN_NAME="$(basename "$PROG_NAME")"
+ case "$BIN_NAME" in
+ flutter*)
diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-index b3e69714f..a9eb76234 100644
+index 8a1a1e29da..778f253358 100644
--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-@@ -301,13 +301,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
+@@ -293,13 +293,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
+ globals.flutterUsage.suppressAnalytics = true;
}
- _checkFlutterCopy();
- try {
- await globals.flutterVersion.ensureVersionFile();
- } on FileSystemException catch (e) {
diff --git a/pkgs/development/compilers/flutter/patches/stable/move-cache.patch b/pkgs/development/compilers/flutter/patches/stable/move-cache.patch
index 64950d4476ef..dc77496edb31 100644
--- a/pkgs/development/compilers/flutter/patches/stable/move-cache.patch
+++ b/pkgs/development/compilers/flutter/patches/stable/move-cache.patch
@@ -1,8 +1,8 @@
diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart
-index 8e511eefd..fef3cca8b 100644
+index d045c83f04..d51973020b 100644
--- a/dev/devicelab/lib/framework/runner.dart
+++ b/dev/devicelab/lib/framework/runner.dart
-@@ -126,7 +126,7 @@ Future<void> cleanupSystem() async {
+@@ -136,7 +136,7 @@ Future<void> cleanupSystem() async {
print('\nTelling Gradle to shut down (JAVA_HOME=$javaHome)');
final String gradlewBinaryName = Platform.isWindows ? 'gradlew.bat' : 'gradlew';
final Directory tempDir = Directory.systemTemp.createTempSync('flutter_devicelab_shutdown_gradle.');
@@ -12,7 +12,7 @@ index 8e511eefd..fef3cca8b 100644
if (!Platform.isWindows) {
await exec(
diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart
-index c680de599..480abfb77 100644
+index 8da01315ae..bb8d61d7f2 100644
--- a/packages/flutter_tools/lib/src/asset.dart
+++ b/packages/flutter_tools/lib/src/asset.dart
@@ -8,6 +8,7 @@ import 'package:meta/meta.dart';
@@ -23,20 +23,20 @@ index c680de599..480abfb77 100644
import 'base/context.dart';
import 'base/file_system.dart';
import 'base/utils.dart';
-@@ -392,7 +393,7 @@ List<_Asset> _getMaterialAssets(String fontSet) {
+@@ -399,7 +400,7 @@ List<_Asset> _getMaterialAssets(String fontSet) {
for (final Map<dynamic, dynamic> font in (family['fonts'] as List<dynamic>).cast<Map<dynamic, dynamic>>()) {
final Uri entryUri = globals.fs.path.toUri(font['asset'] as String);
result.add(_Asset(
- baseDir: globals.fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'),
-+ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'),
++ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'),
relativeUri: Uri(path: entryUri.pathSegments.last),
entryUri: entryUri,
package: null,
diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
-index c0946782c..bdbc35cb8 100644
+index a35d8f87d0..a40027dc74 100644
--- a/packages/flutter_tools/lib/src/cache.dart
+++ b/packages/flutter_tools/lib/src/cache.dart
-@@ -202,8 +202,15 @@ class Cache {
+@@ -215,8 +215,15 @@ class Cache {
return;
}
assert(_lock == null);
@@ -53,7 +53,7 @@ index c0946782c..bdbc35cb8 100644
try {
_lock = lockFile.openSync(mode: FileMode.write);
} on FileSystemException catch (e) {
-@@ -306,7 +313,7 @@ class Cache {
+@@ -319,7 +326,7 @@ class Cache {
if (_rootOverride != null) {
return _fileSystem.directory(_fileSystem.path.join(_rootOverride.path, 'bin', 'cache'));
} else {
diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix
index 050e7f14979c..7d185edb1d19 100644
--- a/pkgs/development/interpreters/dart/default.nix
+++ b/pkgs/development/interpreters/dart/default.nix
@@ -36,6 +36,10 @@ let
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
sha256 = "1p66fkdh1kv0ypmadmg67c3y3li3aaf1lahqh2g6r6qrzbh5da2p";
};
+ "2.10.0-x86_64-linux" = fetchurl {
+ url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
+ sha256 = "0dncmsfbwcn3ygflhp83i6z4bvc02fbpaq1vzdzw8xdk3sbynchb";
+ };
"2.9.0-4.0.dev-x86_64-linux" = fetchurl {
url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
sha256 = "16d9842fb3qbc0hy0zmimav9zndfkq96glgykj20xssc88qpjk2r";
@@ -48,6 +52,10 @@ let
url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
sha256 = "1x6mlmc4hccmx42k7srhma18faxpxvghjwqahna80508rdpljwgc";
};
+ "2.11.0-161.0.dev-x86_64-linux" = fetchurl {
+ url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
+ sha256 = "05difz4w2fyh2yq5p5pkrqk59jqljlxhc1i6lmy5kihh6z69r12i";
+ };
};
in
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 551df77d2c5d..3ea1826a7331 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8636,6 +8636,8 @@ in
flutterPackages =
recurseIntoAttrs (callPackage ../development/compilers/flutter { });
flutter = flutterPackages.stable;
+ flutter-beta = flutterPackages.beta;
+ flutter-dev = flutterPackages.dev;
fpc = callPackage ../development/compilers/fpc { };
From 33a9c38483db48ba051a55a81b01b318f7afb181 Mon Sep 17 00:00:00 2001
From: Raghav Sood <r@raghavsood.com>
Date: Fri, 30 Oct 2020 21:17:18 +0800
Subject: [PATCH 520/590] ledger-live-desktop: 2.14.0 -> 2.15.0
---
pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
index 3bd379ce27c8..da0449f41d1f 100644
--- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix
+++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
@@ -2,12 +2,12 @@
let
pname = "ledger-live-desktop";
- version = "2.14.0";
+ version = "2.15.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
- sha256 = "057g77nd8qxi8dw9sp7x068wsxmrpnsdfrca876f0bpw7lpb0bqq";
+ sha256 = "06sm4ah05j0f3bxb1sbdi8mazmxk166y2gaycll6p2xhd105ins3";
};
appimageContents = appimageTools.extractType2 {
From 7882c1ae5abb997ee9dee1eb0a5b557e1a117a3b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 30 Oct 2020 09:33:25 -0400
Subject: [PATCH 521/590] linux: 4.19.153 -> 4.19.154
---
pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 23438f7e29c7..7a63297578ba 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.19.153";
+ version = "4.19.154";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "18sxs6vnxkjgyr6sk07bbhfccfm5wfj5pzvf1ciwc3kmsv92h4mj";
+ sha256 = "0ik6anz6ly0dl0lp8m5mighlvzkifnk2kljwajxa56vbhj691339";
};
} // (args.argsOverride or {}))
From 8ed2e118b17cfbffb064f9d5338bcee87a5f53ac Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 30 Oct 2020 09:33:44 -0400
Subject: [PATCH 522/590] linux_latest-libre: 17724 -> 17744
---
pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index 4e308d657ac4..7a831e61ae49 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
- rev = "17724";
- sha256 = "0aqg8il35a1mda4icqprvriham81vvnsa04rjc86b6x7khxdhiq2";
+ rev = "17744";
+ sha256 = "120jf6d1xrpwf8yfqzfqp8a1189lca0si8fxci16sf4bdg5q1had";
}
, ...
}:
From 95b36ade445f38e6f2442773450a702972226000 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 30 Oct 2020 09:34:22 -0400
Subject: [PATCH 523/590] oh-my-zsh: 2020-10-27 -> 2020-10-29
---
pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 0f34b08785d0..e7433e2de0b8 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,15 +4,15 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- version = "2020-10-27";
+ version = "2020-10-29";
pname = "oh-my-zsh";
- rev = "d05544562532fdf4d5f4a4d4eba01f4263e17cc7";
+ rev = "852a44094a3bb4df39f8f778bc7ada2ddda09727";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
- sha256 = "1mzbic14ilka454dyv6ksxpchmswqn7w4d7sa9067ikh1kjb7s86";
+ sha256 = "0021rayw5wiwgjfwy7d6g577xidws58vk7y9xxhidnmk9sr4vri7";
};
installPhase = ''
From bb38f0570dd0def478a475c91948800b24230e4b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 29 Oct 2020 18:35:18 +0100
Subject: [PATCH 524/590] =?UTF-8?q?ocamlPackages.curly:=20unstable-2019-11?=
=?UTF-8?q?-14=20=E2=86=92=200.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ocaml-modules/curly/default.nix | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/pkgs/development/ocaml-modules/curly/default.nix b/pkgs/development/ocaml-modules/curly/default.nix
index a17ea72140ff..236b9c19c928 100644
--- a/pkgs/development/ocaml-modules/curly/default.nix
+++ b/pkgs/development/ocaml-modules/curly/default.nix
@@ -1,25 +1,26 @@
-{ lib, buildDunePackage, fetchFromGitHub, ocaml
+{ stdenv, buildDunePackage, fetchurl, ocaml
, result, alcotest, cohttp-lwt-unix, odoc, curl }:
buildDunePackage rec {
pname = "curly";
- version = "unstable-2019-11-14";
+ version = "0.2.0";
minimumOCamlVersion = "4.02";
useDune2 = true;
- src = fetchFromGitHub {
- owner = "rgrinberg";
- repo = pname;
- rev = "33a538c89ef8279d4591454a7f699a4183dde5d0";
- sha256 = "10pxbvf5xrsajaxrccxh2lqhgp3yaf61z9w03rvb2mq44nc2dggz";
+ src = fetchurl {
+ url = "https://github.com/rgrinberg/curly/releases/download/${version}/curly-${version}.tbz";
+ sha256 = "07vqdrklar0d5i83ip7sjw2c1v18a9m3anw07vmi5ay29pxzal6k";
};
propagatedBuildInputs = [ result ];
checkInputs = [ alcotest cohttp-lwt-unix ];
- # test dependencies are only available for >= 4.05
- doCheck = lib.versionAtLeast ocaml.version "4.05";
+ # test dependencies are only available for >= 4.08
+ doCheck = stdenv.lib.versionAtLeast ocaml.version "4.08"
+ # Some test fails in macOS sandbox
+ # > Fatal error: exception Unix.Unix_error(Unix.EPERM, "bind", "")
+ && !stdenv.isDarwin;
postPatch = ''
substituteInPlace src/curly.ml \
From 207804705d4c51fe68684c97625abe94f7849484 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Fri, 30 Oct 2020 14:53:59 +0100
Subject: [PATCH 525/590] grafana: 7.3.0 -> 7.3.1
https://github.com/grafana/grafana/releases/tag/v7.3.1
---
pkgs/servers/monitoring/grafana/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index fe915e7adc0a..7679cd88649d 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "grafana";
- version = "7.3.0";
+ version = "7.3.1";
excludedPackages = [ "release_publisher" ];
@@ -10,12 +10,12 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
- sha256 = "0sxl06xaz474ir94ng0iak57qpcbh19hs3yjh1g44vf52k5cs70i";
+ sha256 = "02by07d0h07zvws2yj71qa84sgp3x49p5ib0bahh0iyr50xqb3yj";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
- sha256 = "1338x2sj11mzqqpb43dw2lxjpnv9q7zrwksyvj8ghjp4fad4pi9g";
+ sha256 = "0rqipwiz8bsqkhiv30k9jmk5szhabk9rgl37n7y8l0yk2avbq895";
};
vendorSha256 = "0shaxm2y5i29rb0k5bfpcsxbw3ap913l1rb5qbr9hrx7l142dbx8";
From ee36b1cd5b8274ccc9f083ae742dbcbee0af0e45 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Fri, 30 Oct 2020 04:13:22 +0100
Subject: [PATCH 526/590] plover.dev: fix Qt version pinning
Issue report: https://github.com/NixOS/nixpkgs/issues/65399#issuecomment-719066888
Similar issues in #98067.
Plover seems to work fine with Qt > 5.14 so this is an easy way to fix
the problem (as opposed to keeping the pinning and making it work with
PyQt).
---
pkgs/top-level/all-packages.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d0fc9f2aa6e..6c397e9e459a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22934,7 +22934,7 @@ in
plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { };
- plover = recurseIntoAttrs (libsForQt514.callPackage ../applications/misc/plover { });
+ plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { });
plugin-torture = callPackage ../applications/audio/plugin-torture { };
From 489c73671ab957fdbb547c9c175d2530fb0d307e Mon Sep 17 00:00:00 2001
From: "Zak B. Elep" <zakame@zakame.net>
Date: Tue, 27 Oct 2020 04:56:21 +0800
Subject: [PATCH 527/590] perlPackages.NetAsyncHTTP: init at 0.47
---
pkgs/top-level/perl-packages.nix | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 76e391213c3e..c14e1424c8ff 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14570,6 +14570,27 @@ let
};
};
+ NetAsyncHTTP = buildPerlModule {
+ pname = "Net-Async-HTTP";
+ version = "0.47";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Async-HTTP-0.47.tar.gz";
+ sha256 = "1lwy1ijrhibi087p3q5zvadhkq0slfrzfhb76cmkx4mpyv5v4l8f";
+ };
+ buildInputs = [ HTTPCookies TestIdentity TestMetricsAny TestRefcount ];
+ propagatedBuildInputs = [ Future HTTPMessage IOAsync MetricsAny StructDumb URI ];
+ preCheck = stdenv.lib.optionalString stdenv.isDarwin ''
+ # network tests fail on Darwin/sandbox, so disable these
+ rm -f t/20local-connect.t t/22local-connect-pipeline.t t/23local-connect-redir.t
+ rm -f t/90rt75615.t t/90rt75616.t t/90rt93232.t
+ '';
+ meta = {
+ description = "Use HTTP with IO::Async";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ maintainers = [ maintainers.zakame ];
+ };
+ };
+
NetAsyncPing = buildPerlPackage {
pname = "Net-Async-Ping";
version = "0.004001";
From 7ac898fec2f37d27ac7517b1e6129e5fb31343ef Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 28 Oct 2020 16:12:53 +0800
Subject: [PATCH 528/590] kdeApplications: 20.08.1 -> 20.08.2
---
pkgs/applications/kde/fetch.sh | 2 +-
pkgs/applications/kde/srcs.nix | 1728 ++++++++++++++++----------------
2 files changed, 865 insertions(+), 865 deletions(-)
diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index 90e1cf43f6b1..dc023c57a7e6 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=(http://download.kde.org/stable/release-service/20.08.1/src)
+WGET_ARGS=(http://download.kde.org/stable/release-service/20.08.2/src)
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 5bcb48acc181..6966c07ec0af 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -4,1731 +4,1731 @@
{
akonadi = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/akonadi-20.08.1.tar.xz";
- sha256 = "f930de5fae376f138e87c6d67357ab799a3397d865b55c50f771b4427d85f495";
- name = "akonadi-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/akonadi-20.08.2.tar.xz";
+ sha256 = "d3a4b3b3f543734ad5428ca0e573b8dbf9e05f42d51e1aab39b5b5266c16be7d";
+ name = "akonadi-20.08.2.tar.xz";
};
};
akonadi-calendar = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/akonadi-calendar-20.08.1.tar.xz";
- sha256 = "896ec2523203022bf70e23897d59b64c8bfffad4ead5b6756555ab34a4047ef5";
- name = "akonadi-calendar-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/akonadi-calendar-20.08.2.tar.xz";
+ sha256 = "20173d00dc764f6a1e8e0b433d96b982ceadcb17e9bd067caf2967fd5440eb51";
+ name = "akonadi-calendar-20.08.2.tar.xz";
};
};
akonadi-calendar-tools = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/akonadi-calendar-tools-20.08.1.tar.xz";
- sha256 = "21ccc2e1090eeda1eba0c29ab51c3bae1e8f57aedead569c4ed7995f5ad6cffc";
- name = "akonadi-calendar-tools-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/akonadi-calendar-tools-20.08.2.tar.xz";
+ sha256 = "2069cc3a12f0da3f10181c13d19b1048d8f2e0c0f4a4e14309a7e6f08aa74ab9";
+ name = "akonadi-calendar-tools-20.08.2.tar.xz";
};
};
akonadiconsole = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/akonadiconsole-20.08.1.tar.xz";
- sha256 = "077ee646babbc4ca4075505d3dd830f4f5b8b1253617228e96f565fe23bcaad9";
- name = "akonadiconsole-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/akonadiconsole-20.08.2.tar.xz";
+ sha256 = "dc03a1986b6e7af0d26af927009d567da1e1835cc2bb5cc1b5732ffca3ecde9d";
+ name = "akonadiconsole-20.08.2.tar.xz";
};
};
akonadi-contacts = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/akonadi-contacts-20.08.1.tar.xz";
- sha256 = "eee775960345ec0ca13b0550bb56fb6875867921fa7b9412a2c4b0dfb8ab4366";
- name = "akonadi-contacts-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/akonadi-contacts-20.08.2.tar.xz";
+ sha256 = "e4a2696e0e0cf69926d34f160a4581131a1da8244355787564b75dec06db1b30";
+ name = "akonadi-contacts-20.08.2.tar.xz";
};
};
akonadi-import-wizard = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/akonadi-import-wizard-20.08.1.tar.xz";
- sha256 = "d895c866a05f0a55ca8f2d852ed0ae3fdc13aa160cbcbaf9f1017443458d9526";
- name = "akonadi-import-wizard-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/akonadi-import-wizard-20.08.2.tar.xz";
+ sha256 = "639d72ae3d32f681ddb046a87d625871b485785602cf35b817e89004def4dc5e";
+ name = "akonadi-import-wizard-20.08.2.tar.xz";
};
};
akonadi-mime = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/akonadi-mime-20.08.1.tar.xz";
- sha256 = "3c7a57f798a7db1e1aebc3162c20f58a0fb9ed9e703078344ef1de215c73ff0b";
- name = "akonadi-mime-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/akonadi-mime-20.08.2.tar.xz";
+ sha256 = "5699a1d44a9812c9530bc61af5822ff34a573b168d72230cd8261c05065c06e3";
+ name = "akonadi-mime-20.08.2.tar.xz";
};
};
akonadi-notes = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/akonadi-notes-20.08.1.tar.xz";
- sha256 = "afc0cdba349f0b2edece44221a7c3c532d07251ec51f05994e83a1d79c4f50fc";
- name = "akonadi-notes-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/akonadi-notes-20.08.2.tar.xz";
+ sha256 = "4897ca92d6b68f75254e1c419438275a94fa678c9f062dcd91c0267129886ca7";
+ name = "akonadi-notes-20.08.2.tar.xz";
};
};
akonadi-search = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/akonadi-search-20.08.1.tar.xz";
- sha256 = "db305bfc55535d8812d84a119e4dcf04e7b87c345e7ac3a884469cbf55abca83";
- name = "akonadi-search-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/akonadi-search-20.08.2.tar.xz";
+ sha256 = "618400950fa44f0c578ab51c3b311a47e0b2df47203f754e50bcc363201a9fc7";
+ name = "akonadi-search-20.08.2.tar.xz";
};
};
akregator = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/akregator-20.08.1.tar.xz";
- sha256 = "21751a5a14b188649caeeb19cbcef877dd00548a29c073f8694e227d951c7a00";
- name = "akregator-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/akregator-20.08.2.tar.xz";
+ sha256 = "4de4bd31dede5c09e0eb9e14d1da1d1979409eb1e28df5f95963086d4a49edc9";
+ name = "akregator-20.08.2.tar.xz";
};
};
analitza = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/analitza-20.08.1.tar.xz";
- sha256 = "91c691df8be52255db9387549c6392ad2c5358c12e805f3a96520e2aa0c147de";
- name = "analitza-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/analitza-20.08.2.tar.xz";
+ sha256 = "2fad01bf48199e3671559ec9a619f0d590af331922899c793f96fc90860ec487";
+ name = "analitza-20.08.2.tar.xz";
};
};
ark = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/ark-20.08.1.tar.xz";
- sha256 = "32e8546b186b88efc9d4688e02def0b6225d921f9b92cfcd328417f09ec0f725";
- name = "ark-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/ark-20.08.2.tar.xz";
+ sha256 = "ec061ac07687b5a3541af293e3bc2aa7bedcfe0ef38ba6e57e2704068a726ffc";
+ name = "ark-20.08.2.tar.xz";
};
};
artikulate = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/artikulate-20.08.1.tar.xz";
- sha256 = "b626a6a38f6eb50d64607032d5b100351c4242e40a4a13cdce4769e188ee361a";
- name = "artikulate-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/artikulate-20.08.2.tar.xz";
+ sha256 = "66545d85e25aa67816deea4b2b89b485181458a5bc117dad9588671d8b48b41c";
+ name = "artikulate-20.08.2.tar.xz";
};
};
audiocd-kio = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/audiocd-kio-20.08.1.tar.xz";
- sha256 = "7662849929c96d1745ce4ac7ddc931be2eff5e3cc755f2cd959b4d3f4b20b9b0";
- name = "audiocd-kio-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/audiocd-kio-20.08.2.tar.xz";
+ sha256 = "5f38c549fe8c3a4659ac8291c223327b765834e7668bc15a96047e20cdb11f01";
+ name = "audiocd-kio-20.08.2.tar.xz";
};
};
baloo-widgets = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/baloo-widgets-20.08.1.tar.xz";
- sha256 = "9f48cb2f1b45e46828b1656abaeb60e836650015c07277ec52bea053d0058958";
- name = "baloo-widgets-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/baloo-widgets-20.08.2.tar.xz";
+ sha256 = "e1d14b8dba911ebc1cee76dbcd44fa200418ba959d86ce567093b5fc3b700a07";
+ name = "baloo-widgets-20.08.2.tar.xz";
};
};
blinken = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/blinken-20.08.1.tar.xz";
- sha256 = "53b30435ea0d83f713ecb53219173aa55c0d11194830972734a4acc9a5a28c5a";
- name = "blinken-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/blinken-20.08.2.tar.xz";
+ sha256 = "c6e74033ab8ece83618c5cda0ab3cf327514b8e2e6b0e9daf484ce88f671a65e";
+ name = "blinken-20.08.2.tar.xz";
};
};
bomber = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/bomber-20.08.1.tar.xz";
- sha256 = "a4b2f5dcce7e125da30bef6bcc9746b67f8451d2040696714686dd618d80a96c";
- name = "bomber-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/bomber-20.08.2.tar.xz";
+ sha256 = "27c226b31bcdbbda0c9e304e428ca7451614c397a038e830f8052c381dae7215";
+ name = "bomber-20.08.2.tar.xz";
};
};
bovo = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/bovo-20.08.1.tar.xz";
- sha256 = "5d5ee817a73de0deef6b7c35a798bda02c6d15e9dd0e7379a13c23c0832fe0d1";
- name = "bovo-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/bovo-20.08.2.tar.xz";
+ sha256 = "936cab24a13900765f0c5a5afb6f155cb5a05bdb067f86b77e33af5f0e4c37d2";
+ name = "bovo-20.08.2.tar.xz";
};
};
calendarsupport = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/calendarsupport-20.08.1.tar.xz";
- sha256 = "38d6e695725c8484e1492d431144a0ecd1b66535bc07ac77e1f0eb1499d8fc32";
- name = "calendarsupport-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/calendarsupport-20.08.2.tar.xz";
+ sha256 = "83bcdd36689f762363a95b688b9377a3335b4fd58ad1d5efad36ad2b0cf7cc10";
+ name = "calendarsupport-20.08.2.tar.xz";
};
};
cantor = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/cantor-20.08.1.tar.xz";
- sha256 = "c44b96ac861302589923d144bf7b5d529b6eb2f91cea2d014944a0516de31a05";
- name = "cantor-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/cantor-20.08.2.tar.xz";
+ sha256 = "aca92b6e40a9e05282eae2b55f7cc6bf88612ffa9b3dde1a239648be8e5bdc59";
+ name = "cantor-20.08.2.tar.xz";
};
};
cervisia = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/cervisia-20.08.1.tar.xz";
- sha256 = "eedd3b3f00b97d513437fdbd2eeaa28cd6db29512983b82196bdededd8b701f2";
- name = "cervisia-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/cervisia-20.08.2.tar.xz";
+ sha256 = "b3444ecd1078b92fad9b00297496dd3d92366a9c0bb56cfa138f28cc15db1389";
+ name = "cervisia-20.08.2.tar.xz";
};
};
dolphin = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/dolphin-20.08.1.tar.xz";
- sha256 = "7d6ef04b866366a0ff3b199aac082ade41b3748b225ef7675ea42ccf48cbdc24";
- name = "dolphin-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/dolphin-20.08.2.tar.xz";
+ sha256 = "bd13574610fc2108b9b04249cff70ca99958fe57a42fbf260ed16e5e377071bc";
+ name = "dolphin-20.08.2.tar.xz";
};
};
dolphin-plugins = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/dolphin-plugins-20.08.1.tar.xz";
- sha256 = "a00cab6b30c9b5a4c0164704c9eab2cbb661928e775f83acb3691af77bf17427";
- name = "dolphin-plugins-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/dolphin-plugins-20.08.2.tar.xz";
+ sha256 = "7eabeb295ae2932958992bf7273afcb8164fbe90a2574064983fb2ecbc57eeaf";
+ name = "dolphin-plugins-20.08.2.tar.xz";
};
};
dragon = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/dragon-20.08.1.tar.xz";
- sha256 = "691bc338ca25e70e9a43cbcdf50f2e0aa92643bdad0329bdc3e09373ac287040";
- name = "dragon-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/dragon-20.08.2.tar.xz";
+ sha256 = "cf7cce288fdeb12a0c86739741c6b901859e9b36d8fc9e7478c46f53cc74dd6c";
+ name = "dragon-20.08.2.tar.xz";
};
};
elisa = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/elisa-20.08.1.tar.xz";
- sha256 = "1a0234a074a70bfcd4b2ccc14664b2cc7f88d2ccfd33c1716d35c27a31e258c0";
- name = "elisa-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/elisa-20.08.2.tar.xz";
+ sha256 = "6c04377dfd5e82b2b67b3a43cc3ffd3b206f24ab75c3fe18298ec80876dcc268";
+ name = "elisa-20.08.2.tar.xz";
};
};
eventviews = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/eventviews-20.08.1.tar.xz";
- sha256 = "b46e6ad32a503ce1dc1e5ade71e79f44011362fe569836ca1f2cd11c560a5a73";
- name = "eventviews-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/eventviews-20.08.2.tar.xz";
+ sha256 = "ecac9ac6e6a6ed835b28048d8bfc09bac9a1e7a57c5dd0eba6f4360301b32af9";
+ name = "eventviews-20.08.2.tar.xz";
};
};
ffmpegthumbs = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/ffmpegthumbs-20.08.1.tar.xz";
- sha256 = "8b7cd6bd27b29977d0406b08c2cf33988c651a2f59392be47f076e49eea5673b";
- name = "ffmpegthumbs-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/ffmpegthumbs-20.08.2.tar.xz";
+ sha256 = "af5b3de86487d3ddccda34c5165a34427ef97fe1090108781eb38babc101740f";
+ name = "ffmpegthumbs-20.08.2.tar.xz";
};
};
filelight = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/filelight-20.08.1.tar.xz";
- sha256 = "9677038781a1d66238da0e54f967c9c97cb44d593dbe164b8e26f38d0ac75330";
- name = "filelight-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/filelight-20.08.2.tar.xz";
+ sha256 = "65f5f90d56d3449722647286324f8aae54754ec2a46c9aaa2e3bad92bae3433e";
+ name = "filelight-20.08.2.tar.xz";
};
};
granatier = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/granatier-20.08.1.tar.xz";
- sha256 = "7b0d53fd50fdb56270f8fd53d45478c0f1be10bb67b901db08b0f413c4baeb3e";
- name = "granatier-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/granatier-20.08.2.tar.xz";
+ sha256 = "bb79b84b485bb194bf4edaa833e7705ec9fc0275301c70df78498b872de9ee57";
+ name = "granatier-20.08.2.tar.xz";
};
};
grantlee-editor = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/grantlee-editor-20.08.1.tar.xz";
- sha256 = "edeb994eab7001bcf8462834a61ae1a045e9122ae104d31bdeed2ac7497b6306";
- name = "grantlee-editor-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/grantlee-editor-20.08.2.tar.xz";
+ sha256 = "353b2c58d169e8b3c91367a7ce8939ede39c289036e3617da019ae1045a81c7b";
+ name = "grantlee-editor-20.08.2.tar.xz";
};
};
grantleetheme = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/grantleetheme-20.08.1.tar.xz";
- sha256 = "9a8f91ce63a3b143d47d8e3fbd1378732639cd3daf5b5789989164d8225fe54f";
- name = "grantleetheme-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/grantleetheme-20.08.2.tar.xz";
+ sha256 = "8cb4d2f698cf7f44bf70322669809f07900021f215175c8db120abc0f2debf62";
+ name = "grantleetheme-20.08.2.tar.xz";
};
};
gwenview = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/gwenview-20.08.1.tar.xz";
- sha256 = "df1c45317aff9aece8b023cd87aab62c9cd222520795922564e89fdc9df48995";
- name = "gwenview-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/gwenview-20.08.2.tar.xz";
+ sha256 = "580df49eb6852db4b1229f0326372dc7da7a08140d552da59a62ece08b03cc9d";
+ name = "gwenview-20.08.2.tar.xz";
};
};
incidenceeditor = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/incidenceeditor-20.08.1.tar.xz";
- sha256 = "eecc51eb405c473eb20449842dcdb3dac96712bbcf7aeedaa06614e1da3e0bbe";
- name = "incidenceeditor-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/incidenceeditor-20.08.2.tar.xz";
+ sha256 = "e9c24390b5951ef9f504a4dc432fea52ed7487288c424f073446e6c07e70c69a";
+ name = "incidenceeditor-20.08.2.tar.xz";
};
};
juk = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/juk-20.08.1.tar.xz";
- sha256 = "aa9a93a0befacf401cf41d8358b4987d8b370b4c153f3b66e05e922472e004a8";
- name = "juk-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/juk-20.08.2.tar.xz";
+ sha256 = "b19f59ad8c80c4c335469fbddde6db92112e286b1699964eab39a3d826c7ec60";
+ name = "juk-20.08.2.tar.xz";
};
};
k3b = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/k3b-20.08.1.tar.xz";
- sha256 = "66fad59f4e35c24dc8868c46ff45ffa66048501e0a6ac0c23a8b9e957033e50f";
- name = "k3b-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/k3b-20.08.2.tar.xz";
+ sha256 = "6370be558e93fed4605b7870b1d7ea324713c5a52370eab9c05d85fc3b76acd5";
+ name = "k3b-20.08.2.tar.xz";
};
};
kaccounts-integration = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kaccounts-integration-20.08.1.tar.xz";
- sha256 = "b65ec11be0c2b612222de382d24345f19be0cd264243f0d954da8a81b80034bc";
- name = "kaccounts-integration-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kaccounts-integration-20.08.2.tar.xz";
+ sha256 = "6678ee7d394b69a37e6a220a6cba3804f999997da5803da4bab1d8f329ff30fe";
+ name = "kaccounts-integration-20.08.2.tar.xz";
};
};
kaccounts-providers = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kaccounts-providers-20.08.1.tar.xz";
- sha256 = "481a2e2708773197b63937233ade6380c0b64e13a1610f27aa2751b6ee3624a4";
- name = "kaccounts-providers-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kaccounts-providers-20.08.2.tar.xz";
+ sha256 = "c719d7840ab118ff591e75e12869afc3118e5cdeb5c0415eba5b1f6993664c90";
+ name = "kaccounts-providers-20.08.2.tar.xz";
};
};
kaddressbook = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kaddressbook-20.08.1.tar.xz";
- sha256 = "f7fb72cbff43ae6dfb222e5b1c49947602086412b97634484eb3cc86ab773aa2";
- name = "kaddressbook-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kaddressbook-20.08.2.tar.xz";
+ sha256 = "8d2e5849dd8878806e8566ce43c139633c37f027f677603600c8acc0d0d41198";
+ name = "kaddressbook-20.08.2.tar.xz";
};
};
kajongg = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kajongg-20.08.1.tar.xz";
- sha256 = "801c0cc63767809ea4909ceb66dbbbb3e8ad400db7a24c80dc6ae8f3f5c9a6b9";
- name = "kajongg-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kajongg-20.08.2.tar.xz";
+ sha256 = "1eb534ac6d1d3ca14b73bd6e5b626b988acafc30b168f54d48a493adc715ecde";
+ name = "kajongg-20.08.2.tar.xz";
};
};
kalarm = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kalarm-20.08.1.tar.xz";
- sha256 = "22fea5be32c8db6b0903f216307f20dafc2ac69c620d9b4512e1034c0294c207";
- name = "kalarm-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kalarm-20.08.2.tar.xz";
+ sha256 = "e783c041ac4b162cf5254e37e53854835eda6c61ef3ae2358466000a8650a4da";
+ name = "kalarm-20.08.2.tar.xz";
};
};
kalarmcal = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kalarmcal-20.08.1.tar.xz";
- sha256 = "745515662c23154480e73f4a8d6e9ec760d01770383c1dd7f31d3f1463be7602";
- name = "kalarmcal-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kalarmcal-20.08.2.tar.xz";
+ sha256 = "0398a37f412eb03b5cbf2488ce7e0c38a069f1806bda4ea9bfce4fc67311a9a6";
+ name = "kalarmcal-20.08.2.tar.xz";
};
};
kalgebra = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kalgebra-20.08.1.tar.xz";
- sha256 = "a5ab916eba3bfd7535408768e6530e993bc1097ef1a2a0af5aa804aa1f713caf";
- name = "kalgebra-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kalgebra-20.08.2.tar.xz";
+ sha256 = "c934dc8d92917e31c17efa5b64dbec4795439a5f26762e2f214b49028bfe264d";
+ name = "kalgebra-20.08.2.tar.xz";
};
};
kalzium = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kalzium-20.08.1.tar.xz";
- sha256 = "c2c4a823525ab5927c39f29e2150f34fc03947fb852aea1bdb73390c5a709188";
- name = "kalzium-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kalzium-20.08.2.tar.xz";
+ sha256 = "474f74cbb478d3f5f69b5785711ed969ac15d5e92aee5308c6118a9d12611016";
+ name = "kalzium-20.08.2.tar.xz";
};
};
kamera = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kamera-20.08.1.tar.xz";
- sha256 = "f5b04ca46313de1bb0a57253650d1d1578f45796035888b759ad224b5866ee96";
- name = "kamera-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kamera-20.08.2.tar.xz";
+ sha256 = "ba28cab34267ce203b4b70f4a2c2b6a75849aec83dd2d73f6903894c5c125fdf";
+ name = "kamera-20.08.2.tar.xz";
};
};
kamoso = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kamoso-20.08.1.tar.xz";
- sha256 = "ed8fa6a6127a8bea5294534aa2552526af101f981de58512fbb9f7dfd78e8984";
- name = "kamoso-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kamoso-20.08.2.tar.xz";
+ sha256 = "e7d0af2781ff077261886a1683aff1d518a17f9b6d83f84fa95a7633a00f1516";
+ name = "kamoso-20.08.2.tar.xz";
};
};
kanagram = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kanagram-20.08.1.tar.xz";
- sha256 = "c810db58884e80d95baef149b8ced8fff7c5e48d6057478e81a5c8895ae67b42";
- name = "kanagram-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kanagram-20.08.2.tar.xz";
+ sha256 = "3f3f961aa847f26ac875104e82b8e7e73bbc049f20460117f849df91ba9b42e2";
+ name = "kanagram-20.08.2.tar.xz";
};
};
kapman = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kapman-20.08.1.tar.xz";
- sha256 = "934da85c5d9c99a0ed658fe4d99df258246716e04e13ceb3e18b11cc035c4f4c";
- name = "kapman-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kapman-20.08.2.tar.xz";
+ sha256 = "932bd697f2ca0e44af6be983dae3e13df9435642b91f0e1ebba7fd50291c2cbd";
+ name = "kapman-20.08.2.tar.xz";
};
};
kapptemplate = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kapptemplate-20.08.1.tar.xz";
- sha256 = "7b350467e14bc310a695ffa3481afa7857de2f6ec714915ee2d8a25a6511909b";
- name = "kapptemplate-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kapptemplate-20.08.2.tar.xz";
+ sha256 = "3bda6d9f6127e19357f071ca6f9f05890c35a6aaf86e54bce39381f0045b6b0c";
+ name = "kapptemplate-20.08.2.tar.xz";
};
};
kate = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kate-20.08.1.tar.xz";
- sha256 = "44607f6a1d5ca8bb7173bedbeabef65bb98dde0fd009987bd8139fbb53959146";
- name = "kate-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kate-20.08.2.tar.xz";
+ sha256 = "718e8230edfa16f93f54380c4e214a0f25f8a398fe74ad23f12b7dcffae419d0";
+ name = "kate-20.08.2.tar.xz";
};
};
katomic = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/katomic-20.08.1.tar.xz";
- sha256 = "1aa655857bb1708880b6fbf4e54acdfe1cb7f47a9494249978251d870b86f13a";
- name = "katomic-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/katomic-20.08.2.tar.xz";
+ sha256 = "bb94e81cb1122b57d2601f701bc51ff8fa27ac07a5de34e5c49928d50d46ed85";
+ name = "katomic-20.08.2.tar.xz";
};
};
kbackup = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kbackup-20.08.1.tar.xz";
- sha256 = "08b0c43fca2dba65e1173841343daf8e6e37e11101be7315011e8345ba9b1e72";
- name = "kbackup-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kbackup-20.08.2.tar.xz";
+ sha256 = "bb97dd10a64c42ae80c9c87442d3a06d3c18f4f5997bd3b6d1460dec655b3e0a";
+ name = "kbackup-20.08.2.tar.xz";
};
};
kblackbox = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kblackbox-20.08.1.tar.xz";
- sha256 = "3f09d483fa3a3013e685df9efd9cee8d9d1b9f0e017cc97d92636bae89fc469c";
- name = "kblackbox-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kblackbox-20.08.2.tar.xz";
+ sha256 = "714a8749a49d1a7938b74372138ae3e5bafef50de61207e63a6d2c60b6bfded2";
+ name = "kblackbox-20.08.2.tar.xz";
};
};
kblocks = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kblocks-20.08.1.tar.xz";
- sha256 = "e2b6e5b0727ca45d6b0f0e8b9f0aa029a0acb9bdebeac5bfd849455e560977ed";
- name = "kblocks-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kblocks-20.08.2.tar.xz";
+ sha256 = "c82f8b6e722308a236d0057028d644ebf8105c9c902d799bc2fb3e1c1ff7c188";
+ name = "kblocks-20.08.2.tar.xz";
};
};
kbounce = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kbounce-20.08.1.tar.xz";
- sha256 = "99af3bd297fcbecb9eaa4222bbb5122144beff9cb999420bf45339d61375f2a4";
- name = "kbounce-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kbounce-20.08.2.tar.xz";
+ sha256 = "371fbaf7c1faeacf1c74441ec1a58f1ced862f741e67123d2eb105f1d4f9b8e2";
+ name = "kbounce-20.08.2.tar.xz";
};
};
kbreakout = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kbreakout-20.08.1.tar.xz";
- sha256 = "0d57c105f2778b68c0b5ff8cb3e02d5c7ea2956b90d48d126ff1118b94d5f2fa";
- name = "kbreakout-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kbreakout-20.08.2.tar.xz";
+ sha256 = "b58b9dd26eff3960bc664076ddf4d0c81c7dfd5380be1d058b86de2d3f55d2ef";
+ name = "kbreakout-20.08.2.tar.xz";
};
};
kbruch = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kbruch-20.08.1.tar.xz";
- sha256 = "f04bf902a31b68d18c69afff511a591817a35f5ad866de4f84aa1b664b35a41e";
- name = "kbruch-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kbruch-20.08.2.tar.xz";
+ sha256 = "54c5997a8d6405439448dd929bf16017c9e5db052b30c9bf144c656c6d8b9e0b";
+ name = "kbruch-20.08.2.tar.xz";
};
};
kcachegrind = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kcachegrind-20.08.1.tar.xz";
- sha256 = "59c43296aaa7d8a5dbf782ba9248ee8bb6308e7bd7bdfc0b99e1c912529337f2";
- name = "kcachegrind-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kcachegrind-20.08.2.tar.xz";
+ sha256 = "e6b84a323a21ae7975ccc07154bcdc6eef1bc92818b800cfc5d546ada7f0387c";
+ name = "kcachegrind-20.08.2.tar.xz";
};
};
kcalc = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kcalc-20.08.1.tar.xz";
- sha256 = "46702fe8eca8b604e15f3f2eb4d1f17b8601b6ad0b03bb9cd0a0dd7ed7a13c49";
- name = "kcalc-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kcalc-20.08.2.tar.xz";
+ sha256 = "76b6c8e44c789090c0155f79878df8f27c96d2df4273443b0f05a42ec81902cf";
+ name = "kcalc-20.08.2.tar.xz";
};
};
kcalutils = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kcalutils-20.08.1.tar.xz";
- sha256 = "ae6a8ca02722f8f593a8d248ab3d043cc68be23d18f820e150af000a902601c2";
- name = "kcalutils-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kcalutils-20.08.2.tar.xz";
+ sha256 = "fccae5166b627f654412344d0090000ecd270af54b0cedb8648e35af26369cae";
+ name = "kcalutils-20.08.2.tar.xz";
};
};
kcharselect = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kcharselect-20.08.1.tar.xz";
- sha256 = "36575e9fd0a93fb3ddaf6a75a213786351bdd3ab8c167dc1a3e2824a23a6655b";
- name = "kcharselect-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kcharselect-20.08.2.tar.xz";
+ sha256 = "9438e723469b6bf0d87b23965c6d925800ff35b2cc2214a7eeb5fb41009489e0";
+ name = "kcharselect-20.08.2.tar.xz";
};
};
kcolorchooser = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kcolorchooser-20.08.1.tar.xz";
- sha256 = "20cae01bd5e8c824f8e7900badd0d66464c363a749a1ce9fe6fe3a1e31c99ade";
- name = "kcolorchooser-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kcolorchooser-20.08.2.tar.xz";
+ sha256 = "f314c31932704e7136b5fff89efe95e84e4215f3902089f9d838411f0fbc0c72";
+ name = "kcolorchooser-20.08.2.tar.xz";
};
};
kcron = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kcron-20.08.1.tar.xz";
- sha256 = "24ee9aee48bef951d6ac1fff32271417c4eb2239f0ec1de8388f2bae55ce83f5";
- name = "kcron-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kcron-20.08.2.tar.xz";
+ sha256 = "ce72bb7c48606b0611cfe46a545224cca131d34a4b678c86d9ac473071833f83";
+ name = "kcron-20.08.2.tar.xz";
};
};
kdebugsettings = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kdebugsettings-20.08.1.tar.xz";
- sha256 = "cac50d34c8a31805924aa75755475a754109fc643e95fe50188477522d113a55";
- name = "kdebugsettings-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kdebugsettings-20.08.2.tar.xz";
+ sha256 = "78502b1a52f9f81ff848e5b210b37a3a74da7c0032de2513f23c1d25cf801283";
+ name = "kdebugsettings-20.08.2.tar.xz";
};
};
kdeconnect-kde = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kdeconnect-kde-20.08.1.tar.xz";
- sha256 = "8ebfe36b4d08b36881082a3748f63a7c645b51e8f3b094607512817e9f6ce668";
- name = "kdeconnect-kde-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kdeconnect-kde-20.08.2.tar.xz";
+ sha256 = "6d43e38620987de1ddcfdfa7d4e6e31ff383b806139ba02e69a99c3ddfb4ee67";
+ name = "kdeconnect-kde-20.08.2.tar.xz";
};
};
kde-dev-scripts = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kde-dev-scripts-20.08.1.tar.xz";
- sha256 = "f7f99a199fea69019738e6d2147e5f6e4419835aa2c39e6d60f4d2e5d629ba96";
- name = "kde-dev-scripts-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kde-dev-scripts-20.08.2.tar.xz";
+ sha256 = "ff1a819991903b09bef3637b579d215e087310e39b98a1a6928e15f193aec056";
+ name = "kde-dev-scripts-20.08.2.tar.xz";
};
};
kde-dev-utils = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kde-dev-utils-20.08.1.tar.xz";
- sha256 = "8105a5b911643dca1f0c476c9247282f80e4ea17bae06dcca63ba9638bf5d21d";
- name = "kde-dev-utils-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kde-dev-utils-20.08.2.tar.xz";
+ sha256 = "21a4a11e102cbbd9fed955720966d7be2f7a615f57c9bf1dfc94ce973d25ffc3";
+ name = "kde-dev-utils-20.08.2.tar.xz";
};
};
kdeedu-data = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kdeedu-data-20.08.1.tar.xz";
- sha256 = "d9c10c849f94b8cff7f79747a0594b8050f19d5477799b03f803c4241a9d12b6";
- name = "kdeedu-data-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kdeedu-data-20.08.2.tar.xz";
+ sha256 = "9030c39b92a7500254e8303ce246d2535cd66a203bb96b2670defd5288294ad1";
+ name = "kdeedu-data-20.08.2.tar.xz";
};
};
kdegraphics-mobipocket = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kdegraphics-mobipocket-20.08.1.tar.xz";
- sha256 = "9974c36d90fc23d9a3a7172cf1526dc3671bf90f01f608effe92f64fce53c372";
- name = "kdegraphics-mobipocket-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kdegraphics-mobipocket-20.08.2.tar.xz";
+ sha256 = "8972079756633abe8cbfaa39cdff9d56f89958861e6e418738311bcdc52771a5";
+ name = "kdegraphics-mobipocket-20.08.2.tar.xz";
};
};
kdegraphics-thumbnailers = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kdegraphics-thumbnailers-20.08.1.tar.xz";
- sha256 = "8303231f2fc44c071b3f6a477ae5335f2657dbfaba52362529aaba20973a5995";
- name = "kdegraphics-thumbnailers-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kdegraphics-thumbnailers-20.08.2.tar.xz";
+ sha256 = "977cf6c40ba00a8a391a951aab80c55d9615927a1ef4a7bb5eea2f6a83373532";
+ name = "kdegraphics-thumbnailers-20.08.2.tar.xz";
};
};
kdenetwork-filesharing = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kdenetwork-filesharing-20.08.1.tar.xz";
- sha256 = "e88f4a2f6d7b8a61ebd491eb112f51d50f9949d729022fab01223d6ea36b8a01";
- name = "kdenetwork-filesharing-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kdenetwork-filesharing-20.08.2.tar.xz";
+ sha256 = "f909ee8433baf906b6c23af4747d83ae3e151e213585abe01282213012228b3a";
+ name = "kdenetwork-filesharing-20.08.2.tar.xz";
};
};
kdenlive = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kdenlive-20.08.1.tar.xz";
- sha256 = "f99e3f22c3d5e41a3ca251299d010ac2bc44933091c25d360104d562a1090873";
- name = "kdenlive-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kdenlive-20.08.2.tar.xz";
+ sha256 = "535df45a148f0f94271e045ef0c93575fded83da7a2b727aeaf90e61e1d7c418";
+ name = "kdenlive-20.08.2.tar.xz";
};
};
kdepim-addons = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kdepim-addons-20.08.1.tar.xz";
- sha256 = "a0bddcbe8f8f6d8c878a6b5634578522a8d485e424cf37d35bc17df9a1ffc7c2";
- name = "kdepim-addons-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kdepim-addons-20.08.2.tar.xz";
+ sha256 = "f7ab0d9ee2b9351959199f8903c447c6cb82fd58d642b7039cd2b8e324038b01";
+ name = "kdepim-addons-20.08.2.tar.xz";
};
};
kdepim-apps-libs = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kdepim-apps-libs-20.08.1.tar.xz";
- sha256 = "a0664933b3b5ff20747bf2adec9fbbecf22935129349208430d53e8c9bf5b5bb";
- name = "kdepim-apps-libs-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kdepim-apps-libs-20.08.2.tar.xz";
+ sha256 = "8c3ebdf7072d3a5a6ea2921697b28aa27e51ba43db152ea83a07b4b13c282434";
+ name = "kdepim-apps-libs-20.08.2.tar.xz";
};
};
kdepim-runtime = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kdepim-runtime-20.08.1.tar.xz";
- sha256 = "27a4c04dcf2eac4108a43acbdd57e3a8aa1da92443a3e7977329d0218da05c24";
- name = "kdepim-runtime-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kdepim-runtime-20.08.2.tar.xz";
+ sha256 = "3b475dfd394d5c09991eb4e1f0ddb3e2aa1f586ed75aa7961b159ef712d80132";
+ name = "kdepim-runtime-20.08.2.tar.xz";
};
};
kdesdk-kioslaves = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kdesdk-kioslaves-20.08.1.tar.xz";
- sha256 = "528cce0ea4c7c9fd53a604591eae4a70d39421ebbe62ed59bcbc80072f95c19f";
- name = "kdesdk-kioslaves-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kdesdk-kioslaves-20.08.2.tar.xz";
+ sha256 = "5e79532675d717d906f6b43eea1cac20fe1513bcf497696251c00fe74e2f0f58";
+ name = "kdesdk-kioslaves-20.08.2.tar.xz";
};
};
kdesdk-thumbnailers = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kdesdk-thumbnailers-20.08.1.tar.xz";
- sha256 = "5b189182f2a734f82e67e23d3293e694c51f97c0a9acd1ec5498442a3d2a3804";
- name = "kdesdk-thumbnailers-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kdesdk-thumbnailers-20.08.2.tar.xz";
+ sha256 = "0b6809e2469d7057b6d674d5950fd4f6243a1d3d185452212522880c714c1c63";
+ name = "kdesdk-thumbnailers-20.08.2.tar.xz";
};
};
kdf = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kdf-20.08.1.tar.xz";
- sha256 = "c100c87e9dbfcf7c12ce78d743f4ce3a2ec2bf3c1b0d969af1285255071195a5";
- name = "kdf-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kdf-20.08.2.tar.xz";
+ sha256 = "b33c043c18ae7b80b40e73c0a34759540724fa81815a6afa1e91e3ad44aec27e";
+ name = "kdf-20.08.2.tar.xz";
};
};
kdialog = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kdialog-20.08.1.tar.xz";
- sha256 = "089e8a8e85a9021b830e9b8a19ecb1999781915a716c9c2b3c99894a5d1c8dcf";
- name = "kdialog-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kdialog-20.08.2.tar.xz";
+ sha256 = "1bb808c2d01680e2396f282b798d9e22d2c1722f992c672eaf7451bf83a5d459";
+ name = "kdialog-20.08.2.tar.xz";
};
};
kdiamond = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kdiamond-20.08.1.tar.xz";
- sha256 = "1629dc6f70873b42081bd75dbf858da56d380c32925ddd49bd2110d458cb4b23";
- name = "kdiamond-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kdiamond-20.08.2.tar.xz";
+ sha256 = "7bfc2b24d86c663bff719156ba20cd36017f1df647ee6769b5101aa6ab3e3e21";
+ name = "kdiamond-20.08.2.tar.xz";
};
};
keditbookmarks = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/keditbookmarks-20.08.1.tar.xz";
- sha256 = "8bfedffae0332dbfb611d25f3178ab7babe374155cce7c44e1aaa841934c3123";
- name = "keditbookmarks-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/keditbookmarks-20.08.2.tar.xz";
+ sha256 = "87d72e78c907e7829a642364f3a49dd0f0dea0c76e7a5c524a67f957dca94b9b";
+ name = "keditbookmarks-20.08.2.tar.xz";
};
};
kfind = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kfind-20.08.1.tar.xz";
- sha256 = "e49412d0eae6f77369b96ee7fa5902252294d03da1e8782460d4bba5be6bb149";
- name = "kfind-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kfind-20.08.2.tar.xz";
+ sha256 = "2381bbe7793a666fa9463aead1246dc4244409f68375f6d75e1423be15b42d74";
+ name = "kfind-20.08.2.tar.xz";
};
};
kfloppy = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kfloppy-20.08.1.tar.xz";
- sha256 = "cfbe396c252acc23a929d05fe1a71099bc19ee3ab55f4f40e47780cf871852c5";
- name = "kfloppy-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kfloppy-20.08.2.tar.xz";
+ sha256 = "7f624d03dc3dc5099ac1479148800043195fa6c0e3bb6d7efcb452a76e99e191";
+ name = "kfloppy-20.08.2.tar.xz";
};
};
kfourinline = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kfourinline-20.08.1.tar.xz";
- sha256 = "2c65dcc685d7e46da73e53ac3ab250ef4d1738bb85aa6f1b09160ff2ece364a2";
- name = "kfourinline-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kfourinline-20.08.2.tar.xz";
+ sha256 = "aed2ecdb40b2e3d5452b183a1817216373d32a0aab4eff02f6c823a6f8d801eb";
+ name = "kfourinline-20.08.2.tar.xz";
};
};
kgeography = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kgeography-20.08.1.tar.xz";
- sha256 = "f7ce4c6a00f18558aa04f4af0b71e45efc10c67f0b3454c5f0b2527a43133d30";
- name = "kgeography-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kgeography-20.08.2.tar.xz";
+ sha256 = "82c4798f3184c77d0be63aeb5e86c84240c9cb0aa0e66ff57f92c0b5c3748f19";
+ name = "kgeography-20.08.2.tar.xz";
};
};
kget = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kget-20.08.1.tar.xz";
- sha256 = "efbfc08a5a4ed3974bbdab20c5eae07cdb70f7f42e9de1c75651a57511d7e576";
- name = "kget-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kget-20.08.2.tar.xz";
+ sha256 = "42993095d6325e921b6ed36f4b0a2153ffd5d68cfa3e6d3ced2db09e2a6aabb8";
+ name = "kget-20.08.2.tar.xz";
};
};
kgoldrunner = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kgoldrunner-20.08.1.tar.xz";
- sha256 = "40380c0d3b65e06cdb9d9ca3791c10e0d2d300856cc49a7b3da0145b7651274b";
- name = "kgoldrunner-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kgoldrunner-20.08.2.tar.xz";
+ sha256 = "4bbcfcf5cf810e0b1f78e1a88d222631c07401187fb327deaa5ab6658483d351";
+ name = "kgoldrunner-20.08.2.tar.xz";
};
};
kgpg = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kgpg-20.08.1.tar.xz";
- sha256 = "6b926c2adf896c3f68402ec10faf8db1e5f7c7b9fa8c1c26f9021d1fb0c975b0";
- name = "kgpg-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kgpg-20.08.2.tar.xz";
+ sha256 = "fc4ec5c38c3bdb02a399f0eb1e75da356a523ada369d5410c2f4e7f5f14a508f";
+ name = "kgpg-20.08.2.tar.xz";
};
};
khangman = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/khangman-20.08.1.tar.xz";
- sha256 = "fe94116ea833295a46c59a7420676925bb1038e7da86f6369d452087add40868";
- name = "khangman-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/khangman-20.08.2.tar.xz";
+ sha256 = "7ff30ecbab7c9e8f44b7e8c3887ec78a918c919ce902005aeb7fb969ac995b28";
+ name = "khangman-20.08.2.tar.xz";
};
};
khelpcenter = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/khelpcenter-20.08.1.tar.xz";
- sha256 = "217b433c1a5da966ad5dab1e89e2e719632f1e035ab92cce094c5f0848bb6e39";
- name = "khelpcenter-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/khelpcenter-20.08.2.tar.xz";
+ sha256 = "36051a4352a05dd9b74b4e325c0e16e30d6bd8b48d6c3d13980b39a77aab4e2d";
+ name = "khelpcenter-20.08.2.tar.xz";
};
};
kidentitymanagement = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kidentitymanagement-20.08.1.tar.xz";
- sha256 = "3b34e029e99647d6742825633682ab8a5eecbe102e34ea2472cb53afb853840d";
- name = "kidentitymanagement-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kidentitymanagement-20.08.2.tar.xz";
+ sha256 = "17a1fd47d91289519cafb12c0d917b4775496ada447cb6f4ba56dc42446152ec";
+ name = "kidentitymanagement-20.08.2.tar.xz";
};
};
kig = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kig-20.08.1.tar.xz";
- sha256 = "f318d346cd152e62ae892ade31a784f0b7b823c56fdfd64e05a330072ad95745";
- name = "kig-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kig-20.08.2.tar.xz";
+ sha256 = "401832d384e47ea6daf310f7e823ae6b8a55bc117b7570bd4bf36261d01587f5";
+ name = "kig-20.08.2.tar.xz";
};
};
kigo = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kigo-20.08.1.tar.xz";
- sha256 = "58fa166a487c855d300c8a33758928131fc4db80cbda19a08e3de918335d2bdb";
- name = "kigo-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kigo-20.08.2.tar.xz";
+ sha256 = "b9e6edd2e35e57edb3d89bb76f1d7e4a9e7f8fb64644b58012543a367834aa60";
+ name = "kigo-20.08.2.tar.xz";
};
};
killbots = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/killbots-20.08.1.tar.xz";
- sha256 = "252636f4df2af0e087f4d604f76c5d8702c38392d821281a0f6283be4e429af9";
- name = "killbots-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/killbots-20.08.2.tar.xz";
+ sha256 = "332ebd24be6ea62c8621aeaa5b200d6ebf03ae0198a06693b36b2c80cac89d95";
+ name = "killbots-20.08.2.tar.xz";
};
};
kimagemapeditor = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kimagemapeditor-20.08.1.tar.xz";
- sha256 = "bf391d0812e0f2dce6a11481972cf9d04f14d0bf92cad7210fa35a1fa0edf230";
- name = "kimagemapeditor-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kimagemapeditor-20.08.2.tar.xz";
+ sha256 = "fd8272978a7c3a1d95b20a5ec57ccf00d740a8d6eb483f0a204d03669215309c";
+ name = "kimagemapeditor-20.08.2.tar.xz";
};
};
kimap = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kimap-20.08.1.tar.xz";
- sha256 = "eae645ae2535c2612556e8938011cc478054c032126bb55683b95127d1b94741";
- name = "kimap-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kimap-20.08.2.tar.xz";
+ sha256 = "bda4f4b4e94481b70cec270655c0fd2888da51106d80c0388ae5c0dc5d36e092";
+ name = "kimap-20.08.2.tar.xz";
};
};
kio-extras = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kio-extras-20.08.1.tar.xz";
- sha256 = "1122635926052f34fd35d8aeef9c3c1d892690d8372f2b7d902e6449cdab988a";
- name = "kio-extras-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kio-extras-20.08.2.tar.xz";
+ sha256 = "9d4b9cb5a4002ad2127c5c5c4d25ff95d53de32ea08348e8dc40fe83d950076e";
+ name = "kio-extras-20.08.2.tar.xz";
};
};
kio-gdrive = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kio-gdrive-20.08.1.tar.xz";
- sha256 = "5104136948ee60cd527109bb9e8830e6a12f6062a29f34bc995b2625b0280825";
- name = "kio-gdrive-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kio-gdrive-20.08.2.tar.xz";
+ sha256 = "71047e9f8e5ad9317cc3dbf1de2d121f322b5d968d3685351ef0d2aabe2f46ca";
+ name = "kio-gdrive-20.08.2.tar.xz";
};
};
kipi-plugins = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kipi-plugins-20.08.1.tar.xz";
- sha256 = "b7d8f1aa087006a48d9bd7ec036ab4779e898e3b02692c91342439747cad6c5c";
- name = "kipi-plugins-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kipi-plugins-20.08.2.tar.xz";
+ sha256 = "89de8f75dd01e2130c1e651bd04717ce4d35768202ae3e825c93c75c8312e583";
+ name = "kipi-plugins-20.08.2.tar.xz";
};
};
kirigami-gallery = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kirigami-gallery-20.08.1.tar.xz";
- sha256 = "497886cc5a8483f068a642ce19df19f69fd105a4fb583f1a9898c885659c9df5";
- name = "kirigami-gallery-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kirigami-gallery-20.08.2.tar.xz";
+ sha256 = "0b4a5cec32bdfaef42b790f1d249d227c9daf56e0f3c1e302d33ccaa485c28e5";
+ name = "kirigami-gallery-20.08.2.tar.xz";
};
};
kiriki = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kiriki-20.08.1.tar.xz";
- sha256 = "51e77cbbf6a0c60487d72b03b28c08409d0b6134c983d9e420fbc4d7f73223e8";
- name = "kiriki-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kiriki-20.08.2.tar.xz";
+ sha256 = "42081e39c045bd830c6a79938a83690ea5641aa9e5437645234441da2d29b053";
+ name = "kiriki-20.08.2.tar.xz";
};
};
kiten = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kiten-20.08.1.tar.xz";
- sha256 = "f3764d090db8027746e83c326e833680fd669dca66dd6af095ba120e66de2901";
- name = "kiten-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kiten-20.08.2.tar.xz";
+ sha256 = "a7285d5880611da2202d0e3f8f2bf860f275932d3da54ff7aecc793225f7ad7d";
+ name = "kiten-20.08.2.tar.xz";
};
};
kitinerary = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kitinerary-20.08.1.tar.xz";
- sha256 = "d3e0b6130b5c603bc1494404fa91ed1995e9142d66e4c3ddd5d2c79fdea856e4";
- name = "kitinerary-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kitinerary-20.08.2.tar.xz";
+ sha256 = "69d8b5f64774860e5098c1dbfb06d274da4379c04383c4f0f0e412481c48fa27";
+ name = "kitinerary-20.08.2.tar.xz";
};
};
kjumpingcube = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kjumpingcube-20.08.1.tar.xz";
- sha256 = "226424cd21f75c499eedd15460a466988b179312467ed16437df87be494d9fbc";
- name = "kjumpingcube-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kjumpingcube-20.08.2.tar.xz";
+ sha256 = "0edba227e24b8aeda4e75bc6c25ad25b50ac624b5319a64ce20d6c3f7691a48a";
+ name = "kjumpingcube-20.08.2.tar.xz";
};
};
kldap = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kldap-20.08.1.tar.xz";
- sha256 = "098fb07b280ef25dcf04b18f627223014257f6c0874b2959f2a8e68cacdb74a7";
- name = "kldap-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kldap-20.08.2.tar.xz";
+ sha256 = "dfc8bd59d837766e741b33cf8486256b7bd5ffc33ff2aab240d47b4766ec8489";
+ name = "kldap-20.08.2.tar.xz";
};
};
kleopatra = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kleopatra-20.08.1.tar.xz";
- sha256 = "e7bc3ce03ad5431e4289360ba6b701e38d53b60de58fd1ed358480cec48657a6";
- name = "kleopatra-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kleopatra-20.08.2.tar.xz";
+ sha256 = "70ffa2d1549b6b4674a9cd92052174002d81fb236cfbf872187c6e3616191ba2";
+ name = "kleopatra-20.08.2.tar.xz";
};
};
klettres = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/klettres-20.08.1.tar.xz";
- sha256 = "f29d6df1de3562731f246a892caaa493b9bccc9d1317a948e03ad12cb8c80c06";
- name = "klettres-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/klettres-20.08.2.tar.xz";
+ sha256 = "9cef7dea479d27644e4812157d4cf3993dc3ee84b847377a17cec305a03a3156";
+ name = "klettres-20.08.2.tar.xz";
};
};
klickety = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/klickety-20.08.1.tar.xz";
- sha256 = "a9b63b3e944faba25498e981c06981dc354f9acd34b77f46fe2bebef388bf2cb";
- name = "klickety-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/klickety-20.08.2.tar.xz";
+ sha256 = "90665c5aeda52f55af8dcf3936e557ba431d9e48c6be361eaeb82117b6213a33";
+ name = "klickety-20.08.2.tar.xz";
};
};
klines = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/klines-20.08.1.tar.xz";
- sha256 = "d16650d7d44f48f47700dcb8fe97519dd28fe7213052636363d281c24f46a2b9";
- name = "klines-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/klines-20.08.2.tar.xz";
+ sha256 = "8e8b897cdc3c31fada1dd2635da211def507f47c8062c6458f559283ae470edb";
+ name = "klines-20.08.2.tar.xz";
};
};
kmag = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kmag-20.08.1.tar.xz";
- sha256 = "0aaaf19af2c943ae460dbcc1984bae167b79be287802e8a6faa6aaaed11718f3";
- name = "kmag-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kmag-20.08.2.tar.xz";
+ sha256 = "8e933e8ebbf0ab956e2a251312e3d4e027848dc2f2b4e8a7c7250b8fdf10ca05";
+ name = "kmag-20.08.2.tar.xz";
};
};
kmahjongg = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kmahjongg-20.08.1.tar.xz";
- sha256 = "842b3d2e9c60b6a8e6bb6d09f26db49d988889ec3962ac40aea0e79434c2eb43";
- name = "kmahjongg-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kmahjongg-20.08.2.tar.xz";
+ sha256 = "98e34794560a062bd22950acc583b77a6f8d1d28aceb863604f5a6c98c6cc80d";
+ name = "kmahjongg-20.08.2.tar.xz";
};
};
kmail = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kmail-20.08.1.tar.xz";
- sha256 = "7ba5854e36e2ed752baa3a1ac15d1a6227699da6f5bdca3c250f22226b4d902b";
- name = "kmail-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kmail-20.08.2.tar.xz";
+ sha256 = "ff179b89836236174cd587ce4ea2a4320e58345d45582cb157186cfbb01e58f2";
+ name = "kmail-20.08.2.tar.xz";
};
};
kmail-account-wizard = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kmail-account-wizard-20.08.1.tar.xz";
- sha256 = "7a1dc9ad542c0e54b80e955a162888c7d4b6bababcf02681d54af4480c03bd8d";
- name = "kmail-account-wizard-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kmail-account-wizard-20.08.2.tar.xz";
+ sha256 = "7cdb9b60b1a646f0c5c0d0e7dfbe357a9f66bb305afbccbb4b421ee6f6941df8";
+ name = "kmail-account-wizard-20.08.2.tar.xz";
};
};
kmailtransport = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kmailtransport-20.08.1.tar.xz";
- sha256 = "4cabad74e141891546b0f47f44030eeb59fb63257a5c0d1c12124815ebf710c1";
- name = "kmailtransport-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kmailtransport-20.08.2.tar.xz";
+ sha256 = "8b12836b1ca0243819680cba73c809c491c5e7a8d1ea9d9dc23e7338aed69a0c";
+ name = "kmailtransport-20.08.2.tar.xz";
};
};
kmbox = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kmbox-20.08.1.tar.xz";
- sha256 = "df77b2bf448d1ce21ff4a816f1164297519b48cd60200cea0edae6e72a81a19b";
- name = "kmbox-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kmbox-20.08.2.tar.xz";
+ sha256 = "4fa1ad98368130dcdc8ad71dba3084c489130b1e8fc4a2b119ffc6f56595ba73";
+ name = "kmbox-20.08.2.tar.xz";
};
};
kmime = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kmime-20.08.1.tar.xz";
- sha256 = "cd0beaa46040d571b505d07853be76f099289e22d99ce4884695d4d645dfbe8c";
- name = "kmime-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kmime-20.08.2.tar.xz";
+ sha256 = "9f23e2814e62ae6c4a67fd3223315ef875776f9d098b4d11c7d06a726a725435";
+ name = "kmime-20.08.2.tar.xz";
};
};
kmines = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kmines-20.08.1.tar.xz";
- sha256 = "eeb58941c94330f3ffdca60c0ca84d8ebcc9c6c355737217b521c54e50c650cd";
- name = "kmines-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kmines-20.08.2.tar.xz";
+ sha256 = "6b07a812497a665505b6b1e3a84ac0818f1a5e5757146cdbceec55e94bb41753";
+ name = "kmines-20.08.2.tar.xz";
};
};
kmix = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kmix-20.08.1.tar.xz";
- sha256 = "012d14adbb200a7e66ddbc9ebc8e18c4e5082ae24dea6ab22284b6c730a1b472";
- name = "kmix-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kmix-20.08.2.tar.xz";
+ sha256 = "73453f02a72384382fd7449215189e22b5e1600e9ef0c9cc910f3fddd09beb85";
+ name = "kmix-20.08.2.tar.xz";
};
};
kmousetool = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kmousetool-20.08.1.tar.xz";
- sha256 = "c1d769efdd318eb1e29905122c579c72a41da74b45a076b79cf177b1800e1464";
- name = "kmousetool-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kmousetool-20.08.2.tar.xz";
+ sha256 = "c1f70c172dc2ad7d937db5e6355522082f924ba45e7aac1bbb1c04e230f1d406";
+ name = "kmousetool-20.08.2.tar.xz";
};
};
kmouth = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kmouth-20.08.1.tar.xz";
- sha256 = "d87fb47fa00c54f13cdaef33d15cc74f31d7009d4a8d988902b62c698d1e2c2c";
- name = "kmouth-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kmouth-20.08.2.tar.xz";
+ sha256 = "d206afecdbe5f063dfbf805956f475e95c7b0fd548fd5f1b4fd7376ea6747e96";
+ name = "kmouth-20.08.2.tar.xz";
};
};
kmplot = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kmplot-20.08.1.tar.xz";
- sha256 = "6d294a89f9e0fc42262ada6d71ba5abaeb756beb194e71f1852e18ae2b85456e";
- name = "kmplot-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kmplot-20.08.2.tar.xz";
+ sha256 = "c3bc34a2d1bf4620745009b49b6541a16ac64eb3d1e6cf1ba936b14aa5d02e2b";
+ name = "kmplot-20.08.2.tar.xz";
};
};
knavalbattle = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/knavalbattle-20.08.1.tar.xz";
- sha256 = "e0cbffc5643aac302c53cfd957eefa7f89486fdd0d9c55b74f39d733a0ac3b65";
- name = "knavalbattle-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/knavalbattle-20.08.2.tar.xz";
+ sha256 = "2cd91ee61193810eee62e47f38f590e81b03287083f31564e0ebfd893d339ac9";
+ name = "knavalbattle-20.08.2.tar.xz";
};
};
knetwalk = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/knetwalk-20.08.1.tar.xz";
- sha256 = "30cbf7bdf5f875ce172a382ef7da8e74803015017c6cd525cb6c288defac020d";
- name = "knetwalk-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/knetwalk-20.08.2.tar.xz";
+ sha256 = "4a97f4b1af463e5e50698e8ac089cf6933fb66f25dd9b0fae3f1b1a51cbca3c0";
+ name = "knetwalk-20.08.2.tar.xz";
};
};
knights = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/knights-20.08.1.tar.xz";
- sha256 = "58518d8ecce5744fdf68c18e0803f48cb912fa29c5ea93ed6ccd2d4d320f722d";
- name = "knights-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/knights-20.08.2.tar.xz";
+ sha256 = "b62dda6e8b5bb85cc814f7244e39806e38c266be1bf3090eb6de59c8141fc1d4";
+ name = "knights-20.08.2.tar.xz";
};
};
knotes = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/knotes-20.08.1.tar.xz";
- sha256 = "7d066a34d46684f258481466875d18f99a9000d66dec36f7dcab92790f6c57bb";
- name = "knotes-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/knotes-20.08.2.tar.xz";
+ sha256 = "1e61f2c8b5fe9075f07be16543e3a7310bf533b6c2446f162f7196b41e3e6ecb";
+ name = "knotes-20.08.2.tar.xz";
};
};
kolf = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kolf-20.08.1.tar.xz";
- sha256 = "04d117895a6504d6138d1e3cd3157dd3318ba93eefd749182556344650f6a2f8";
- name = "kolf-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kolf-20.08.2.tar.xz";
+ sha256 = "834c1c6cdc62e650c7b0d36db26387cc4ebe2bb4b2e8fa06c0bf461e3a1e8c64";
+ name = "kolf-20.08.2.tar.xz";
};
};
kollision = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kollision-20.08.1.tar.xz";
- sha256 = "858d69131951734181b449ce48498b3b843634eb8c069c932042b3c0f862f98c";
- name = "kollision-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kollision-20.08.2.tar.xz";
+ sha256 = "9b6829f49d9baa89596ef8649996724db72c3c8eb793b9b6afc80dc0d07c0421";
+ name = "kollision-20.08.2.tar.xz";
};
};
kolourpaint = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kolourpaint-20.08.1.tar.xz";
- sha256 = "7de98e081f13fb9f8a73932d5e8ce6f1cfd73e345fa28d03f515cad69f1b8bae";
- name = "kolourpaint-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kolourpaint-20.08.2.tar.xz";
+ sha256 = "fbcd875a4a407d9b1e5a637d4947bacfb50f39e10af3327f30fdbb953528aae0";
+ name = "kolourpaint-20.08.2.tar.xz";
};
};
kompare = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kompare-20.08.1.tar.xz";
- sha256 = "6e9109f1b24b3d79dec3d70c75357a67d16ab35081bcf7e4b842981b84796aa2";
- name = "kompare-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kompare-20.08.2.tar.xz";
+ sha256 = "4e52cb2c9e35e90fe77bfb23bd10c1931c56b11e3fec06c215730d60c47e8550";
+ name = "kompare-20.08.2.tar.xz";
};
};
konqueror = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/konqueror-20.08.1.tar.xz";
- sha256 = "e3aac062d9e431e63a861ecf5a1d577b11a154faaed5bd95ef6b69b4fc8a34e9";
- name = "konqueror-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/konqueror-20.08.2.tar.xz";
+ sha256 = "f0622aa67ad0028e28bd6129688aab8946fb49492f0b335f6624ab7d4ef239d7";
+ name = "konqueror-20.08.2.tar.xz";
};
};
konquest = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/konquest-20.08.1.tar.xz";
- sha256 = "cad87dd698bd1ebc0279216614f7fa7c3d3f36d545683a69f1ceafe9e279bbfe";
- name = "konquest-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/konquest-20.08.2.tar.xz";
+ sha256 = "cf97a6961b15b39f5bcdf541e52c137f1d67d0fa5ee259922b4e762edc4491eb";
+ name = "konquest-20.08.2.tar.xz";
};
};
konsole = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/konsole-20.08.1.tar.xz";
- sha256 = "bdd82f9104b2f76c53bdbdef613391719b70719a132d24f12e5f620e1c9313d1";
- name = "konsole-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/konsole-20.08.2.tar.xz";
+ sha256 = "af08ac7666f1ba7c407205f32aaaf015329621247502e80d8df4abe103148951";
+ name = "konsole-20.08.2.tar.xz";
};
};
kontact = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kontact-20.08.1.tar.xz";
- sha256 = "36c33eb5685c22f94257e86ff760d1aa225ae6e2d69402a2b653c54627c7cbde";
- name = "kontact-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kontact-20.08.2.tar.xz";
+ sha256 = "232d9880df74ce0c7697f08b53ef9512ac9c11c3b04142ba7ba4b95091cb5396";
+ name = "kontact-20.08.2.tar.xz";
};
};
kontactinterface = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kontactinterface-20.08.1.tar.xz";
- sha256 = "8272d0c17423a15e56e9e6d3979ee3017fd02ed996b8b6902c47312276ffeb51";
- name = "kontactinterface-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kontactinterface-20.08.2.tar.xz";
+ sha256 = "72d53dbea9db0b1f5654e13c18b4da3d256c6b9d08dfe4581cdf73e3552d2a07";
+ name = "kontactinterface-20.08.2.tar.xz";
};
};
kopete = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kopete-20.08.1.tar.xz";
- sha256 = "9846baae28d723963927d231716e2a8bc19795bac920958b688b48394ef5bc05";
- name = "kopete-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kopete-20.08.2.tar.xz";
+ sha256 = "05f5d6236d4c96b9ce7ba5f24f4e06d7263a78cac27368a7e6b3e5075d42fbb1";
+ name = "kopete-20.08.2.tar.xz";
};
};
korganizer = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/korganizer-20.08.1.tar.xz";
- sha256 = "e693d895b36575f2a73c36ceaafadf81465bbf9b03c74da27f5273a2e7e3670e";
- name = "korganizer-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/korganizer-20.08.2.tar.xz";
+ sha256 = "4f719ec12c52fc313997a187439dc6888fd030a4a1b2357db000abc0a19527b2";
+ name = "korganizer-20.08.2.tar.xz";
};
};
kpat = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kpat-20.08.1.tar.xz";
- sha256 = "2c23ee028c03c5c210b110a2ad253aa7d91c5a0abcb101eb2b3f4c640092463c";
- name = "kpat-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kpat-20.08.2.tar.xz";
+ sha256 = "e4aaed4e876212a926a05d252dab9d01f240d829e383c6072e168a4f78e6d446";
+ name = "kpat-20.08.2.tar.xz";
};
};
kpimtextedit = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kpimtextedit-20.08.1.tar.xz";
- sha256 = "2664e6cbe520fa345e18db071dd5b8a5b4cf9b0fc7317eb04849005228666189";
- name = "kpimtextedit-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kpimtextedit-20.08.2.tar.xz";
+ sha256 = "2dfbcdd53669c812234346b4d31b61af9c510bb4cb0b9912decea8d3c4d406a6";
+ name = "kpimtextedit-20.08.2.tar.xz";
};
};
kpkpass = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kpkpass-20.08.1.tar.xz";
- sha256 = "76012e5bdd4cc434313a0f311acec8f7c798542008cd8efa71fcdf04fb77e55b";
- name = "kpkpass-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kpkpass-20.08.2.tar.xz";
+ sha256 = "ed699c75128ef299f06d699c80c69ac9529fa044db6f18a39d54a5e70d85108c";
+ name = "kpkpass-20.08.2.tar.xz";
};
};
kqtquickcharts = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kqtquickcharts-20.08.1.tar.xz";
- sha256 = "ea931bfefcc04bee03bff2498b92ca1a390967bbc5366c739d1a7cde6bb75820";
- name = "kqtquickcharts-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kqtquickcharts-20.08.2.tar.xz";
+ sha256 = "2ba593a65c143cb56a3030f7ee0cced2df7c7e9431cebf1ae93be51c68b4c3b4";
+ name = "kqtquickcharts-20.08.2.tar.xz";
};
};
krdc = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/krdc-20.08.1.tar.xz";
- sha256 = "7b1fa57be31a3534099e7f203ef9afde23c86c4bbed1072a9d1164a3cf5e1e20";
- name = "krdc-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/krdc-20.08.2.tar.xz";
+ sha256 = "52ddd68bdb1b356be341cf3bc5405cb965f4e4f3da8bf4b28bfb62c7db21ac5f";
+ name = "krdc-20.08.2.tar.xz";
};
};
kreversi = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kreversi-20.08.1.tar.xz";
- sha256 = "5da68ddd37f5dbd4e1c94d1641c69f0e9b4e99eff3cdafcdcbac1139ca517315";
- name = "kreversi-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kreversi-20.08.2.tar.xz";
+ sha256 = "22824dca9c8f07145a6fd9b7386867d8a8efff0fda6752f377230381a1cc71c2";
+ name = "kreversi-20.08.2.tar.xz";
};
};
krfb = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/krfb-20.08.1.tar.xz";
- sha256 = "a80b9bab47f2a7299e33b0e2a10b117605ec1cc572ca72e914c7f01dde383eda";
- name = "krfb-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/krfb-20.08.2.tar.xz";
+ sha256 = "5e90fb4f3bcf2c48b15ec33634d61464323ab5ce1c156a499f089d862dd041d4";
+ name = "krfb-20.08.2.tar.xz";
};
};
kross-interpreters = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kross-interpreters-20.08.1.tar.xz";
- sha256 = "1fb7d75d83e63d1a7147468dd25eeb6aeb06b4679f126c658a8b40ef257f9a4e";
- name = "kross-interpreters-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kross-interpreters-20.08.2.tar.xz";
+ sha256 = "82da0302d2d292e86fa924c8bd1d4effb21f763c42c57affaddeff4777c43951";
+ name = "kross-interpreters-20.08.2.tar.xz";
};
};
kruler = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kruler-20.08.1.tar.xz";
- sha256 = "a9a1f3bd7b02416a393826f7bb810211ef2e14a3628706de735cb88e791d72d1";
- name = "kruler-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kruler-20.08.2.tar.xz";
+ sha256 = "ede45d9cdf1b514fb20ed3a97877689ec75904438b94735706eb638ba01ca778";
+ name = "kruler-20.08.2.tar.xz";
};
};
kshisen = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kshisen-20.08.1.tar.xz";
- sha256 = "d53af415ed2f4d202f5a6f965408e39062e39f43acf83b9550b6cf2ecc1f7641";
- name = "kshisen-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kshisen-20.08.2.tar.xz";
+ sha256 = "d11030b101a409324661adf664d4298f34cc320abff80dba72d112cc3ae2d25d";
+ name = "kshisen-20.08.2.tar.xz";
};
};
ksirk = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/ksirk-20.08.1.tar.xz";
- sha256 = "763d3a8f518365391d2a04943f6efa9c73c388b7701deff300e9e42e4efe848f";
- name = "ksirk-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/ksirk-20.08.2.tar.xz";
+ sha256 = "b7766f0976b3cc112d4c599d91c07d321829c9b1e8ef34d3d21ec4964026854a";
+ name = "ksirk-20.08.2.tar.xz";
};
};
ksmtp = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/ksmtp-20.08.1.tar.xz";
- sha256 = "608d395cd1a046810ebd00f990d6f7c63d66677e7293ef06948ab9d336d2f08f";
- name = "ksmtp-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/ksmtp-20.08.2.tar.xz";
+ sha256 = "5f51e0c025b192719709ae763feeac94df893007b62b5a69b7b95ae9f2fdd8ee";
+ name = "ksmtp-20.08.2.tar.xz";
};
};
ksnakeduel = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/ksnakeduel-20.08.1.tar.xz";
- sha256 = "25bb5cfe2ed480b8ee31d9fe2e62272d77e7b8667748eb4f2c855901f718784f";
- name = "ksnakeduel-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/ksnakeduel-20.08.2.tar.xz";
+ sha256 = "b6f0f51f8fad795cd134f9426b1f1ba8ccceb72e304e8ba55e60af471ad282cc";
+ name = "ksnakeduel-20.08.2.tar.xz";
};
};
kspaceduel = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kspaceduel-20.08.1.tar.xz";
- sha256 = "382def18d1ce6a4333fb47bcd87aed6837382a2b0da2cb8b835d0b34eaed9e38";
- name = "kspaceduel-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kspaceduel-20.08.2.tar.xz";
+ sha256 = "62b9526c031662c049aa90b06ed3e5e2ce8ae774f271e1f29430f23c1f6cd787";
+ name = "kspaceduel-20.08.2.tar.xz";
};
};
ksquares = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/ksquares-20.08.1.tar.xz";
- sha256 = "163c5c070643e31594ada4e812433eb5f615ef425dddafd515e6c445d821f319";
- name = "ksquares-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/ksquares-20.08.2.tar.xz";
+ sha256 = "e1f9fdfa9a4a8348a65e66d48b7389784a1db6c8799cea453d6da3a2a57aca59";
+ name = "ksquares-20.08.2.tar.xz";
};
};
ksudoku = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/ksudoku-20.08.1.tar.xz";
- sha256 = "e53b694b340f812cd3bdf5126a32a1e71efe0785897c5d15f9e28c68fd794840";
- name = "ksudoku-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/ksudoku-20.08.2.tar.xz";
+ sha256 = "6fed393f734eb27d6c36ad7516bf29ff648d319f08d9f8bdc17a8030842d8e33";
+ name = "ksudoku-20.08.2.tar.xz";
};
};
ksystemlog = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/ksystemlog-20.08.1.tar.xz";
- sha256 = "e0e8bc1cf8ee229206c8a65e30979ba8b72426c8dc2f737f6fecb0dfb36ed21a";
- name = "ksystemlog-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/ksystemlog-20.08.2.tar.xz";
+ sha256 = "63c6a520b63f148de2e3996250a2fef22e1a3ce18e744a699ae21de96a2c4e53";
+ name = "ksystemlog-20.08.2.tar.xz";
};
};
kteatime = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kteatime-20.08.1.tar.xz";
- sha256 = "23cc14f587e4ae4e3b56f1fb7a2093301df740328e35b25d7fca55d35f012ce5";
- name = "kteatime-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kteatime-20.08.2.tar.xz";
+ sha256 = "d8e69fdb124e8689c72e4b9fe39226cc49b1ca990478fbb68e02b37f0cd861ac";
+ name = "kteatime-20.08.2.tar.xz";
};
};
ktimer = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/ktimer-20.08.1.tar.xz";
- sha256 = "9c7062f9ee64ff49a7c7773fe41cee0899e30f1f47368af73da067e51db6714b";
- name = "ktimer-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/ktimer-20.08.2.tar.xz";
+ sha256 = "69293b7296643c6543d0646d14f9c75479f29f129924258957a407b77539a4c2";
+ name = "ktimer-20.08.2.tar.xz";
};
};
ktnef = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/ktnef-20.08.1.tar.xz";
- sha256 = "433b232a0c835e7f27c06e6d19856e4f8690c3e3b5c5d63f85172897b2448c81";
- name = "ktnef-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/ktnef-20.08.2.tar.xz";
+ sha256 = "ab73736e386c2b52a14fb56f1184479ed1c83c0571e9e8518d2b94b1dcd2e47d";
+ name = "ktnef-20.08.2.tar.xz";
};
};
ktouch = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/ktouch-20.08.1.tar.xz";
- sha256 = "e098ebbccca743f678103a9adf54fc388fa4379cc6f667e48259d0b50f56b5fb";
- name = "ktouch-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/ktouch-20.08.2.tar.xz";
+ sha256 = "1b073a92343c9a2c772cfaac4e9fa7b6e85750586e3a57da413e33cdba34b5f4";
+ name = "ktouch-20.08.2.tar.xz";
};
};
ktp-accounts-kcm = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/ktp-accounts-kcm-20.08.1.tar.xz";
- sha256 = "b71f2f654c3cf48e4b4b037a0ae8f6fef5bac9c3483458c0eadf7b3253577504";
- name = "ktp-accounts-kcm-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/ktp-accounts-kcm-20.08.2.tar.xz";
+ sha256 = "df709ee612ff4c71a43197762b8a9d296b5a43f6e0afe4d9c8d0bd88eef81465";
+ name = "ktp-accounts-kcm-20.08.2.tar.xz";
};
};
ktp-approver = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/ktp-approver-20.08.1.tar.xz";
- sha256 = "51296f4d84585ba63d4c72cdbdee6e2b436a1aff8ce6b475a8c9a81766856b39";
- name = "ktp-approver-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/ktp-approver-20.08.2.tar.xz";
+ sha256 = "054db02db679d0a4600632700cdd57cae539159a0a8f01f479ea337d33d8a6bd";
+ name = "ktp-approver-20.08.2.tar.xz";
};
};
ktp-auth-handler = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/ktp-auth-handler-20.08.1.tar.xz";
- sha256 = "6c1c006a3381caeebdfc37886b91b598153f3778567303d8a031e84599c9d582";
- name = "ktp-auth-handler-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/ktp-auth-handler-20.08.2.tar.xz";
+ sha256 = "a61557efa800d42fd8ed14efdb09d43310212976d737a4fd5272f502bacbc371";
+ name = "ktp-auth-handler-20.08.2.tar.xz";
};
};
ktp-call-ui = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/ktp-call-ui-20.08.1.tar.xz";
- sha256 = "feb783be10b0792cb0c59456a00607b2d595e8bef90f0b4ec79dd070596d413c";
- name = "ktp-call-ui-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/ktp-call-ui-20.08.2.tar.xz";
+ sha256 = "ecd38d8b9f24cf620b8c9c1935328af3142199c6aa87e69c734e43096e492ac5";
+ name = "ktp-call-ui-20.08.2.tar.xz";
};
};
ktp-common-internals = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/ktp-common-internals-20.08.1.tar.xz";
- sha256 = "5750bde4950fbe26f06a306aa642c9c501d4f0e1b41b57234d9e36b189a91d1b";
- name = "ktp-common-internals-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/ktp-common-internals-20.08.2.tar.xz";
+ sha256 = "807fcd6f9c415a0799057435f997e143e9584a94577f9afaa7fcc6a4197e7cb0";
+ name = "ktp-common-internals-20.08.2.tar.xz";
};
};
ktp-contact-list = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/ktp-contact-list-20.08.1.tar.xz";
- sha256 = "809db5ff05c1ec632109be408cef987532193b1b0bea69d6a9286c12ccfe19a1";
- name = "ktp-contact-list-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/ktp-contact-list-20.08.2.tar.xz";
+ sha256 = "214d73532dc855a8a4b68730adf5cbd046aae89f2ee2ad5d9a4c25b4eff6acb0";
+ name = "ktp-contact-list-20.08.2.tar.xz";
};
};
ktp-contact-runner = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/ktp-contact-runner-20.08.1.tar.xz";
- sha256 = "a9e761fd35545cfffade088e33f4358e2743416f61e9ba490f21f3b04193158f";
- name = "ktp-contact-runner-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/ktp-contact-runner-20.08.2.tar.xz";
+ sha256 = "8e40e4ab7ce2c1c382b109a15f88f5e1c7d147c76ed36ca05ef6d9f3f58d3d45";
+ name = "ktp-contact-runner-20.08.2.tar.xz";
};
};
ktp-desktop-applets = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/ktp-desktop-applets-20.08.1.tar.xz";
- sha256 = "d6ffd4b29c4fb977937cb47d55d023012be1a9b3602dd1f1628eba7d8c9167cd";
- name = "ktp-desktop-applets-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/ktp-desktop-applets-20.08.2.tar.xz";
+ sha256 = "b0884360be80f89dee3852b023055220e3cdab2f422cc3812eda31169fba6298";
+ name = "ktp-desktop-applets-20.08.2.tar.xz";
};
};
ktp-filetransfer-handler = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/ktp-filetransfer-handler-20.08.1.tar.xz";
- sha256 = "35495c1d18a7b65496fcf17cade4a81e4795b1603c380c036dda0a7626f66312";
- name = "ktp-filetransfer-handler-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/ktp-filetransfer-handler-20.08.2.tar.xz";
+ sha256 = "c2ec5fd2a5746dd8ce1371c503c51feee206d8dfe7ca8cdaa71b8e925636a97c";
+ name = "ktp-filetransfer-handler-20.08.2.tar.xz";
};
};
ktp-kded-module = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/ktp-kded-module-20.08.1.tar.xz";
- sha256 = "247e4047e3955e21066ec461a5374d1b3d925bb92b42adc46d3711e542ad7e04";
- name = "ktp-kded-module-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/ktp-kded-module-20.08.2.tar.xz";
+ sha256 = "307285b2d4e04c244691a6f2a285aec8ada26e0b01eb1fdbf2bc1da57b05828a";
+ name = "ktp-kded-module-20.08.2.tar.xz";
};
};
ktp-send-file = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/ktp-send-file-20.08.1.tar.xz";
- sha256 = "b3786c6e6f09ea086c2d94d2a6dd653e45bab8f984c6287c39f5e0134d6ffee1";
- name = "ktp-send-file-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/ktp-send-file-20.08.2.tar.xz";
+ sha256 = "6c3fb09112d439ce2f0db3acdbc766e8a914d4dc7cbb6ab709922f8e95f2f0e1";
+ name = "ktp-send-file-20.08.2.tar.xz";
};
};
ktp-text-ui = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/ktp-text-ui-20.08.1.tar.xz";
- sha256 = "5cdb88f55b6ca1a1053b8d5b2604eff681c5f3558f0c8037034c264793de8c02";
- name = "ktp-text-ui-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/ktp-text-ui-20.08.2.tar.xz";
+ sha256 = "0f10612e08bc1ee04fb0a538337d760d7b79b5dac37bb58275998d16dbb5415c";
+ name = "ktp-text-ui-20.08.2.tar.xz";
};
};
ktuberling = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/ktuberling-20.08.1.tar.xz";
- sha256 = "62d3d8db7b1db7f9d58df44acf61342ce42fb081038fc48f8f6e45d9167ceaa6";
- name = "ktuberling-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/ktuberling-20.08.2.tar.xz";
+ sha256 = "f9e4a0de3b92d015f8e7b862badf4bbf11b3ce2727aa607384a009247e7b7fad";
+ name = "ktuberling-20.08.2.tar.xz";
};
};
kturtle = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kturtle-20.08.1.tar.xz";
- sha256 = "c261fdf44b36aaa278b4b9752a0d989facec3768853606e5c0b8a86d9d01edb3";
- name = "kturtle-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kturtle-20.08.2.tar.xz";
+ sha256 = "ca9bf47b2ec34744492f218c922b10d613b19fbbd2c75b6ddba157eef21337c7";
+ name = "kturtle-20.08.2.tar.xz";
};
};
kubrick = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kubrick-20.08.1.tar.xz";
- sha256 = "c0c017f6913f94224e18df7d96ba9ad92f51522a331b77f5722f2d2c953c342c";
- name = "kubrick-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kubrick-20.08.2.tar.xz";
+ sha256 = "02fed26a7246feffd668fbda939893295557c0571da64fdf195db93474653224";
+ name = "kubrick-20.08.2.tar.xz";
};
};
kwalletmanager = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kwalletmanager-20.08.1.tar.xz";
- sha256 = "b5a134db6b6bceb802c6c45915636bcd95fea5b6846cfd022917405f48cc92c5";
- name = "kwalletmanager-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kwalletmanager-20.08.2.tar.xz";
+ sha256 = "7950e250c5351a9b8e3b36165fa2003baa044bb2d3553a32360000a322bddad8";
+ name = "kwalletmanager-20.08.2.tar.xz";
};
};
kwave = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kwave-20.08.1.tar.xz";
- sha256 = "3791f9401271c23d3ababd14e4c1e6acfe58df2100331e31ba61453feaf9fa32";
- name = "kwave-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kwave-20.08.2.tar.xz";
+ sha256 = "6e15a67022ef96f07b9825139cc7aaacbc6f60729570c31ce6cb25184602b434";
+ name = "kwave-20.08.2.tar.xz";
};
};
kwordquiz = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/kwordquiz-20.08.1.tar.xz";
- sha256 = "77d2d30abcb37ee6a8e0b121ed1969f2fa61eb32814f49a0186043a4e8f1a71c";
- name = "kwordquiz-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/kwordquiz-20.08.2.tar.xz";
+ sha256 = "57aa012f3aad128579f067668db1344306e2e23d6a89b47d413d6eee0da0e238";
+ name = "kwordquiz-20.08.2.tar.xz";
};
};
libgravatar = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/libgravatar-20.08.1.tar.xz";
- sha256 = "dfe95055869944b79b1f4120f013b547225b02b69c7e410fd09d52469a892263";
- name = "libgravatar-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/libgravatar-20.08.2.tar.xz";
+ sha256 = "4c0a2eb073ef42a26813b93bd76aaa9e26a040a966329e6e3cf371d7de1e55f7";
+ name = "libgravatar-20.08.2.tar.xz";
};
};
libkcddb = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/libkcddb-20.08.1.tar.xz";
- sha256 = "1519c9248b46d95d8761a8ed22b0805964a5fef5aa665710b08851c753f70590";
- name = "libkcddb-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/libkcddb-20.08.2.tar.xz";
+ sha256 = "545cf54ac454845c524ba7cd7ec289ac952fa1ce2bbae01411ba71c66a5ed08a";
+ name = "libkcddb-20.08.2.tar.xz";
};
};
libkcompactdisc = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/libkcompactdisc-20.08.1.tar.xz";
- sha256 = "f43b8129a0083686dbc939387931867d9d65e14936f2a86be0a7286e01cf1974";
- name = "libkcompactdisc-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/libkcompactdisc-20.08.2.tar.xz";
+ sha256 = "37534f67af69775d6f786917920d2810a5d20f28df57e1a17aee9a7b30bbe302";
+ name = "libkcompactdisc-20.08.2.tar.xz";
};
};
libkdcraw = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/libkdcraw-20.08.1.tar.xz";
- sha256 = "3431810972d886635ba6249ac86a9442a9c3a3333eb0b27533fc459e757e9eb1";
- name = "libkdcraw-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/libkdcraw-20.08.2.tar.xz";
+ sha256 = "6fbf1a5ca5a439fabb01648cde4b57e1f3de2372b7f3b56ccae03f653490f1b2";
+ name = "libkdcraw-20.08.2.tar.xz";
};
};
libkdegames = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/libkdegames-20.08.1.tar.xz";
- sha256 = "6ab0b143dcba2d935dd0182c9154657ebbfb205c28bc86e2e13875b58e23737d";
- name = "libkdegames-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/libkdegames-20.08.2.tar.xz";
+ sha256 = "d9f0ab87dc4671a55ad8d2b7d3a54cbc444201c11ebae436e0107fe7067fb983";
+ name = "libkdegames-20.08.2.tar.xz";
};
};
libkdepim = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/libkdepim-20.08.1.tar.xz";
- sha256 = "a2fb769239283e7f536d4779089ad8664d1498cf7520f057589bf0285630fb4b";
- name = "libkdepim-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/libkdepim-20.08.2.tar.xz";
+ sha256 = "3558c9af95c22bb4ce0ceeec483fada9e8e9f27de4ac34ffe44a4eb3b6d21101";
+ name = "libkdepim-20.08.2.tar.xz";
};
};
libkeduvocdocument = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/libkeduvocdocument-20.08.1.tar.xz";
- sha256 = "ecd158beb7fcc1a5d540d956669c6fdce6172f4b282755170d2791076d75ad84";
- name = "libkeduvocdocument-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/libkeduvocdocument-20.08.2.tar.xz";
+ sha256 = "ef8e0b359e3cf1b3303da3795add1ced405d230f51895abe10d5a7989be03923";
+ name = "libkeduvocdocument-20.08.2.tar.xz";
};
};
libkexiv2 = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/libkexiv2-20.08.1.tar.xz";
- sha256 = "67310ae90d89f26d2ae98ede8fa973e27ea1ce3d15c389954d391cd058543979";
- name = "libkexiv2-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/libkexiv2-20.08.2.tar.xz";
+ sha256 = "793c4d11bb1b60beca7b25a2427650b3f358364c55be022dfd4a7ccfd889578d";
+ name = "libkexiv2-20.08.2.tar.xz";
};
};
libkgapi = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/libkgapi-20.08.1.tar.xz";
- sha256 = "dfa9003556a01ef19eda186973f87356d32ea8f82f8d653803b2cc935f077127";
- name = "libkgapi-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/libkgapi-20.08.2.tar.xz";
+ sha256 = "f3fb015e8b8ac92c138e8a59e8e8b9333500e0ea314180cc1ad14e31248312df";
+ name = "libkgapi-20.08.2.tar.xz";
};
};
libkgeomap = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/libkgeomap-20.08.1.tar.xz";
- sha256 = "a210945b6807efca3390173233269aa31f27a23b5f36670b88f66b3b28df846f";
- name = "libkgeomap-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/libkgeomap-20.08.2.tar.xz";
+ sha256 = "7149095aa0df4e3a184bb2a6fb8322e27e3a34eb3bc40cf370a09b21fb2a6ea0";
+ name = "libkgeomap-20.08.2.tar.xz";
};
};
libkipi = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/libkipi-20.08.1.tar.xz";
- sha256 = "4722ab563c1350042920d1937b84fdd38b5779449a2d9b689328cd82241cb5d2";
- name = "libkipi-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/libkipi-20.08.2.tar.xz";
+ sha256 = "87ffa30b23779313a94953afe57d1b19515c3a2f311a2dea6449c9d96b09e5b1";
+ name = "libkipi-20.08.2.tar.xz";
};
};
libkleo = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/libkleo-20.08.1.tar.xz";
- sha256 = "78c1dc2e4d7177aaf37cb1c706d9c21b08fac7d130ac1da3d3f2a6f083117ffb";
- name = "libkleo-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/libkleo-20.08.2.tar.xz";
+ sha256 = "34537b35e22cef85650ae6f9bf197518bb5a59e9614d6d86ba86f085fddd97c4";
+ name = "libkleo-20.08.2.tar.xz";
};
};
libkmahjongg = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/libkmahjongg-20.08.1.tar.xz";
- sha256 = "5a8674921e39b38655d1f95340831b1bc746047cbad8501706436f5dacf47fc2";
- name = "libkmahjongg-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/libkmahjongg-20.08.2.tar.xz";
+ sha256 = "032ac6d9e96cd9156f5153c01f881d0e442fda9de90398df320846095ba2c40a";
+ name = "libkmahjongg-20.08.2.tar.xz";
};
};
libkomparediff2 = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/libkomparediff2-20.08.1.tar.xz";
- sha256 = "9d109dfea1433602cdabc89ffa5f522147befc9b1d6d9760549aba7db5dbd399";
- name = "libkomparediff2-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/libkomparediff2-20.08.2.tar.xz";
+ sha256 = "91b0b72d5c4e2ddd863636cca299660bfbb5b7a55773cbc51000fe9c1ca91a98";
+ name = "libkomparediff2-20.08.2.tar.xz";
};
};
libksane = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/libksane-20.08.1.tar.xz";
- sha256 = "0d8717ad004a2480aea232d9a2317b4d1cc4678d53f0176bdaeb411eedd19dbe";
- name = "libksane-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/libksane-20.08.2.tar.xz";
+ sha256 = "21bb577d78e020281dfc6c993ab7fe286d648e72c851e45463a32969fbb35aa6";
+ name = "libksane-20.08.2.tar.xz";
};
};
libksieve = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/libksieve-20.08.1.tar.xz";
- sha256 = "a1defe888c6c5a3c16ef6fad39d9eb94bc784031079763f004048951820acec0";
- name = "libksieve-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/libksieve-20.08.2.tar.xz";
+ sha256 = "589e4dc27d1d91d8c16879fa99aab45f3847a74e3e9357e3e037503e5515ee2e";
+ name = "libksieve-20.08.2.tar.xz";
};
};
lokalize = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/lokalize-20.08.1.tar.xz";
- sha256 = "a4a3e5703d39ae8fe12d2ff832e99b3339ba1c8ec8d2439abeb348e687f1eae9";
- name = "lokalize-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/lokalize-20.08.2.tar.xz";
+ sha256 = "c11616bc02763fb1f3b1abf0b2ba70d0c6c550435c94ff25c5096f9a90375e23";
+ name = "lokalize-20.08.2.tar.xz";
};
};
lskat = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/lskat-20.08.1.tar.xz";
- sha256 = "319d611468b969b3bb62731a0aa04c5672bb689c41adf5545dfa8b9742668775";
- name = "lskat-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/lskat-20.08.2.tar.xz";
+ sha256 = "78f152f7af46345f65c3800f9c591fb204e917595c1f803c9c15148ef39c42b8";
+ name = "lskat-20.08.2.tar.xz";
};
};
mailcommon = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/mailcommon-20.08.1.tar.xz";
- sha256 = "d4ee996f74a749ad626ca5029821546da82dbfc1c81864ff39b5f51d6dcf1d88";
- name = "mailcommon-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/mailcommon-20.08.2.tar.xz";
+ sha256 = "a4170ab9ff7680fb26c61474f42d5424716f4e91c1a5e9275cc1222491c9564d";
+ name = "mailcommon-20.08.2.tar.xz";
};
};
mailimporter = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/mailimporter-20.08.1.tar.xz";
- sha256 = "dcf2b94d4f66be2b339b31dfebef7af373e0cf59f09e4cfb664eb828e1d4f73f";
- name = "mailimporter-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/mailimporter-20.08.2.tar.xz";
+ sha256 = "a255b60378c1cf77e517919d072cb44bd8c25e8ed8f07429763bb7915b3cc711";
+ name = "mailimporter-20.08.2.tar.xz";
};
};
marble = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/marble-20.08.1.tar.xz";
- sha256 = "96b019a41ae4e0aaab59950b6be040bd2145f130190b8c0dea436c791e3192ed";
- name = "marble-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/marble-20.08.2.tar.xz";
+ sha256 = "f44ac10de33dc31ce1cb99635131fe2c7bf3f60f09204b2061f81042a725475c";
+ name = "marble-20.08.2.tar.xz";
};
};
mbox-importer = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/mbox-importer-20.08.1.tar.xz";
- sha256 = "262c8805539b7c766099c6287d1dbf88161afe6d32c1c6821ebe63cff4fe3b71";
- name = "mbox-importer-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/mbox-importer-20.08.2.tar.xz";
+ sha256 = "3b3bee33683c534974255616f3b2f3baebf85363b2c24bbee9cc195ddf35ca9a";
+ name = "mbox-importer-20.08.2.tar.xz";
};
};
messagelib = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/messagelib-20.08.1.tar.xz";
- sha256 = "fc41124e905456a3c5227ca6154dc3e77620e307458fbb19f5421cbfb04523b3";
- name = "messagelib-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/messagelib-20.08.2.tar.xz";
+ sha256 = "5cf3a3f2b6473e60a7c2af10aa4eb1cfba25a4786132ee87b657b0dafb9f5028";
+ name = "messagelib-20.08.2.tar.xz";
};
};
minuet = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/minuet-20.08.1.tar.xz";
- sha256 = "a640025550337f415f7bfaaad7f6ef7de667dd054131be2c313d894c3f6703ea";
- name = "minuet-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/minuet-20.08.2.tar.xz";
+ sha256 = "24383168e2a0b7b319ecb37e2b1f3b039ad790a7e0f49385657f049565f1ef84";
+ name = "minuet-20.08.2.tar.xz";
};
};
okular = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/okular-20.08.1.tar.xz";
- sha256 = "77b5d8e410a2a008ea63f60a561f99053ec07d92da6ee3afaeefd977aadebd83";
- name = "okular-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/okular-20.08.2.tar.xz";
+ sha256 = "6f1885ed8050a55bb2cbf05089b452f555852e003ec7fe89fe472c0dbc92e65b";
+ name = "okular-20.08.2.tar.xz";
};
};
palapeli = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/palapeli-20.08.1.tar.xz";
- sha256 = "31b847caa89b998dfa580553d96c656b05f2d85fdd88f0ba71e953762cefac90";
- name = "palapeli-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/palapeli-20.08.2.tar.xz";
+ sha256 = "a31b0db2f3e77eac8f527d26f8ed0400fe5bcdb3a3970b925f14886bd1bcd63e";
+ name = "palapeli-20.08.2.tar.xz";
};
};
parley = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/parley-20.08.1.tar.xz";
- sha256 = "9617a90c2d4f9ab5d928febc6bcd10c9023dcc10e9f1202bfb97b77019948f0c";
- name = "parley-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/parley-20.08.2.tar.xz";
+ sha256 = "cf2f00925730d8baec66d422f058e4b3e979678e79c57898ceffd8650720bda6";
+ name = "parley-20.08.2.tar.xz";
};
};
picmi = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/picmi-20.08.1.tar.xz";
- sha256 = "027e37a2c9dcf828684a0f8ffdcfc6451a2bd62976c10d990e471fa0f5ba97c3";
- name = "picmi-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/picmi-20.08.2.tar.xz";
+ sha256 = "35f2bf3d8375618f97aee01c8f2421521b2cd5c11d7b14fc9a376026d74c82a5";
+ name = "picmi-20.08.2.tar.xz";
};
};
pimcommon = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/pimcommon-20.08.1.tar.xz";
- sha256 = "58a33349bf932076f6be343ae64e23f146e2a6a96e3af8ce68dbd752f2c80dd9";
- name = "pimcommon-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/pimcommon-20.08.2.tar.xz";
+ sha256 = "cba9e66153d36debe3f046363af7ff40a4ba263f33bfe20c7ec10b5bf9183deb";
+ name = "pimcommon-20.08.2.tar.xz";
};
};
pim-data-exporter = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/pim-data-exporter-20.08.1.tar.xz";
- sha256 = "54092763e4b951f4e90a217c876107900e0706da68ca5517184e5da258ae95ec";
- name = "pim-data-exporter-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/pim-data-exporter-20.08.2.tar.xz";
+ sha256 = "54b09a3f763004c805cc0dce8ab2e665116b7ef29419f22ad413aa250dcb4ac0";
+ name = "pim-data-exporter-20.08.2.tar.xz";
};
};
pim-sieve-editor = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/pim-sieve-editor-20.08.1.tar.xz";
- sha256 = "f788038796f226bfe426835fc6f186e23f2c7f9fda8316dfa6af307d6936d4ad";
- name = "pim-sieve-editor-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/pim-sieve-editor-20.08.2.tar.xz";
+ sha256 = "e8c590a0fddc5292172115b11fb75c5f847347079100617dbf321875642d7098";
+ name = "pim-sieve-editor-20.08.2.tar.xz";
};
};
poxml = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/poxml-20.08.1.tar.xz";
- sha256 = "9f4bcafc664532706fe634ce8b0f410619d5e3c285526a7b61969155d75bbad2";
- name = "poxml-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/poxml-20.08.2.tar.xz";
+ sha256 = "67d260349489e92ebce20253f9a3ccde5bb75eb13eb4d1a08a86c18c82e4a2a9";
+ name = "poxml-20.08.2.tar.xz";
};
};
print-manager = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/print-manager-20.08.1.tar.xz";
- sha256 = "52d41ca3ae69e6e8e1eb4ddf1d516868dc436e81779053efdea5e3819545ca5b";
- name = "print-manager-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/print-manager-20.08.2.tar.xz";
+ sha256 = "de21f8c428198b906f4ae438d6ced8d707b12c15578409c2aa2f7b2f73feb990";
+ name = "print-manager-20.08.2.tar.xz";
};
};
rocs = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/rocs-20.08.1.tar.xz";
- sha256 = "3c5f764f06f6f5b7c68523be4fdd37e75b2249e0b15001bc39e55051d9e271ef";
- name = "rocs-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/rocs-20.08.2.tar.xz";
+ sha256 = "2d8efd62b89dd36033bb3d818c82fee67e6efa2d2bb98dda0d4eab13baaee485";
+ name = "rocs-20.08.2.tar.xz";
};
};
signon-kwallet-extension = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/signon-kwallet-extension-20.08.1.tar.xz";
- sha256 = "10a0ea806dc63cbf6c6d4794fe596c68355bccb3e08370d70ce7a8e95af448a5";
- name = "signon-kwallet-extension-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/signon-kwallet-extension-20.08.2.tar.xz";
+ sha256 = "a271f4d09511171dcf1ebcdaf0b7205f9ee6a75b20ef0801f36d136f7b4a70dd";
+ name = "signon-kwallet-extension-20.08.2.tar.xz";
};
};
spectacle = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/spectacle-20.08.1.tar.xz";
- sha256 = "4a01b5ef41901ff2e83bb517c2e96a978188b98cb62243eb541a317f57a2bd69";
- name = "spectacle-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/spectacle-20.08.2.tar.xz";
+ sha256 = "9a467ea3b05981d588d39573cca375636b825ad8cab8a36ce48dbbc12425ab0d";
+ name = "spectacle-20.08.2.tar.xz";
};
};
step = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/step-20.08.1.tar.xz";
- sha256 = "6e04930963676b1bfa55ee095914c7491a61bf3963c45ed4157f868175ee6605";
- name = "step-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/step-20.08.2.tar.xz";
+ sha256 = "a52e4b6f281ba1a7afd4ab3ac7307080464147c4052ee222399135fe61ac7958";
+ name = "step-20.08.2.tar.xz";
};
};
svgpart = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/svgpart-20.08.1.tar.xz";
- sha256 = "206c3741464f959ffbaea09bc918fc3e88f32fcf12928cd8c399ab44d4b1f228";
- name = "svgpart-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/svgpart-20.08.2.tar.xz";
+ sha256 = "3a46b5bd9acf5372f73b602d155517f0dff47f3337bd8a46a580aae7480dd771";
+ name = "svgpart-20.08.2.tar.xz";
};
};
sweeper = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/sweeper-20.08.1.tar.xz";
- sha256 = "722c25de8cc74fe7e8310d47a7e794f32e935331f89d4f5249fd045a83ce0431";
- name = "sweeper-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/sweeper-20.08.2.tar.xz";
+ sha256 = "0c255ef15c1e32eb561b26f5b73a6c154730be583efbc5ee713aaed17de14091";
+ name = "sweeper-20.08.2.tar.xz";
};
};
umbrello = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/umbrello-20.08.1.tar.xz";
- sha256 = "d980d67f8a878e01cd3af5499aa843df703f20cdecca8a14b59d87d13c747328";
- name = "umbrello-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/umbrello-20.08.2.tar.xz";
+ sha256 = "0357b44646c750253e3e7ee323b9e49e854c4c8cdf340eb5a11b2d42edfc4cd7";
+ name = "umbrello-20.08.2.tar.xz";
};
};
yakuake = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/yakuake-20.08.1.tar.xz";
- sha256 = "6768a360a3d79080e6e53821460ed27f6c2e47fa11077bbec3213d85385d6fac";
- name = "yakuake-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/yakuake-20.08.2.tar.xz";
+ sha256 = "8a0aa3a97a9fdc781887a6cb6480cba5079cf8aacd3345b63f5eb6be4d91665a";
+ name = "yakuake-20.08.2.tar.xz";
};
};
zeroconf-ioslave = {
- version = "20.08.1";
+ version = "20.08.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.1/src/zeroconf-ioslave-20.08.1.tar.xz";
- sha256 = "ca1685a22922057ba89510d71a11218bf47db0d0313aec2b55aca21932564866";
- name = "zeroconf-ioslave-20.08.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.2/src/zeroconf-ioslave-20.08.2.tar.xz";
+ sha256 = "0ad34f8361ee3ecd669e396265135b534239994d3bec5e9e6a43b7b7bf5c04e4";
+ name = "zeroconf-ioslave-20.08.2.tar.xz";
};
};
}
From d87b88361a5e4bca4f61871bea4fe7fa6019600c Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 28 Oct 2020 16:13:05 +0800
Subject: [PATCH 529/590] okular: add missing dependency
---
pkgs/applications/kde/okular.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix
index 3bcdb9ca8424..288b2ceb807f 100644
--- a/pkgs/applications/kde/okular.nix
+++ b/pkgs/applications/kde/okular.nix
@@ -4,7 +4,7 @@
breeze-icons, chmlib ? null, discount, djvulibre, ebook_tools, kactivities,
karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
kdbusaddons, kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts,
- kpty, kwallet, kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler,
+ kpty, kpurpose, kwallet, kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler,
qca-qt5, qtdeclarative, qtsvg, threadweaver, kcrash
}:
@@ -14,7 +14,7 @@ mkDerivation {
buildInputs = [
breeze-icons discount djvulibre ebook_tools kactivities karchive kbookmarks
kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
- kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kwallet
+ kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kpurpose kwallet
kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5
qtdeclarative qtsvg threadweaver kcrash
] ++ lib.optional (!stdenv.isAarch64) chmlib;
From 0d25246f4dd651f9a82c7c38a872b6042901c89e Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 28 Oct 2020 16:13:31 +0800
Subject: [PATCH 530/590] kdeconnect: part of kdeApplications
---
pkgs/applications/kde/default.nix | 1 +
.../default.nix => kde/kdeconnect-kde.nix} | 78 ++++++++-----------
pkgs/top-level/aliases.nix | 1 +
pkgs/top-level/all-packages.nix | 4 +-
4 files changed, 37 insertions(+), 47 deletions(-)
rename pkgs/applications/{misc/kdeconnect/default.nix => kde/kdeconnect-kde.nix} (71%)
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 9622404c456d..4713c9ecf494 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -107,6 +107,7 @@ let
kcharselect = callPackage ./kcharselect.nix {};
kcolorchooser = callPackage ./kcolorchooser.nix {};
kdebugsettings = callPackage ./kdebugsettings.nix {};
+ kdeconnect-kde = callPackage ./kdeconnect-kde.nix {};
kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/kde/kdeconnect-kde.nix
similarity index 71%
rename from pkgs/applications/misc/kdeconnect/default.nix
rename to pkgs/applications/kde/kdeconnect-kde.nix
index d042f011bb78..a1ebda75a9cc 100644
--- a/pkgs/applications/misc/kdeconnect/default.nix
+++ b/pkgs/applications/kde/kdeconnect-kde.nix
@@ -1,39 +1,32 @@
{ mkDerivation
-, lib
-, fetchurl
-, fetchpatch
, extra-cmake-modules
+, fetchpatch
, kcmutils
, kconfigwidgets
, kdbusaddons
, kdoctools
-, kiconthemes
, ki18n
-, knotifications
-, qca-qt5
-, libfakekey
-, libXtst
-, qtx11extras
-, qtmultimedia
-, qtgraphicaleffects
-, sshfs
-, makeWrapper
-, kwayland
+, kiconthemes
, kio
-, kpeoplevcard
-, kpeople
, kirigami2
+, knotifications
+, kpeople
+, kpeoplevcard
+, kwayland
+, lib
+, libXtst
+, libfakekey
+, makeWrapper
, pulseaudio-qt
+, qca-qt5
+, qtgraphicaleffects
+, qtmultimedia
+, qtx11extras
+, sshfs
}:
-mkDerivation rec {
- pname = "kdeconnect";
- version = "20.08.2";
-
- src = fetchurl {
- url = "https://download.kde.org/stable/release-service/${version}/src/${pname}-kde-${version}.tar.xz";
- sha256 = "0rzfnkgkv759d4pa16qk0sw87wqzwgkd99yzrzfy2zcq423f6hvd";
- };
+mkDerivation {
+ name = "kdeconnect-kde";
patches = [
# https://invent.kde.org/network/kdeconnect-kde/-/merge_requests/328
@@ -44,39 +37,36 @@ mkDerivation rec {
];
buildInputs = [
- libfakekey
- libXtst
- qtmultimedia
- qtgraphicaleffects
- pulseaudio-qt
- kpeoplevcard
- kpeople
- kirigami2
- ki18n
- kiconthemes
kcmutils
kconfigwidgets
kdbusaddons
- knotifications
- qca-qt5
- qtx11extras
- makeWrapper
- kwayland
+ ki18n
+ kiconthemes
kio
+ kirigami2
+ knotifications
+ kpeople
+ kpeoplevcard
+ kwayland
+ libXtst
+ libfakekey
+ pulseaudio-qt
+ qca-qt5
+ qtgraphicaleffects
+ qtmultimedia
+ qtx11extras
];
- nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
postInstall = ''
wrapProgram $out/libexec/kdeconnectd --prefix PATH : ${lib.makeBinPath [ sshfs ]}
'';
- enableParallelBuilding = true;
-
meta = with lib; {
description = "KDE Connect provides several features to integrate your phone and your computer";
- homepage = "https://community.kde.org/KDEConnect";
- license = with licenses; [ gpl2 ];
+ homepage = "https://community.kde.org/KDEConnect";
+ license = with licenses; [ gpl2 ];
maintainers = with maintainers; [ fridh ];
};
}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3538ac56ecfa..eeb5519233ce 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -224,6 +224,7 @@ mapAliases ({
kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16
julia_07 = throw "julia_07 is deprecated in favor of julia_10 LTS"; # added 2020-09-15
julia_11 = throw "julia_11 is deprecated in favor of latest Julia version"; # added 2020-09-15
+ kdeconnect = kdeApplications.kdeconnect-kde; # added 2020-10-28
kdiff3-qt5 = kdiff3; # added 2017-02-18
keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02
keepassx-community = keepassxc; # added 2017-11
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d46ff6b8108..319d24d2e25d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21708,7 +21708,7 @@ in
kaddressbook kalzium kapptemplate kapman kate katomic
kblackbox kblocks kbounce
kcachegrind kcalc kcharselect kcolorchooser
- kdenlive kdf kdialog kdiamond
+ kdeconnect-kde kdenlive kdf kdialog kdiamond
keditbookmarks
kfind kfloppy
kget kgpg
@@ -21733,8 +21733,6 @@ in
k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { };
- kdeconnect = libsForQt512.callPackage ../applications/misc/kdeconnect { };
-
inherit (kdeFrameworks) kdesu;
kdevelop-pg-qt = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { };
From dfd29f9d7c878ab3e2a0bc0e8d8c7a41834fd3cc Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 28 Oct 2020 21:10:17 +0800
Subject: [PATCH 531/590] zanshin: broken before the 20.08.2 upgrade
---
pkgs/applications/office/zanshin/default.nix | 37 ++++++++++++++------
1 file changed, 27 insertions(+), 10 deletions(-)
diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix
index 18e762974964..e3b9408ed96d 100644
--- a/pkgs/applications/office/zanshin/default.nix
+++ b/pkgs/applications/office/zanshin/default.nix
@@ -1,10 +1,18 @@
-{
- mkDerivation, lib,
- fetchurl,
- extra-cmake-modules,
- qtbase, boost,
- akonadi-calendar, akonadi-notes, akonadi-search, kidentitymanagement, kontactinterface, kldap,
- krunner, kwallet, kcalendarcore
+{ mkDerivation
+, lib
+, fetchurl
+, extra-cmake-modules
+, qtbase
+, boost
+, akonadi-calendar
+, akonadi-notes
+, akonadi-search
+, kidentitymanagement
+, kontactinterface
+, kldap
+, krunner
+, kwallet
+, kcalendarcore
}:
mkDerivation rec {
@@ -21,9 +29,17 @@ mkDerivation rec {
];
buildInputs = [
- qtbase boost
- akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface kldap
- krunner kwallet kcalendarcore
+ qtbase
+ boost
+ akonadi-calendar
+ akonadi-notes
+ akonadi-search
+ kidentitymanagement
+ kontactinterface
+ kldap
+ krunner
+ kwallet
+ kcalendarcore
];
meta = with lib; {
@@ -32,5 +48,6 @@ mkDerivation rec {
maintainers = with maintainers; [ zraexy ];
platforms = platforms.linux;
license = licenses.gpl2Plus;
+ broken = true;
};
}
From 05d95cfe79a69cf690cec5d356b37e29d7d13d18 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 29 Oct 2020 07:20:41 +0800
Subject: [PATCH 532/590] kdeconnect: avoid double-wrapping the binary
---
pkgs/applications/kde/kdeconnect-kde.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/kde/kdeconnect-kde.nix b/pkgs/applications/kde/kdeconnect-kde.nix
index a1ebda75a9cc..83e54d1fa80c 100644
--- a/pkgs/applications/kde/kdeconnect-kde.nix
+++ b/pkgs/applications/kde/kdeconnect-kde.nix
@@ -59,9 +59,9 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
- postInstall = ''
- wrapProgram $out/libexec/kdeconnectd --prefix PATH : ${lib.makeBinPath [ sshfs ]}
- '';
+ qtWrapperArgs = [
+ "--prefix PATH : ${lib.makeBinPath [ sshfs ]}"
+ ];
meta = with lib; {
description = "KDE Connect provides several features to integrate your phone and your computer";
From 52c05c879135d9c189831f3805330b5904e2823a Mon Sep 17 00:00:00 2001
From: "Zak B. Elep" <zakame@zakame.net>
Date: Wed, 28 Oct 2020 05:30:02 +0800
Subject: [PATCH 533/590] perlPackages.NetAsyncWebSocket: init at 0.13
---
pkgs/top-level/perl-packages.nix | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 76e391213c3e..8cf13ad08691 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14586,6 +14586,25 @@ let
};
};
+ NetAsyncWebSocket = buildPerlModule {
+ pname = "Net-Async-WebSocket";
+ version = "0.13";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Async-WebSocket-0.13.tar.gz";
+ sha256 = "000nw7gnj7ks55nib3fiikxx9bfmbla6fimxrbn2z2n7sd187b0d";
+ };
+ propagatedBuildInputs = [ IOAsync ProtocolWebSocket URI ];
+ preCheck = stdenv.lib.optionalString stdenv.isDarwin ''
+ # network tests fail on Darwin/sandbox, so disable these
+ rm -f t/02server.t t/03cross.t
+ '';
+ meta = {
+ description = "Use WebSockets with IO::Async";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ maintainers = [ maintainers.zakame ];
+ };
+ };
+
NetAMQP = buildPerlModule {
pname = "Net-AMQP";
version = "0.06";
From c76692192ad25dbbfc9db9cf239f69a8c80a1062 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 29 Oct 2020 13:57:19 -0400
Subject: [PATCH 534/590] nixos ec2/create-amis.sh: shellcheck: quote region
references
---
nixos/maintainers/scripts/ec2/create-amis.sh | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 89e24f2ccfd9..0a0b07577c26 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -1,5 +1,6 @@
#!/usr/bin/env nix-shell
#!nix-shell -p awscli -p jq -p qemu -i bash
+# shellcheck shell=bash
# Uploads and registers NixOS images built from the
# <nixos/release.nix> amazonImage attribute. Images are uploaded and
@@ -111,7 +112,7 @@ wait_for_import() {
log "Waiting for import task $task_id to be completed"
while true; do
read state progress snapshot_id < <(
- aws ec2 describe-import-snapshot-tasks --region $region --import-task-ids "$task_id" | \
+ aws ec2 describe-import-snapshot-tasks --region "$region" --import-task-ids "$task_id" | \
jq -r '.ImportSnapshotTasks[].SnapshotTaskDetail | "\(.Status) \(.Progress) \(.SnapshotId)"'
)
log " ... state=$state progress=$progress snapshot_id=$snapshot_id"
@@ -139,7 +140,7 @@ wait_for_image() {
while true; do
read state < <(
- aws ec2 describe-images --image-ids "$ami_id" --region $region | \
+ aws ec2 describe-images --image-ids "$ami_id" --region "$region" | \
jq -r ".Images[].State"
)
log " ... state=$state"
@@ -163,7 +164,7 @@ make_image_public() {
local region=$1
local ami_id=$2
- wait_for_image $region "$ami_id"
+ wait_for_image "$region" "$ami_id"
log "Making image $ami_id public"
@@ -185,7 +186,7 @@ upload_image() {
log "Checking for image on S3"
if ! aws s3 ls --region "$region" "s3://${bucket}/${aws_path}" >&2; then
log "Image missing from aws, uploading"
- aws s3 cp --region $region "$image_file" "s3://${bucket}/${aws_path}" >&2
+ aws s3 cp --region "$region" "$image_file" "s3://${bucket}/${aws_path}" >&2
fi
log "Importing image from S3 path s3://$bucket/$aws_path"
@@ -197,7 +198,7 @@ upload_image() {
\"S3Bucket\": \"$bucket\",
\"S3Key\": \"$aws_path\"
}
- }" --region $region | jq -r '.ImportTaskId')
+ }" --region "$region" | jq -r '.ImportTaskId')
write_state "$state_key" task_id "$task_id"
fi
@@ -230,7 +231,7 @@ upload_image() {
aws ec2 register-image \
--name "$image_name" \
--description "$image_description" \
- --region $region \
+ --region "$region" \
--architecture $amazon_arch \
--block-device-mappings "${block_device_mappings[@]}" \
"${extra_flags[@]}" \
@@ -240,7 +241,7 @@ upload_image() {
write_state "$state_key" ami_id "$ami_id"
fi
- make_image_public $region "$ami_id"
+ make_image_public "$region" "$ami_id"
echo "$ami_id"
}
@@ -268,7 +269,7 @@ copy_to_region() {
write_state "$state_key" ami_id "$ami_id"
fi
- make_image_public $region "$ami_id"
+ make_image_public "$region" "$ami_id"
echo "$ami_id"
}
From f5994c208df64f3db0f4f69efffb3a2868e688b3 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 29 Oct 2020 13:58:37 -0400
Subject: [PATCH 535/590] nixos ec2/create-amis.sh: shellcheck: quote state_dir
reference
---
nixos/maintainers/scripts/ec2/create-amis.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 0a0b07577c26..6be9cd594006 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -101,7 +101,7 @@ write_state() {
local type=$2
local val=$3
- mkdir -p $state_dir
+ mkdir -p "$state_dir"
echo "$val" > "$state_dir/$state_key.$type"
}
From baf7ed3f2446c433885d0b99ace294b333358183 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 29 Oct 2020 13:59:34 -0400
Subject: [PATCH 536/590] nixos ec2/create-amis.sh: shellcheck: SC2155: Declare
and assign separately to avoid masking return values.
---
nixos/maintainers/scripts/ec2/create-amis.sh | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 6be9cd594006..085de5a647d6 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -178,9 +178,12 @@ upload_image() {
local aws_path=${image_file#/}
local state_key="$region.$image_label.$image_system"
- local task_id=$(read_state "$state_key" task_id)
- local snapshot_id=$(read_state "$state_key" snapshot_id)
- local ami_id=$(read_state "$state_key" ami_id)
+ local task_id
+ task_id=$(read_state "$state_key" task_id)
+ local snapshot_id
+ snapshot_id=$(read_state "$state_key" snapshot_id)
+ local ami_id
+ ami_id=$(read_state "$state_key" ami_id)
if [ -z "$task_id" ]; then
log "Checking for image on S3"
From a66a22ca545ce94a7b69aefe163fea2c20241f9d Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 29 Oct 2020 14:01:22 -0400
Subject: [PATCH 537/590] nixos ec2/create-amis.sh: shellcheck: read without -r
mangles backslashes
---
nixos/maintainers/scripts/ec2/create-amis.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 085de5a647d6..6e2836a7a97d 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -111,7 +111,7 @@ wait_for_import() {
local state snapshot_id
log "Waiting for import task $task_id to be completed"
while true; do
- read state progress snapshot_id < <(
+ read -r state progress snapshot_id < <(
aws ec2 describe-import-snapshot-tasks --region "$region" --import-task-ids "$task_id" | \
jq -r '.ImportSnapshotTasks[].SnapshotTaskDetail | "\(.Status) \(.Progress) \(.SnapshotId)"'
)
@@ -139,7 +139,7 @@ wait_for_image() {
log "Waiting for image $ami_id to be available"
while true; do
- read state < <(
+ read -r state < <(
aws ec2 describe-images --image-ids "$ami_id" --region "$region" | \
jq -r ".Images[].State"
)
From 7dac8470cf69d10bcea3a61b1919cebf12a94fe6 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 29 Oct 2020 14:01:43 -0400
Subject: [PATCH 538/590] nixos ec2/create-amis.sh: shellcheck: explicitly make
the additions to block_device_mappings single strings
---
nixos/maintainers/scripts/ec2/create-amis.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 6e2836a7a97d..16aa5ce35f45 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -225,10 +225,10 @@ upload_image() {
--virtualization-type hvm
)
- block_device_mappings+=(DeviceName=/dev/sdb,VirtualName=ephemeral0)
- block_device_mappings+=(DeviceName=/dev/sdc,VirtualName=ephemeral1)
- block_device_mappings+=(DeviceName=/dev/sdd,VirtualName=ephemeral2)
- block_device_mappings+=(DeviceName=/dev/sde,VirtualName=ephemeral3)
+ block_device_mappings+=("DeviceName=/dev/sdb,VirtualName=ephemeral0")
+ block_device_mappings+=("DeviceName=/dev/sdc,VirtualName=ephemeral1")
+ block_device_mappings+=("DeviceName=/dev/sdd,VirtualName=ephemeral2")
+ block_device_mappings+=("DeviceName=/dev/sde,VirtualName=ephemeral3")
ami_id=$(
aws ec2 register-image \
From f92a883ddb2e26e34244cf764fbfa63a4e580afa Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 29 Oct 2020 14:02:11 -0400
Subject: [PATCH 539/590] nixos ec2/create-amis.sh: shellcheck: $ is not needed
in arithmetic
---
nixos/maintainers/scripts/ec2/create-amis.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 16aa5ce35f45..6cac4bb58d51 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -65,7 +65,7 @@ image_logical_bytes=$(read_image_info .logical_bytes)
# Derived attributes
-image_logical_gigabytes=$((($image_logical_bytes-1)/1024/1024/1024+1)) # Round to the next GB
+image_logical_gigabytes=$(((image_logical_bytes-1)/1024/1024/1024+1)) # Round to the next GB
case "$image_system" in
aarch64-linux)
From e253de8a772d8c73173807fef2e82ebce59c5153 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 30 Oct 2020 11:40:58 -0400
Subject: [PATCH 540/590] create-amis.sh: log the full response if describing
the import snapshot tasks fails
---
nixos/maintainers/scripts/ec2/create-amis.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 6cac4bb58d51..d8bdf022d616 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -126,6 +126,8 @@ wait_for_import() {
;;
*)
log "Unexpected snapshot import state: '${state}'"
+ log "Full response: "
+ aws ec2 describe-import-snapshot-tasks --region "$region" --import-task-ids "$task_id" >&2
exit 1
;;
esac
From 2bf1fc034502dd89f1026f8cf7bbdcf250d82550 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 30 Oct 2020 11:59:09 -0400
Subject: [PATCH 541/590] create-amis: allow customizing the service role name
The complete setup on the AWS end can be configured
with the following Terraform configuration. It generates
a ./credentials.sh which I just copy/pasted in to the
create-amis.sh script near the top. Note: the entire stack
of users and bucket can be destroyed at the end of the
import.
variable "region" {
type = string
}
variable "availability_zone" {
type = string
}
provider "aws" {
region = var.region
}
resource "aws_s3_bucket" "nixos-amis" {
bucket_prefix = "nixos-amis-"
lifecycle_rule {
enabled = true
abort_incomplete_multipart_upload_days = 1
expiration {
days = 7
}
}
}
resource "local_file" "credential-file" {
file_permission = "0700"
filename = "${path.module}/credentials.sh"
sensitive_content = <<SCRIPT
export service_role_name="${aws_iam_role.vmimport.name}"
export bucket="${aws_s3_bucket.nixos-amis.bucket}"
export AWS_ACCESS_KEY_ID="${aws_iam_access_key.uploader.id}"
export AWS_SECRET_ACCESS_KEY="${aws_iam_access_key.uploader.secret}"
SCRIPT
}
# The following resources are for the *uploader*
resource "aws_iam_user" "uploader" {
name = "nixos-amis-uploader"
}
resource "aws_iam_access_key" "uploader" {
user = aws_iam_user.uploader.name
}
resource "aws_iam_user_policy" "upload-to-nixos-amis" {
user = aws_iam_user.uploader.name
policy = data.aws_iam_policy_document.upload-policy-document.json
}
data "aws_iam_policy_document" "upload-policy-document" {
statement {
effect = "Allow"
actions = [
"s3:ListBucket",
"s3:GetBucketLocation",
]
resources = [
aws_s3_bucket.nixos-amis.arn
]
}
statement {
effect = "Allow"
actions = [
"s3:PutObject",
"s3:GetObject",
"s3:DeleteObject",
]
resources = [
"${aws_s3_bucket.nixos-amis.arn}/*"
]
}
statement {
effect = "Allow"
actions = [
"ec2:ImportSnapshot",
"ec2:DescribeImportSnapshotTasks",
"ec2:DescribeImportSnapshotTasks",
"ec2:RegisterImage",
"ec2:DescribeImages"
]
resources = [
"*"
]
}
}
# The following resources are for the *vmimport service user*
# See: https://docs.aws.amazon.com/vm-import/latest/userguide/vmie_prereqs.html#vmimport-role
resource "aws_iam_role" "vmimport" {
assume_role_policy = data.aws_iam_policy_document.vmimport-trust.json
}
resource "aws_iam_role_policy" "vmimport-access" {
role = aws_iam_role.vmimport.id
policy = data.aws_iam_policy_document.vmimport-access.json
}
data "aws_iam_policy_document" "vmimport-access" {
statement {
effect = "Allow"
actions = [
"s3:GetBucketLocation",
"s3:GetObject",
"s3:ListBucket",
]
resources = [
aws_s3_bucket.nixos-amis.arn,
"${aws_s3_bucket.nixos-amis.arn}/*"
]
}
statement {
effect = "Allow"
actions = [
"ec2:ModifySnapshotAttribute",
"ec2:CopySnapshot",
"ec2:RegisterImage",
"ec2:Describe*"
]
resources = [
"*"
]
}
}
data "aws_iam_policy_document" "vmimport-trust" {
statement {
effect = "Allow"
principals {
type = "Service"
identifiers = [ "vmie.amazonaws.com" ]
}
actions = [
"sts:AssumeRole"
]
condition {
test = "StringEquals"
variable = "sts:ExternalId"
values = [ "vmimport" ]
}
}
}
---
nixos/maintainers/scripts/ec2/create-amis.sh | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index d8bdf022d616..fdcaba4e2e7a 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -6,9 +6,10 @@
# <nixos/release.nix> amazonImage attribute. Images are uploaded and
# registered via a home region, and then copied to other regions.
-# The home region requires an s3 bucket, and a "vmimport" IAM role
-# with access to the S3 bucket. Configuration of the vmimport role is
-# documented in
+# The home region requires an s3 bucket, and an IAM role named, by default,
+# "vmimport" IAM role with access to the S3 bucket. The name can be
+# configured with the "service_role_name" variable. Configuration of the
+# vmimport role is documented in
# https://docs.aws.amazon.com/vm-import/latest/userguide/vmimport-image-import.html
# set -x
@@ -18,6 +19,7 @@ set -euo pipefail
state_dir=$HOME/amis/ec2-images
home_region=eu-west-1
bucket=nixos-amis
+service_role_name=vmimport
regions=(eu-west-1 eu-west-2 eu-west-3 eu-central-1 eu-north-1
us-east-1 us-east-2 us-west-1 us-west-2
@@ -196,7 +198,7 @@ upload_image() {
log "Importing image from S3 path s3://$bucket/$aws_path"
- task_id=$(aws ec2 import-snapshot --disk-container "{
+ task_id=$(aws ec2 import-snapshot --role-name "$service_role_name" --disk-container "{
\"Description\": \"nixos-image-${image_label}-${image_system}\",
\"Format\": \"vhd\",
\"UserBucket\": {
From 45d88250f23c4e02dcdf84113eab9fc064dba60b Mon Sep 17 00:00:00 2001
From: Max Hausch <cheriimoya@googlemail.com>
Date: Fri, 30 Oct 2020 17:12:37 +0100
Subject: [PATCH 542/590] motion 4.3.1 -> 4.3.2
---
pkgs/applications/video/motion/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix
index 7f101c41edbd..e25101250411 100644
--- a/pkgs/applications/video/motion/default.nix
+++ b/pkgs/applications/video/motion/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "motion";
- version = "4.3.1";
+ version = "4.3.2";
src = fetchFromGitHub {
owner = "Motion-Project";
repo = "motion";
rev = "release-${version}";
- sha256 = "01yy4pdgd4wa97bpw27zn5zik9iz719m1jiwkk9lb7m2a2951dhc";
+ sha256 = "09xs815jsivcilpmnrx2jkcxirj4lg5kp99fkr0p2sdxw03myi95";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
From a179781696271602ee317455aff5e7fa051f5218 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 30 Oct 2020 11:05:48 -0400
Subject: [PATCH 543/590] stage-1: add datestamps to logs
When the stage-1 logs get imported in to the journal, they all get
loaded with the same timestamp. This makes it difficult to identify
what might be taking a long time in early boot.
---
nixos/modules/system/boot/stage-1-init.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index f7c2940049e5..2339267d5c22 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -120,7 +120,7 @@ eval "exec $logOutFd>&1 $logErrFd>&2"
if test -w /dev/kmsg; then
tee -i < /tmp/stage-1-init.log.fifo /proc/self/fd/"$logOutFd" | while read -r line; do
if test -n "$line"; then
- echo "<7>stage-1-init: $line" > /dev/kmsg
+ echo "<7>stage-1-init: [$(date)] $line" > /dev/kmsg
fi
done &
else
From ece5c0f30425c09ec5d531c808031db69e28b4cf Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 30 Oct 2020 11:20:00 -0400
Subject: [PATCH 544/590] stage-1: modprobe ext{2,3,4} before resizing
I noticed booting a system with an ext4 root which expanded to 5T took
quite a long time (12 minutes in some cases, 43(!) in others.)
I changed stage-1 to run `resize2fs -d 62` for extra debug output and
timing information. It revealed the adjust_superblock step taking
almost all of the time:
[Fri Oct 30 11:10:15 UTC 2020] zero_high_bits_in_metadata: Memory used: 132k/0k (63k/70k), time: 0.00/ 0.00/ 0.00
[Fri Oct 30 11:21:09 UTC 2020] adjust_superblock: Memory used: 396k/4556k (295k/102k), time: 654.21/ 0.59/ 5.13
but when I ran resize2fs on a disk with the identical content growing
to the identical target size, it would only take about 30 seconds. I
looked at what happened between those two steps in the fast case with
strace and found:
```
235 getrusage(RUSAGE_SELF, {ru_utime={tv_sec=0, tv_usec=1795}, ru_stime={tv_sec=0, tv_usec=3590}, ...}) = 0
236 write(1, "zero_high_bits_in_metadata: Memo"..., 84zero_high_bits_in_metadata: Memory used: 132k/0k (72k/61k), time: 0.00/ 0.00/ 0.00
237 ) = 84
238 gettimeofday({tv_sec=1604061278, tv_usec=480147}, NULL) = 0
239 getrusage(RUSAGE_SELF, {ru_utime={tv_sec=0, tv_usec=1802}, ru_stime={tv_sec=0, tv_usec=3603}, ...}) = 0
240 gettimeofday({tv_sec=1604061278, tv_usec=480192}, NULL) = 0
241 mmap(NULL, 2564096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x7fa3c7355000
242 access("/sys/fs/ext4/features/lazy_itable_init", F_OK) = 0
243 brk(0xf85000) = 0xf85000
244 brk(0xfa6000) = 0xfa6000
245 gettimeofday({tv_sec=1604061278, tv_usec=538828}, NULL) = 0
246 getrusage(RUSAGE_SELF, {ru_utime={tv_sec=0, tv_usec=58720}, ru_stime={tv_sec=0, tv_usec=3603}, ...}) = 0
247 write(1, "adjust_superblock: Memory used: "..., 79adjust_superblock: Memory used: 396k/2504k (305k/92k), time: 0.06/ 0.06/ 0.00
248 ) = 79
249 gettimeofday({tv_sec=1604061278, tv_usec=539119}, NULL) = 0
250 getrusage(RUSAGE_SELF, {ru_utime={tv_sec=0, tv_usec=58812}, ru_stime={tv_sec=0, tv_usec=3603}, ...}) = 0
251 gettimeofday({tv_sec=1604061279, tv_usec=939}, NULL) = 0
252 getrusage(RUSAGE_SELF, {ru_utime={tv_sec=0, tv_usec=520411}, ru_stime={tv_sec=0, tv_usec=3603}, ...}) = 0
253 write(1, "fix_uninit_block_bitmaps 2: Memo"..., 88fix_uninit_block_bitmaps 2: Memory used: 396k/2504k (305k/92k), time: 0.46/ 0.46/ 0.00
254 ) = 88
```
In particular the access to /sys/fs seemed interesting. Looking
at the source of resize2fs:
```
[root@ip-172-31-22-182:~/e2fsprogs-1.45.5]# rg -B2 -A1 /sys/fs/ext4/features/lazy_itable_init .
./resize/resize2fs.c
923- if (getenv("RESIZE2FS_FORCE_LAZY_ITABLE_INIT") ||
924- (!getenv("RESIZE2FS_FORCE_ITABLE_INIT") &&
925: access("/sys/fs/ext4/features/lazy_itable_init", F_OK) == 0))
926- lazy_itable_init = 1;
```
I confirmed /sys is mounted, and then found a bug suggesting the
ext4 module is maybe not loaded:
https://bugzilla.redhat.com/show_bug.cgi?id=1071909
My home server doesn't have ext4 loaded and had 3T to play with, so
I tried (and succeeded with) replicating the issue locally:
```
[root@kif:/scratch]# lsmod | grep -i ext
[root@kif:/scratch]# zfs create -V 3G rpool/scratch/ext4
[root@kif:/scratch]# time mkfs.ext4 /dev/zvol/rpool/scratch/ext4
mke2fs 1.45.5 (07-Jan-2020)
Discarding device blocks: done
Creating filesystem with 786432 4k blocks and 196608 inodes
Filesystem UUID: 560a4a8f-93dc-40cc-97a5-f10049bf801f
Superblock backups stored on blocks:
32768, 98304, 163840, 229376, 294912
Allocating group tables: done
Writing inode tables: done
Creating journal (16384 blocks): done
Writing superblocks and filesystem accounting information: done
real 0m2.261s
user 0m0.000s
sys 0m0.025s
[root@kif:/scratch]# zfs set volsize=3T rpool/scratch/ext4
[root@kif:/scratch]# time resize2fs -d 62 /dev/zvol/rpool/scratch/ext4
resize2fs 1.45.5 (07-Jan-2020)
fs has 11 inodes, 1 groups required.
fs requires 16390 data blocks.
With 1 group(s), we have 22234 blocks available.
Last group's overhead is 10534
Need 16390 data blocks in last group
Final size of last group is 26924
Estimated blocks needed: 26924
Extents safety margin: 49
Resizing the filesystem on /dev/zvol/rpool/scratch/ext4 to 805306368 (4k) blocks.
read_bitmaps: Memory used: 132k/0k (63k/70k), time: 0.00/ 0.00/ 0.00
read_bitmaps: I/O read: 1MB, write: 0MB, rate: 3802.28MB/s
fix_uninit_block_bitmaps 1: Memory used: 132k/0k (63k/70k), time: 0.00/ 0.00/ 0.00
resize_group_descriptors: Memory used: 132k/0k (68k/65k), time: 0.00/ 0.00/ 0.00
move_bg_metadata: Memory used: 132k/0k (68k/65k), time: 0.00/ 0.00/ 0.00
zero_high_bits_in_metadata: Memory used: 132k/0k (68k/65k), time: 0.00/ 0.00/ 0.00
```
here it got stuck for quite some time ... straceing this 20 minutes in revealed this in a tight loop:
```
getuid() = 0
geteuid() = 0
getgid() = 0
getegid() = 0
prctl(PR_GET_DUMPABLE) = 1 (SUID_DUMP_USER)
fallocate(3, FALLOC_FL_ZERO_RANGE, 2222649901056, 2097152) = 0
fsync(3) = 0
```
it finally ended 43(!) minutes later:
```
adjust_superblock: Memory used: 264k/3592k (210k/55k), time: 2554.03/ 0.16/15.07
fix_uninit_block_bitmaps 2: Memory used: 264k/3592k (210k/55k), time: 0.16/ 0.16/ 0.00
blocks_to_move: Memory used: 264k/3592k (211k/54k), time: 0.00/ 0.00/ 0.00
Number of free blocks: 755396/780023556, Needed: 0
block_mover: Memory used: 264k/3592k (216k/49k), time: 0.05/ 0.01/ 0.00
block_mover: I/O read: 1MB, write: 0MB, rate: 18.68MB/s
inode_scan_and_fix: Memory used: 264k/3592k (216k/49k), time: 0.00/ 0.00/ 0.00
inode_ref_fix: Memory used: 264k/3592k (216k/49k), time: 0.00/ 0.00/ 0.00
move_itables: Memory used: 264k/3592k (216k/49k), time: 0.00/ 0.00/ 0.00
calculate_summary_stats: Memory used: 264k/3592k (216k/49k), time: 16.35/16.35/ 0.00
fix_resize_inode: Memory used: 264k/3592k (222k/43k), time: 0.04/ 0.00/ 0.00
fix_resize_inode: I/O read: 1MB, write: 0MB, rate: 22.80MB/s
fix_sb_journal_backup: Memory used: 264k/3592k (222k/43k), time: 0.00/ 0.00/ 0.00
overall resize2fs: Memory used: 264k/3592k (222k/43k), time: 2570.90/16.68/15.07
overall resize2fs: I/O read: 1MB, write: 1MB, rate: 0.00MB/s
The filesystem on /dev/zvol/rpool/scratch/ext4 is now 805306368 (4k) blocks long.
real 43m1.943s
user 0m16.761s
sys 0m15.069s
```
I then cleaned up and recreated the zvol, loaded the ext4 module, created the ext4 fs,
resized the volume, and resize2fs'd and it went quite quickly:
```
[root@kif:/scratch]# zfs destroy rpool/scratch/ext4
[root@kif:/scratch]# zfs create -V 3G rpool/scratch/ext4
[root@kif:/scratch]# modprobe ext4
[root@kif:/scratch]# time resize2fs -d 62 /dev/zvol/rpool/scratch/ext4
[root@kif:/scratch]# time mkfs.ext4 /dev/zvol/rpool/scratch/ext4
mke2fs 1.45.5 (07-Jan-2020)
Discarding device blocks: done
Creating filesystem with 786432 4k blocks and 196608 inodes
Filesystem UUID: 5b415f2f-a8c4-4ba0-ac1d-78860de77610
Superblock backups stored on blocks:
32768, 98304, 163840, 229376, 294912
Allocating group tables: done
Writing inode tables: done
Creating journal (16384 blocks): done
Writing superblocks and filesystem accounting information: done
real 0m1.013s
user 0m0.001s
sys 0m0.023s
[root@kif:/scratch]# zfs set volsize=3T rpool/scratch/ext4
[root@kif:/scratch]# time resize2fs -d 62 /dev/zvol/rpool/scratch/ext4
resize2fs 1.45.5 (07-Jan-2020)
fs has 11 inodes, 1 groups required.
fs requires 16390 data blocks.
With 1 group(s), we have 22234 blocks available.
Last group's overhead is 10534
Need 16390 data blocks in last group
Final size of last group is 26924
Estimated blocks needed: 26924
Extents safety margin: 49
Resizing the filesystem on /dev/zvol/rpool/scratch/ext4 to 805306368 (4k) blocks.
read_bitmaps: Memory used: 132k/0k (63k/70k), time: 0.00/ 0.00/ 0.00
read_bitmaps: I/O read: 1MB, write: 0MB, rate: 3389.83MB/s
fix_uninit_block_bitmaps 1: Memory used: 132k/0k (63k/70k), time: 0.00/ 0.00/ 0.00
resize_group_descriptors: Memory used: 132k/0k (68k/65k), time: 0.00/ 0.00/ 0.00
move_bg_metadata: Memory used: 132k/0k (68k/65k), time: 0.00/ 0.00/ 0.00
zero_high_bits_in_metadata: Memory used: 132k/0k (68k/65k), time: 0.00/ 0.00/ 0.00
adjust_superblock: Memory used: 264k/1540k (210k/55k), time: 0.02/ 0.02/ 0.00
fix_uninit_block_bitmaps 2: Memory used: 264k/1540k (210k/55k), time: 0.15/ 0.15/ 0.00
blocks_to_move: Memory used: 264k/1540k (211k/54k), time: 0.00/ 0.00/ 0.00
Number of free blocks: 755396/780023556, Needed: 0
block_mover: Memory used: 264k/3592k (216k/49k), time: 0.01/ 0.01/ 0.00
block_mover: I/O read: 1MB, write: 0MB, rate: 157.11MB/s
inode_scan_and_fix: Memory used: 264k/3592k (216k/49k), time: 0.00/ 0.00/ 0.00
inode_ref_fix: Memory used: 264k/3592k (216k/49k), time: 0.00/ 0.00/ 0.00
move_itables: Memory used: 264k/3592k (216k/49k), time: 0.00/ 0.00/ 0.00
calculate_summary_stats: Memory used: 264k/3592k (216k/49k), time: 16.20/16.20/ 0.00
fix_resize_inode: Memory used: 264k/3592k (222k/43k), time: 0.00/ 0.00/ 0.00
fix_resize_inode: I/O read: 1MB, write: 0MB, rate: 5319.15MB/s
fix_sb_journal_backup: Memory used: 264k/3592k (222k/43k), time: 0.00/ 0.00/ 0.00
overall resize2fs: Memory used: 264k/3592k (222k/43k), time: 16.45/16.38/ 0.00
overall resize2fs: I/O read: 1MB, write: 1MB, rate: 0.06MB/s
The filesystem on /dev/zvol/rpool/scratch/ext4 is now 805306368 (4k) blocks long.
real 0m17.908s
user 0m16.386s
sys 0m0.079s
```
Success!
---
nixos/modules/system/boot/stage-1-init.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index f7c2940049e5..8558c7546d7e 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -356,6 +356,7 @@ mountFS() {
case $options in
*x-nixos.autoresize*)
if [ "$fsType" = ext2 -o "$fsType" = ext3 -o "$fsType" = ext4 ]; then
+ modprobe "$fsType"
echo "resizing $device..."
e2fsck -fp "$device"
resize2fs "$device"
From 3eb034db8ce7bed0098c07d438d58cde7eb6de1b Mon Sep 17 00:00:00 2001
From: Matthew Kenigsberg <matthewkenigsberg@gmail.com>
Date: Fri, 30 Oct 2020 09:33:00 -0500
Subject: [PATCH 545/590] broadlink-cli: 0.9.0 -> 0.15.0 and use python3
Helps #101964
---
pkgs/tools/misc/broadlink-cli/default.nix | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/pkgs/tools/misc/broadlink-cli/default.nix b/pkgs/tools/misc/broadlink-cli/default.nix
index c40ccad5e396..96b13c060e4b 100644
--- a/pkgs/tools/misc/broadlink-cli/default.nix
+++ b/pkgs/tools/misc/broadlink-cli/default.nix
@@ -1,22 +1,22 @@
-{ stdenv, python2Packages, fetchFromGitHub }:
+{ stdenv, python3Packages, fetchFromGitHub }:
-python2Packages.buildPythonApplication {
+python3Packages.buildPythonApplication {
pname = "broadlink-cli";
- inherit (python2Packages.broadlink) version;
+ inherit (python3Packages.broadlink) version;
# the tools are available as part of the source distribution from GH but
# not pypi, so we have to fetch them here.
src = fetchFromGitHub {
owner = "mjg59";
repo = "python-broadlink";
- # this rev is version 0.9
- rev = "766b7b00fb1cec868e3d5fca66f1aada208959ce";
- sha256 = "0j0idzxmpwkb1lbgvi9df2hbxafm5hxjc6mgg5481lq7z4z1r4nb";
+ # this rev is version 0.15.0
+ rev = "99add9e6feea6e47be4f3a58783556d7838b759c";
+ sha256 = "1q1q62brvfjcb18i0j4ca5cxqzjwv1iywdrdby0yjqa4wm6ywq6b";
};
format = "other";
- propagatedBuildInputs = with python2Packages; [
+ propagatedBuildInputs = with python3Packages; [
broadlink
];
@@ -32,6 +32,6 @@ python2Packages.buildPythonApplication {
meta = with stdenv.lib; {
description = "Tools for interfacing with Broadlink RM2/3 (Pro) remote controls, A1 sensor platforms and SP2/3 smartplugs";
maintainers = with maintainers; [ peterhoeg ];
- inherit (python2Packages.broadlink.meta) homepage license;
+ inherit (python3Packages.broadlink.meta) homepage license;
};
}
From e6db435973160591fe7348876a5567c729495175 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 29 Oct 2020 01:15:05 -0700
Subject: [PATCH 546/590] linux: add flavor metadata
---
pkgs/os-specific/linux/kernel/generic.nix | 9 ++++++++-
pkgs/os-specific/linux/kernel/linux-libre.nix | 1 +
pkgs/os-specific/linux/kernel/linux-zen.nix | 1 +
pkgs/top-level/all-packages.nix | 5 +++++
4 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index cab11cc87ae2..dd3050a93eef 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -45,6 +45,11 @@
stdenv.hostPlatform != stdenv.buildPlatform
, extraMeta ? {}
+, isXen ? features.xen_dom0 or false
+, isZen ? false
+, isLibre ? false
+, isHardened ? false
+
# easy overrides to stdenv.hostPlatform.platform members
, autoModules ? stdenv.hostPlatform.platform.kernelAutoModules
, preferBuiltin ? stdenv.hostPlatform.platform.kernelPreferBuiltin or false
@@ -175,7 +180,9 @@ let
passthru = {
features = kernelFeatures;
- inherit commonStructuredConfig;
+ inherit commonStructuredConfig isXen isZen isHardened isLibre;
+ kernelOlder = lib.versionOlder version;
+ kernelAtLeast = lib.versionAtLeast version;
passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]);
};
diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index 7a831e61ae49..1e8514e9c2c8 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -17,6 +17,7 @@ let
in linux.override {
argsOverride = {
modDirVersion = "${linux.modDirVersion}-gnu";
+ isLibre = true;
src = stdenv.mkDerivation {
name = "${linux.name}-libre-src";
diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix
index 947aa7c19ab3..f4b0f3870f29 100644
--- a/pkgs/os-specific/linux/kernel/linux-zen.nix
+++ b/pkgs/os-specific/linux/kernel/linux-zen.nix
@@ -7,6 +7,7 @@ in
buildLinux (args // {
modDirVersion = "${version}-zen1";
inherit version;
+ isZen = true;
src = fetchFromGitHub {
owner = "zen-kernel";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 319d24d2e25d..d017efe6dfb1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18014,6 +18014,10 @@ in
inherit kernel;
inherit (kernel) stdenv; # in particular, use the same compiler by default
+ # to help determine module compatibility
+ inherit (kernel) isXen isZen isHardened isLibre;
+ inherit (kernel) kernelOlder kernelAtLeast;
+
# Obsolete aliases (these packages do not depend on the kernel).
inherit (pkgs) odp-dpdk pktgen; # added 2018-05
@@ -18277,6 +18281,7 @@ in
kernelPatches.hardened.${kernel.meta.branch}
];
modDirVersionArg = kernel.modDirVersion + "-hardened";
+ isHardened = true;
});
linuxPackages_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux { });
From f24fa1e6f51a072be983b0fa78647c9c777c37b7 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 29 Oct 2020 01:15:31 -0700
Subject: [PATCH 547/590] linuxPackages.usbip: disable < 4.10
---
pkgs/os-specific/linux/usbip/default.nix | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/usbip/default.nix b/pkgs/os-specific/linux/usbip/default.nix
index ffd33b6ff854..9a009b74f083 100644
--- a/pkgs/os-specific/linux/usbip/default.nix
+++ b/pkgs/os-specific/linux/usbip/default.nix
@@ -1,11 +1,11 @@
-{ lib, stdenv, kernel, udev, autoconf, automake, libtool }:
+{ lib, stdenv, kernel, udev, autoconf, automake, libtool, kernelOlder }:
stdenv.mkDerivation {
name = "usbip-${kernel.name}";
src = kernel.src;
- patches = lib.optionals (lib.versionAtLeast "5.4" kernel.version) [
+ patches = lib.optionals (kernelOlder "5.4") [
# fixes build with gcc8
./fix-snprintf-truncation.patch
# fixes build with gcc9
@@ -27,5 +27,6 @@ stdenv.mkDerivation {
description = "allows to pass USB device from server to client over the network";
license = licenses.gpl2;
platforms = platforms.linux;
+ broken = kernelOlder "4.10";
};
}
From 74a577b2936180508a129aafd75b88489e6fd730 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 30 Oct 2020 12:40:17 -0400
Subject: [PATCH 548/590] create-amis: improve wording around the service
name's IAM role
Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
---
nixos/maintainers/scripts/ec2/create-amis.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index fdcaba4e2e7a..ec2eb5366790 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -6,8 +6,8 @@
# <nixos/release.nix> amazonImage attribute. Images are uploaded and
# registered via a home region, and then copied to other regions.
-# The home region requires an s3 bucket, and an IAM role named, by default,
-# "vmimport" IAM role with access to the S3 bucket. The name can be
+# The home region requires an s3 bucket, and an IAM role named "vmimport"
+# (by default) with access to the S3 bucket. The name can be
# configured with the "service_role_name" variable. Configuration of the
# vmimport role is documented in
# https://docs.aws.amazon.com/vm-import/latest/userguide/vmimport-image-import.html
From b5faf8e4c62bceb0318f80d7abbdb5d6815e0316 Mon Sep 17 00:00:00 2001
From: Matthew Kenigsberg <matthewkenigsberg@gmail.com>
Date: Fri, 30 Oct 2020 10:07:23 -0500
Subject: [PATCH 549/590] amazon-glacier-cmd-interface: remove package
Last real upstream activity appears to be ~6 years ago and depends on
python2 packages that will soon be vulnerable
Helps #101964
---
.../amazon-glacier-cmd-interface/default.nix | 33 -------------------
pkgs/top-level/aliases.nix | 1 +
pkgs/top-level/all-packages.nix | 2 --
3 files changed, 1 insertion(+), 35 deletions(-)
delete mode 100644 pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
diff --git a/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix b/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
deleted file mode 100644
index a872060ce212..000000000000
--- a/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchFromGitHub, python2Packages }:
-
-python2Packages.buildPythonApplication rec {
- pname = "amazon-glacier-cmd-interface";
- version = "2016-09-01";
-
- src = fetchFromGitHub {
- owner = "uskudnik";
- repo = "amazon-glacier-cmd-interface";
- rev = "9f28132f9872e1aad9e956e5613b976504e930c8";
- sha256 = "1k5z8kda9v6klr4536pf5qbq9zklxvyysv7nc48gllschl09jywc";
- };
-
- # argparse is part of the standardlib
- prePatch = ''
- substituteInPlace setup.py --replace "'argparse'," ""
- '';
-
- propagatedBuildInputs = with python2Packages; [
- boto
- dateutil
- prettytable
- pytz
- ];
-
- meta = {
- description = "Command line interface for Amazon Glacier";
- homepage = "https://github.com/uskudnik/amazon-glacier-cmd-interface";
- license = stdenv.lib.licenses.gpl2;
- maintainers = [ stdenv.lib.maintainers.lovek323 ];
- };
-
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3538ac56ecfa..1c65974bfe84 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -41,6 +41,7 @@ mapAliases ({
ag = silver-searcher; # added 2018-04-25
aircrackng = aircrack-ng; # added 2016-01-14
alienfx = throw "alienfx has been removed."; # added 2019-12-08
+ amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # added 2020-10-30
ammonite-repl = ammonite; # added 2017-05-02
antimicro = throw "antimicro has been removed as it was broken, see antimicroX instead."; # added 2020-08-06
arduino_core = arduino-core; # added 2015-02-04
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a37fab7ec3db..319d015707bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -784,8 +784,6 @@ in
amazon-ecs-cli = callPackage ../tools/virtualization/amazon-ecs-cli { };
- amazon-glacier-cmd-interface = callPackage ../tools/backup/amazon-glacier-cmd-interface { };
-
amber = callPackage ../tools/text/amber {
inherit (darwin.apple_sdk.frameworks) Security;
};
From 2a9e33374b943089f4271fc274493ed0ecc0de54 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 30 Oct 2020 00:40:50 +0100
Subject: [PATCH 550/590] up: 0.3.2 -> 0.4.0
https://github.com/akavel/up/releases/tag/v0.4
---
pkgs/tools/misc/up/default.nix | 8 +++-----
pkgs/tools/misc/up/gomod.patch | 23 -----------------------
2 files changed, 3 insertions(+), 28 deletions(-)
delete mode 100644 pkgs/tools/misc/up/gomod.patch
diff --git a/pkgs/tools/misc/up/default.nix b/pkgs/tools/misc/up/default.nix
index b3d275d3081d..47c504cd1a71 100644
--- a/pkgs/tools/misc/up/default.nix
+++ b/pkgs/tools/misc/up/default.nix
@@ -2,18 +2,16 @@
buildGoModule rec {
pname = "up";
- version = "0.3.2";
-
- patches = [ ./gomod.patch ];
+ version = "0.4";
src = fetchFromGitHub {
owner = "akavel";
repo = "up";
rev = "v${version}";
- sha256 = "1psixyymk98z52yy92lwb75yfins45dw6rif9cxwd7yiascwg2if";
+ sha256 = "1j8fi14fiwjscfzdfjqxgavjadwvcm5mqr8fb7hx3jmxs4kl58bp";
};
- vendorSha256 = "1h3w4i7dyh6yagqmdclvflfq6fx0z880jdnpf28assv7fxd9rjsx";
+ vendorSha256 = "1q8wfsfl3rz698ck5q5s5z6iw9k134fxxvwipcp2b052n998rcrx";
doCheck = false;
diff --git a/pkgs/tools/misc/up/gomod.patch b/pkgs/tools/misc/up/gomod.patch
deleted file mode 100644
index f894f14d21f1..000000000000
--- a/pkgs/tools/misc/up/gomod.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/go.mod b/go.mod
-index ecbfe90..56a1409 100644
---- a/go.mod
-+++ b/go.mod
-@@ -1,11 +1,14 @@
- module github.com/akavel/up
-
-+go 1.14
-+
- require (
-- github.com/gdamore/encoding v0.0.0-20151215212835-b23993cbb635
-+ github.com/gdamore/encoding v0.0.0-20151215212835-b23993cbb635 // indirect
- github.com/gdamore/tcell v0.0.0-20180924055237-493f3b46b3c2
-- github.com/lucasb-eyer/go-colorful v0.0.0-20170903184257-231272389856
-+ github.com/lucasb-eyer/go-colorful v0.0.0-20170903184257-231272389856 // indirect
- github.com/mattn/go-isatty v0.0.3
-- github.com/mattn/go-runewidth v0.0.2
-+ github.com/mattn/go-runewidth v0.0.2 // indirect
- github.com/spf13/pflag v1.0.3
-- golang.org/x/text v0.0.0-20171214130843-f21a4dfb5e38
-+ golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3 // indirect
-+ golang.org/x/text v0.0.0-20171214130843-f21a4dfb5e38 // indirect
- )
From 93a00bec3e51e9a484468e1d3c9a68886d5c6fc0 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 30 Oct 2020 18:33:35 +0100
Subject: [PATCH 551/590] citrix_workspace: remove attributes for old versions;
fix i686 build
---
.../networking/remote/citrix-workspace/generic.nix | 8 ++++----
.../networking/remote/citrix-workspace/sources.nix | 2 +-
pkgs/top-level/all-packages.nix | 4 ----
3 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
index a2ad8b8129a6..19165184d252 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
@@ -146,8 +146,8 @@ stdenv.mkDerivation rec {
export HOME=$(mktemp -d)
# Run upstream installer in the store-path.
- sed -i -e 's,^ANSWER="",ANSWER="$INSTALLER_YES",g' -e 's,/bin/true,true,g' ./linuxx64/hinst
- ${stdenv.shell} linuxx64/hinst CDROM "$(pwd)"
+ sed -i -e 's,^ANSWER="",ANSWER="$INSTALLER_YES",g' -e 's,/bin/true,true,g' ./${prefix}/hinst
+ ${stdenv.shell} ${prefix}/hinst CDROM "$(pwd)"
if [ -f "$ICAInstDir/util/setlog" ]; then
chmod +x "$ICAInstDir/util/setlog"
@@ -169,8 +169,8 @@ stdenv.mkDerivation rec {
# See https://developer-docs.citrix.com/projects/workspace-app-for-linux-oem-guide/en/latest/reference-information/#library-files
# Those files are fallbacks to support older libwekit.so and libjpeg.so
- rm $out/opt/citrix-icaclient/lib/ctxjpeg_fb_8.so
- rm $out/opt/citrix-icaclient/lib/UIDialogLibWebKit.so
+ rm $out/opt/citrix-icaclient/lib/ctxjpeg_fb_8.so || true
+ rm $out/opt/citrix-icaclient/lib/UIDialogLibWebKit.so || true
# We support only Gstreamer 1.0
rm $ICAInstDir/util/{gst_aud_{play,read},gst_*0.10,libgstflatstm0.10.so}
diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
index abdd54f4af6e..ea4f46c05196 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
@@ -52,7 +52,7 @@ let
#
# The lifespans of Citrix products can be found here:
# https://www.citrix.com/support/product-lifecycle/milestones/receiver.html
- unsupportedVersions = [ "19.6.0" "19.8.0" "19.10.0" "19.12.0" ];
+ unsupportedVersions = [ ];
in {
inherit supportedVersions unsupportedVersions;
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d017efe6dfb1..efeafe1cd00f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2857,10 +2857,6 @@ in
citrix_workspace = citrix_workspace_20_09_0;
inherit (callPackage ../applications/networking/remote/citrix-workspace { })
- citrix_workspace_19_6_0
- citrix_workspace_19_8_0
- citrix_workspace_19_10_0
- citrix_workspace_19_12_0
citrix_workspace_20_04_0
citrix_workspace_20_06_0
citrix_workspace_20_09_0
From 6928309c5147b4b2579f0a25d78cd81bcaa4e38b Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 30 Oct 2020 18:34:32 +0100
Subject: [PATCH 552/590] citrix_workspace: add 20.10.0
ChangeLog: https://docs.citrix.com/en-us/citrix-workspace-app-for-linux/whats-new.html#whats-new-in-2010
---
.../networking/remote/citrix-workspace/generic.nix | 4 +++-
.../networking/remote/citrix-workspace/sources.nix | 11 +++++++++++
pkgs/top-level/all-packages.nix | 3 ++-
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
index 19165184d252..35085d422f26 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
@@ -3,6 +3,7 @@
, heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2
, gnome2, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2
, libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin
+, libpulseaudio
, homepage, version, prefix, hash
@@ -97,7 +98,8 @@ stdenv.mkDerivation rec {
xorg.libXScrnSaver
xorg.libXtst
zlib
- ] ++ lib.optional (lib.versionOlder version "20.04") e2fsprogs;
+ ] ++ lib.optional (lib.versionOlder version "20.04") e2fsprogs
+ ++ lib.optional (lib.versionAtLeast version "20.10") libpulseaudio;
runtimeDependencies = [
glib
diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
index ea4f46c05196..bbeed5b779c2 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
@@ -43,6 +43,17 @@ let
x86hash = "1b4gdmnnpa61ydiv2fnmap8cnfhskrq6swcs6i1nqrp5zvvkqrv4";
x64suffix = "15";
x86suffix = "15";
+ homepage = "https://www.citrix.com/de-de/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2009.html";
+ };
+
+ "20.10.0" = {
+ major = "20";
+ minor = "10";
+ patch = "0";
+ x64hash = "13g7r92mhwqwqkm6a4k4yn232ighkmxifs7j8wdi1yva0dvklqdf";
+ x86hash = "04cr2da25v8x098ccyjwa47d4krk3jpldqkyf4kk2j3hwzbqh9yx";
+ x64suffix = "6";
+ x86suffix = "6";
homepage = "https://www.citrix.com/de-de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
};
};
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index efeafe1cd00f..b4b0d24ec720 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2854,12 +2854,13 @@ in
circus = callPackage ../tools/networking/circus { };
- citrix_workspace = citrix_workspace_20_09_0;
+ citrix_workspace = citrix_workspace_20_10_0;
inherit (callPackage ../applications/networking/remote/citrix-workspace { })
citrix_workspace_20_04_0
citrix_workspace_20_06_0
citrix_workspace_20_09_0
+ citrix_workspace_20_10_0
;
citra = libsForQt5.callPackage ../misc/emulators/citra { };
From c85103076353fc690b844e9125d6e628b2ca9ac4 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 30 Oct 2020 13:16:19 -0400
Subject: [PATCH 553/590] amazon-image: random.trust_cpu=on to cut 10s from
boot
Ubuntu and other distros already have this set via kernel config.
---
nixos/modules/virtualisation/amazon-image.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 20d48add7129..44cb60809452 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -48,7 +48,7 @@ in
];
boot.initrd.kernelModules = [ "xen-blkfront" "xen-netfront" ];
boot.initrd.availableKernelModules = [ "ixgbevf" "ena" "nvme" ];
- boot.kernelParams = mkIf cfg.hvm [ "console=ttyS0" ];
+ boot.kernelParams = mkIf cfg.hvm [ "console=ttyS0" "random.trust_cpu=on" ];
# Prevent the nouveau kernel module from being loaded, as it
# interferes with the nvidia/nvidia-uvm modules needed for CUDA.
From c268484e05e4dc8c74f3ed02ec110b91a0823acb Mon Sep 17 00:00:00 2001
From: pablo1107 <dealberapablo07@gmail.com>
Date: Thu, 21 May 2020 17:41:08 -0300
Subject: [PATCH 554/590] ledger2beancount: init at 2.1
---
pkgs/tools/text/ledger2beancount/default.nix | 58 ++++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 +
2 files changed, 60 insertions(+)
create mode 100644 pkgs/tools/text/ledger2beancount/default.nix
diff --git a/pkgs/tools/text/ledger2beancount/default.nix b/pkgs/tools/text/ledger2beancount/default.nix
new file mode 100644
index 000000000000..00cc996ed60c
--- /dev/null
+++ b/pkgs/tools/text/ledger2beancount/default.nix
@@ -0,0 +1,58 @@
+{ stdenv, fetchFromGitHub, makeWrapper, perlPackages, beancount }:
+
+with stdenv.lib;
+
+let
+ perlDeps = with perlPackages; [
+ ConfigOnion DateCalc
+ FileBaseDir YAMLLibYAML
+ GetoptLongDescriptive DateTimeFormatStrptime
+ StringInterpolate
+ ];
+
+in stdenv.mkDerivation rec {
+ pname = "ledger2beancount";
+ version = "2.1";
+
+ src = fetchFromGitHub {
+ owner = "zacchiro";
+ repo = "ledger2beancount";
+ rev = "${version}";
+ sha256 = "0w88jb1x0w02jwwf6ipx3cxr89kzffrrdqws3556zrvvs01bh84j";
+ };
+
+ phases = [
+ "unpackPhase"
+ "installPhase"
+ "fixupPhase"
+ ];
+
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ perlPackages.perl beancount ] ++ perlDeps;
+
+ makeFlags = [ "prefix=$(out)" ];
+ installFlags = [ "INSTALL=install" ];
+
+ installPhase = ''
+ mkdir -p $out
+ cp -r $src/bin $out/bin
+ '';
+
+ postFixup = ''
+ wrapProgram "$out/bin/ledger2beancount" \
+ --set PERL5LIB "${perlPackages.makeFullPerlPath perlDeps}"
+ '';
+
+ meta = {
+ description = "Ledger to Beancount text-based converter";
+ longDescription = ''
+ A script to automatically convert Ledger-based textual ledgers to Beancount ones.
+
+ Conversion is based on (concrete) syntax, so that information that is not meaningful for accounting reasons but still valuable (e.g., comments, formatting, etc.) can be preserved.
+ '';
+ homepage = "https://github.com/zacchiro/ledger2beancount";
+ license = licenses.gpl3Plus;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ pablovsky ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4b0d24ec720..86fec0608a20 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21965,6 +21965,8 @@ in
ledger-web = callPackage ../applications/office/ledger-web { };
+ ledger2beancount = callPackage ../tools/text/ledger2beancount { };
+
lightburn = libsForQt5.callPackage ../applications/graphics/lightburn { };
lighthouse = callPackage ../applications/misc/lighthouse { };
From 0126c86672b7d14843225df16ddfefd7091eabe7 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Fri, 30 Oct 2020 16:33:10 +0100
Subject: [PATCH 555/590] linuxstopmotion: 0.8.0 -> 0.8.5
and qt4 -> qt5
---
.../video/linuxstopmotion/default.nix | 32 ++++++++----------
...stopmotion-fix-wrong-isProcess-logic.patch | 33 -------------------
pkgs/top-level/all-packages.nix | 2 +-
3 files changed, 14 insertions(+), 53 deletions(-)
delete mode 100644 pkgs/applications/video/linuxstopmotion/linuxstopmotion-fix-wrong-isProcess-logic.patch
diff --git a/pkgs/applications/video/linuxstopmotion/default.nix b/pkgs/applications/video/linuxstopmotion/default.nix
index 3a2d1b79e9e0..365fb1ea417a 100644
--- a/pkgs/applications/video/linuxstopmotion/default.nix
+++ b/pkgs/applications/video/linuxstopmotion/default.nix
@@ -1,32 +1,26 @@
-{ stdenv, fetchgit, pkgconfig, qt4, SDL, SDL_image, libvorbis, libtar, libxml2
-, gamin, qmake4Hook
-}:
+{ mkDerivation, lib, fetchgit, pkgconfig, qmake, qtbase, qttools, qtmultimedia, libvorbis, libtar, libxml2 }:
-stdenv.mkDerivation rec {
- version = "0.8";
+mkDerivation rec {
+ version = "0.8.5";
pname = "linuxstopmotion";
-
+
src = fetchgit {
- url = "git://git.code.sf.net/p/linuxstopmotion/code";
- rev = "refs/tags/${version}";
- sha256 = "19v9d0v3laiwi0f1n92lvj2s5s1mxsrfygna0xyw9pkcnk3b26q6";
+ url = "https://git.code.sf.net/p/linuxstopmotion/code";
+ rev = version;
+ sha256 = "1612lkwsfzc59wvdj2zbj5cwsyw66bwn31jrzjrxvygxdh4ab069";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ qt4 SDL SDL_image libvorbis libtar libxml2 gamin qmake4Hook ];
+ nativeBuildInputs = [ qmake pkgconfig ];
+ buildInputs = [ qtbase qttools qtmultimedia libvorbis libtar libxml2 ];
- patches = [ ./linuxstopmotion-fix-wrong-isProcess-logic.patch ];
-
- # Installation breaks without this
- preInstall = ''
- mkdir -p "$out/share/stopmotion/translations/"
- cp -v build/*.qm "$out/share/stopmotion/translations/"
+ postPatch = ''
+ substituteInPlace stopmotion.pro --replace '$$[QT_INSTALL_BINS]' '${lib.getDev qttools}/bin'
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Create stop-motion animation movies";
homepage = "http://linuxstopmotion.org/";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
diff --git a/pkgs/applications/video/linuxstopmotion/linuxstopmotion-fix-wrong-isProcess-logic.patch b/pkgs/applications/video/linuxstopmotion/linuxstopmotion-fix-wrong-isProcess-logic.patch
deleted file mode 100644
index caab48d0e2d9..000000000000
--- a/pkgs/applications/video/linuxstopmotion/linuxstopmotion-fix-wrong-isProcess-logic.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b23b7dab1d540b0710fcb9ded1c6256a49844906 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
-Date: Wed, 20 Aug 2014 22:22:00 +0200
-Subject: [PATCH] Fix wrong "isProcess" logic
-
-Stopmotion wrongly thinks that uvccapture should be run as a daemon,
-even though configuration for uvccapture has no "daemon-like" command
-line to be run (according to "preferences"). The result is an error
-popup instead of video/image grabbing.
-
-This brings back the "isProcess" logic that was in stopmotion v0.7.2,
-because it seems to work, while the current logic (v0.8.0) seems to
-fail.
----
- src/presentation/frontends/qtfrontend/frameview.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/presentation/frontends/qtfrontend/frameview.cpp b/src/presentation/frontends/qtfrontend/frameview.cpp
-index e44dca7..d2c41fd 100644
---- a/src/presentation/frontends/qtfrontend/frameview.cpp
-+++ b/src/presentation/frontends/qtfrontend/frameview.cpp
-@@ -270,7 +270,7 @@ bool FrameView::on() {
- Preference device(QString("device%1")
- .arg(activeDev).toLatin1().constData(), "");
- QString pre = QString(prepoll.get()).replace("$VIDEODEVICE", device.get());
-- bool isProcess = startDaemon.get();
-+ bool isProcess = (strcmp(startDaemon.get(), "") == 0) ? false : true;
-
- bool isCameraReady = true;
- this->grabber = new CommandLineGrabber(capturedFile.path(), isProcess);
---
-2.0.2
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4b0d24ec720..f88d9acc932a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23403,7 +23403,7 @@ in
stella = callPackage ../misc/emulators/stella { };
- linuxstopmotion = callPackage ../applications/video/linuxstopmotion { };
+ linuxstopmotion = libsForQt5.callPackage ../applications/video/linuxstopmotion { };
sweethome3d = recurseIntoAttrs ( (callPackage ../applications/misc/sweethome3d {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
From 936ef7525dcfdb455f241e017d225f6c4886f6dd Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 29 Oct 2020 06:24:33 +0100
Subject: [PATCH 556/590] ocamlPackages.bistro: use Dune 2
---
pkgs/development/ocaml-modules/bistro/default.nix | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pkgs/development/ocaml-modules/bistro/default.nix b/pkgs/development/ocaml-modules/bistro/default.nix
index 9603f283ee4f..78ca63ab90c2 100644
--- a/pkgs/development/ocaml-modules/bistro/default.nix
+++ b/pkgs/development/ocaml-modules/bistro/default.nix
@@ -5,6 +5,9 @@
buildDunePackage rec {
pname = "bistro";
version = "0.5.0";
+
+ useDune2 = true;
+
src = fetchFromGitHub {
owner = "pveber";
repo = pname;
From 4afd690197df232cdad74de21a4c55ec2254d8e0 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 29 Oct 2020 06:24:39 +0100
Subject: [PATCH 557/590] ocamlPackages.webmachine: use Dune 2
---
pkgs/development/ocaml-modules/webmachine/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/development/ocaml-modules/webmachine/default.nix b/pkgs/development/ocaml-modules/webmachine/default.nix
index 3bf163607cd2..afb26cfb354b 100644
--- a/pkgs/development/ocaml-modules/webmachine/default.nix
+++ b/pkgs/development/ocaml-modules/webmachine/default.nix
@@ -6,6 +6,7 @@
buildDunePackage rec {
pname = "webmachine";
version = "0.6.2";
+ useDune2 = true;
minimumOCamlVersion = "4.04";
From 8b1ceeb896fd9d77abb9751eeabaf8a50d61a168 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 29 Oct 2020 06:24:43 +0100
Subject: [PATCH 558/590] ocamlPackages.cohttp: use Dune 2
---
pkgs/development/ocaml-modules/cohttp/default.nix | 2 ++
pkgs/development/ocaml-modules/cohttp/lwt.nix | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix
index 6cb802e437d7..3fed7c55d452 100644
--- a/pkgs/development/ocaml-modules/cohttp/default.nix
+++ b/pkgs/development/ocaml-modules/cohttp/default.nix
@@ -7,6 +7,8 @@ buildDunePackage rec {
pname = "cohttp";
version = "2.5.4";
+ useDune2 = true;
+
minimumOCamlVersion = "4.04.1";
src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/cohttp/lwt.nix b/pkgs/development/ocaml-modules/cohttp/lwt.nix
index 1f261be62022..8357d748ce8f 100644
--- a/pkgs/development/ocaml-modules/cohttp/lwt.nix
+++ b/pkgs/development/ocaml-modules/cohttp/lwt.nix
@@ -8,7 +8,7 @@ else
buildDunePackage {
pname = "cohttp-lwt";
- inherit (cohttp) version src meta;
+ inherit (cohttp) version src useDune2 meta;
buildInputs = [ uri ppx_sexp_conv ];
From fb1c52641fad8d422c4a0c0aa3e03419296ea873 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 29 Oct 2020 06:24:47 +0100
Subject: [PATCH 559/590] ocamlPackages.jwto: use Dune 2
---
pkgs/development/ocaml-modules/jwto/default.nix | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkgs/development/ocaml-modules/jwto/default.nix b/pkgs/development/ocaml-modules/jwto/default.nix
index a4cf0aae6918..1c7622f2805a 100644
--- a/pkgs/development/ocaml-modules/jwto/default.nix
+++ b/pkgs/development/ocaml-modules/jwto/default.nix
@@ -5,6 +5,8 @@ buildDunePackage rec {
pname = "jwto";
version = "0.3.0";
+ useDune2 = true;
+
minimumOCamlVersion = "4.05";
src = fetchFromGitHub {
From b709b7ac3d375da6a33a6b7961f6ec3efffe5b77 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 29 Oct 2020 06:24:51 +0100
Subject: [PATCH 560/590] ocamlPackages.biocaml: use Dune 2
---
pkgs/development/ocaml-modules/biocaml/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/ocaml-modules/biocaml/default.nix b/pkgs/development/ocaml-modules/biocaml/default.nix
index be62a1c6d2cd..b7cab4cef6d1 100644
--- a/pkgs/development/ocaml-modules/biocaml/default.nix
+++ b/pkgs/development/ocaml-modules/biocaml/default.nix
@@ -6,12 +6,12 @@ buildDunePackage rec {
pname = "biocaml";
version = "0.10.1";
- owner = "biocaml";
+ useDune2 = true;
minimumOCamlVersion = "4.07";
src = fetchFromGitHub {
- inherit owner;
+ owner = "biocaml";
repo = pname;
rev = "v${version}";
sha256 = "1f19nc8ld0iv45jjnsvaah3ddj88s2n9wj8mrz726kzg85cfr8xj";
From 5b8a0f09787c3204277cb15d21f7f17b6fb6beee Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 29 Oct 2020 06:24:55 +0100
Subject: [PATCH 561/590] =?UTF-8?q?ocamlPackages.base64:=203.2.0=20?=
=?UTF-8?q?=E2=86=92=203.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ocaml-modules/base64/default.nix | 24 +++++++------------
1 file changed, 8 insertions(+), 16 deletions(-)
diff --git a/pkgs/development/ocaml-modules/base64/default.nix b/pkgs/development/ocaml-modules/base64/default.nix
index b2e3e0c5e74d..de0bc13e2833 100644
--- a/pkgs/development/ocaml-modules/base64/default.nix
+++ b/pkgs/development/ocaml-modules/base64/default.nix
@@ -1,25 +1,17 @@
-{ lib, fetchpatch, fetchzip, buildDunePackage, alcotest, bos }:
-
-let version = "3.2.0"; in
+{ lib, fetchurl, buildDunePackage, alcotest, bos, dune-configurator }:
buildDunePackage rec {
pname = "base64";
- inherit version;
+ version = "3.4.0";
- src = fetchzip {
- url = "https://github.com/mirage/ocaml-base64/archive/v${version}.tar.gz";
- sha256 = "1ilw3zj0w6cq7i4pvr8m2kv5l5f2y9aldmv72drlwwns013b1gwy";
+ useDune2 = true;
+
+ src = fetchurl {
+ url = "https://github.com/mirage/ocaml-base64/releases/download/v${version}/base64-v${version}.tbz";
+ sha256 = "0d0n5gd4nkdsz14jnxq13f1f7rzxmndg5xql039a8wfppmazd70w";
};
- minimumOCamlVersion = "4.03";
-
- buildInputs = [ bos ];
-
- # Fix test-suite for alcotest ≥ 1.0
- patches = [(fetchpatch {
- url = "https://github.com/mirage/ocaml-base64/commit/8d334d02aa52875158fae3e2fb8fe0a5596598d0.patch";
- sha256 = "0lvqdp98qavpzis1wgwh3ijajq79hq47898gsrk37fpyjbrdzf5q";
- })];
+ buildInputs = [ bos dune-configurator ];
doCheck = true;
checkInputs = [ alcotest ];
From d78aa080f5ba5f0920dd3e8a212c8c02cde411a3 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 28 Oct 2020 15:53:10 -0400
Subject: [PATCH 562/590] make-disk-image: support legacy+gpt
---
nixos/lib/make-disk-image.nix | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index 8aa606a56af8..a4a488a1b3ea 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -28,6 +28,9 @@
# partition of reasonable size is created in addition to the root partition.
# For "legacy", the msdos partition table is used and a single large root
# partition is created.
+ # For "legacy+gpt", the GPT partition table is used, a 1MiB no-fs partition for
+ # use by the bootloader is created, and a single large root partition is
+ # created.
# For "hybrid", the GPT partition table is used and a mandatory ESP
# partition of reasonable size is created in addition to the root partition.
# Also a legacy MBR will be present.
@@ -54,7 +57,7 @@
format ? "raw"
}:
-assert partitionTableType == "legacy" || partitionTableType == "efi" || partitionTableType == "hybrid" || partitionTableType == "none";
+assert partitionTableType == "legacy" || partitionTableType == "legacy+gpt" || partitionTableType == "efi" || partitionTableType == "hybrid" || partitionTableType == "none";
# We use -E offset=X below, which is only supported by e2fsprogs
assert partitionTableType != "none" -> fsType == "ext4";
@@ -75,6 +78,7 @@ let format' = format; in let
rootPartition = { # switch-case
legacy = "1";
+ "legacy+gpt" = "2";
efi = "2";
hybrid = "3";
}.${partitionTableType};
@@ -85,6 +89,16 @@ let format' = format; in let
mklabel msdos \
mkpart primary ext4 1MiB -1
'';
+ "legacy+gpt" = ''
+ parted --script $diskImage -- \
+ mklabel gpt \
+ mkpart no-fs 1MB 2MB \
+ set 1 bios_grub on \
+ align-check optimal 1 \
+ mkpart primary ext4 2MB -1 \
+ align-check optimal 2 \
+ print
+ '';
efi = ''
parted --script $diskImage -- \
mklabel gpt \
From d77ddf2a40641f346d9286e29f78ca9dfc64d533 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 28 Oct 2020 15:54:38 -0400
Subject: [PATCH 563/590] nixos.amazonAmi: use legacy+gpt disk images to
support partitions >2T
---
nixos/maintainers/scripts/ec2/amazon-image.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix
index b09f4ca47a3f..0ecf07669a11 100644
--- a/nixos/maintainers/scripts/ec2/amazon-image.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-image.nix
@@ -57,7 +57,7 @@ in {
inherit (cfg) contents format name;
pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
partitionTableType = if config.ec2.efi then "efi"
- else if config.ec2.hvm then "legacy"
+ else if config.ec2.hvm then "legacy+gpt"
else "none";
diskSize = cfg.sizeMB;
fsType = "ext4";
From 35b3a1f43a9621a88e906a839f99d8252500152b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 27 Oct 2020 09:22:09 +0100
Subject: [PATCH 564/590] LTS Haskell 16.20
---
.../configuration-hackage2nix.yaml | 32 +++++++++----------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 8a2e787038db..0963bbca111e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -75,7 +75,7 @@ default-package-overrides:
# haskell-language-server 0.5.0.0 doesn't accept newer versions
- fourmolu ==0.2.*
- refinery ==0.2.*
- # LTS Haskell 16.19
+ # LTS Haskell 16.20
- abstract-deque ==0.3
- abstract-par ==0.3.3
- AC-Angle ==1.0
@@ -91,7 +91,7 @@ default-package-overrides:
- aeson-attoparsec ==0.0.0
- aeson-better-errors ==0.9.1.0
- aeson-casing ==0.2.0.0
- - aeson-combinators ==0.0.3.0
+ - aeson-combinators ==0.0.4.0
- aeson-compat ==0.3.9
- aeson-default ==0.9.1.0
- aeson-diff ==1.1.0.9
@@ -214,12 +214,12 @@ default-package-overrides:
- annotated-wl-pprint ==0.7.0
- ansi-terminal ==0.10.3
- ansi-wl-pprint ==0.6.9
- - antiope-core ==7.5.1
- - antiope-dynamodb ==7.5.1
- - antiope-messages ==7.5.1
- - antiope-s3 ==7.5.1
- - antiope-sns ==7.5.1
- - antiope-sqs ==7.5.1
+ - antiope-core ==7.5.3
+ - antiope-dynamodb ==7.5.3
+ - antiope-messages ==7.5.3
+ - antiope-s3 ==7.5.3
+ - antiope-sns ==7.5.3
+ - antiope-sqs ==7.5.3
- ANum ==0.2.0.2
- apecs ==0.9.2
- apecs-gloss ==0.2.4
@@ -814,7 +814,7 @@ default-package-overrides:
- fmlist ==0.9.4
- fmt ==0.6.1.2
- fn ==0.3.0.2
- - focus ==1.0.1.3
+ - focus ==1.0.1.4
- focuslist ==0.1.0.2
- foldable1 ==0.1.0.0
- fold-debounce ==0.2.0.9
@@ -975,7 +975,7 @@ default-package-overrides:
- hackage-db ==2.1.0
- hackage-security ==0.6.0.1
- haddock-library ==1.8.0
- - hadolint ==1.18.0
+ - hadolint ==1.18.2
- hadoop-streaming ==0.2.0.3
- hakyll ==4.13.4.0
- half ==0.3
@@ -1275,7 +1275,7 @@ default-package-overrides:
- JuicyPixels-blurhash ==0.1.0.3
- JuicyPixels-extra ==0.4.1
- JuicyPixels-scale-dct ==0.1.2
- - junit-xml ==0.1.0.1
+ - junit-xml ==0.1.0.2
- justified-containers ==0.3.0.0
- jwt ==0.10.0
- kan-extensions ==5.2.1
@@ -1302,7 +1302,7 @@ default-package-overrides:
- language-bash ==0.9.2
- language-c ==0.8.3
- language-c-quote ==0.12.2.1
- - language-docker ==9.1.1
+ - language-docker ==9.1.2
- language-haskell-extract ==0.2.4
- language-java ==0.2.9
- language-javascript ==0.7.1.0
@@ -1651,7 +1651,7 @@ default-package-overrides:
- password-instances ==2.0.0.1
- path ==0.7.0
- path-extra ==0.2.0
- - path-io ==1.6.1
+ - path-io ==1.6.2
- path-pieces ==0.2.1
- path-text-utf8 ==0.0.1.6
- pathtype ==0.8.1.1
@@ -1818,7 +1818,7 @@ default-package-overrides:
- range ==0.3.0.2
- Ranged-sets ==0.4.0
- range-set-list ==0.1.3.1
- - rank1dynamic ==0.4.0
+ - rank1dynamic ==0.4.1
- rank2classes ==1.3.2.1
- Rasterific ==0.7.5.3
- rasterific-svg ==0.3.3.2
@@ -2478,7 +2478,7 @@ default-package-overrides:
- xdg-userdirs ==0.1.0.2
- xeno ==0.4.2
- xls ==0.1.3
- - xlsx ==0.8.1
+ - xlsx ==0.8.2
- xlsx-tabular ==0.2.2.1
- xml ==1.3.14
- xml-basic ==0.1.3.1
@@ -2507,7 +2507,7 @@ default-package-overrides:
- yesod-auth-fb ==1.10.1
- yesod-auth-hashdb ==1.7.1.2
- yesod-bin ==1.6.0.6
- - yesod-core ==1.6.18.4
+ - yesod-core ==1.6.18.5
- yesod-fb ==0.6.1
- yesod-form ==1.6.7
- yesod-form-bootstrap4 ==3.0.0
From 035ba1797d3a7d19dcc6e764cf8a5f1024a48cfc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 30 Oct 2020 20:15:35 +0100
Subject: [PATCH 565/590] hackage2nix: disable broken builds to fix evaluation
---
.../haskell-modules/configuration-hackage2nix.yaml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 0963bbca111e..c6812370e826 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -8746,7 +8746,11 @@ broken-packages:
- polydata-core
- polynomial
- polysemy-chronos
+ - polysemy-extra
+ - polysemy-fskvstore
- polysemy-http
+ - polysemy-kvstore-jsonfile
+ - polysemy-methodology
- polysemy-optics
- polysemy-RandomFu
- polysemy-resume
@@ -11115,6 +11119,7 @@ broken-packages:
- windns
- windowslive
- winerror
+ - winery
- winio
- Wired
- wires
From 857d62462a64af23acdf5b27f3e40c111765dd35 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sat, 24 Oct 2020 14:36:06 +0200
Subject: [PATCH 566/590] haskellPackages.flat: unbreak
flat builds fine again as is.
---
pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
1 file changed, 1 deletion(-)
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index c6812370e826..3a31056fd12f 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -5066,7 +5066,6 @@ broken-packages:
- flamethrower
- flamingra
- flashblast
- - flat
- flat-maybe
- flatbuffers
- flay
From a2c9fb0aaa124edbb5b5ebcc20a4ee4b9169eaa5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 24 Oct 2020 02:30:32 +0200
Subject: [PATCH 567/590] hackage-packages.nix: automatic Haskell package set
update
This update was generated by hackage2nix v2.15.5-26-gcfec46d from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/950856114c6c691a0b33763d8ee677e5361923a6.
---
.../haskell-modules/hackage-packages.nix | 1353 ++++++++++-------
1 file changed, 786 insertions(+), 567 deletions(-)
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f48e90b187bf..6169d134ddaa 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -836,8 +836,8 @@ self: {
}:
mkDerivation {
pname = "Agda";
- version = "2.6.1.1";
- sha256 = "0d4j3n96wyc2crz238q49sb31ll6dfddllb82ry0jnsk8f0ypx2p";
+ version = "2.6.1.2";
+ sha256 = "0b872fi12j316zcbwnablkg45p252a4sqca9lsgfig55qirk0w08";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -2775,7 +2775,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "Cabal_3_2_0_0" = callPackage
+ "Cabal_3_2_1_0" = callPackage
({ mkDerivation, array, base, base-compat, base-orphans, binary
, bytestring, containers, deepseq, Diff, directory, filepath
, integer-logarithms, mtl, optparse-applicative, parsec, pretty
@@ -2785,8 +2785,10 @@ self: {
}:
mkDerivation {
pname = "Cabal";
- version = "3.2.0.0";
- sha256 = "0vz6bl1ia7wjc62sj5iw5jhigdwfz6yz01mripjcymv4qrbkl1gj";
+ version = "3.2.1.0";
+ sha256 = "1xfn9q6jnbp3jc6swn4hapa83f5m66pjz8fqbqmffydagf36fkzy";
+ revision = "1";
+ editedCabalFile = "07brbxkjlf1yqs9bjdwcwq1gx853kh600qnrf6bnya92q1p0fhw7";
setupHaskellDepends = [ mtl parsec ];
libraryHaskellDepends = [
array base binary bytestring containers deepseq directory filepath
@@ -21914,8 +21916,8 @@ self: {
}:
mkDerivation {
pname = "Z-IO";
- version = "0.1.6.1";
- sha256 = "1cd84n434i2l13xziys0rm7wx5iqw2xqydf96yj6fwkaysh3hrps";
+ version = "0.1.7.0";
+ sha256 = "0xvl0xgqcwqvsvqhdysgh3i2lhp1vi7sglgzzmzxz3142a67xpgd";
libraryHaskellDepends = [
base exceptions primitive stm time unix-time Z-Data
];
@@ -23936,8 +23938,8 @@ self: {
}:
mkDerivation {
pname = "addy";
- version = "0.1.0.0";
- sha256 = "10p7q0infa1bawhg7hxw8rqjqdj3w737j5s3g41hy4in2nfp5ji0";
+ version = "0.1.0.1";
+ sha256 = "1mvxnbb1118f26581zqyh0id4g1qnn44f8q3h0sfpijf0g1v9vg5";
libraryHaskellDepends = [
attoparsec base bytestring ip lens relude text text-icu
validation-selective
@@ -24411,8 +24413,8 @@ self: {
}:
mkDerivation {
pname = "aeson-combinators";
- version = "0.0.3.0";
- sha256 = "0x8bk7jxrg8j1zk5047sf5i6fy6hahjzrfnyzgwv1l443z4v445n";
+ version = "0.0.4.0";
+ sha256 = "01gsrm6glr2axcls4hxs740z8lxf39cvdhvidf360mnijai4sgl6";
libraryHaskellDepends = [
aeson base bytestring containers fail scientific text time
time-compat unordered-containers uuid-types vector void
@@ -25513,6 +25515,28 @@ self: {
broken = true;
}) {};
+ "agda-unused" = callPackage
+ ({ mkDerivation, aeson, Agda, base, containers, directory, filepath
+ , hspec, megaparsec, mtl, optparse-applicative, text
+ }:
+ mkDerivation {
+ pname = "agda-unused";
+ version = "0.1.0";
+ sha256 = "1g0iyv9x46ql8j9ggb6nw58274vqb6z850x26glaqcdwa3wvn1i1";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ Agda base containers directory filepath megaparsec mtl text
+ ];
+ executableHaskellDepends = [
+ aeson base directory filepath mtl optparse-applicative text
+ ];
+ testHaskellDepends = [ base containers filepath hspec text ];
+ description = "Check for unused code in an Agda project";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"agentx" = callPackage
({ mkDerivation, base, binary, bitwise, bytestring, containers
, data-default, Diff, fclabels, mtl, network, pipes
@@ -30297,32 +30321,6 @@ self: {
}) {};
"antiope-core" = callPackage
- ({ mkDerivation, aeson, aeson-lens, amazonka, amazonka-core, base
- , bytestring, exceptions, generic-lens, hedgehog, hspec
- , hspec-discover, http-client, http-types, hw-hspec-hedgehog, lens
- , mtl, resourcet, scientific, text, transformers, unliftio-core
- }:
- mkDerivation {
- pname = "antiope-core";
- version = "7.5.1";
- sha256 = "068dsdag8bng2ddzr0vxipmzrfa5x3jq80pmrmc0l86bjvnlsdjr";
- libraryHaskellDepends = [
- aeson amazonka amazonka-core base bytestring exceptions
- generic-lens http-client http-types lens mtl resourcet text
- transformers unliftio-core
- ];
- testHaskellDepends = [
- aeson aeson-lens amazonka amazonka-core base bytestring exceptions
- generic-lens hedgehog hspec http-client http-types
- hw-hspec-hedgehog lens mtl resourcet scientific text transformers
- unliftio-core
- ];
- testToolDepends = [ hspec-discover ];
- description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "antiope-core_7_5_3" = callPackage
({ mkDerivation, aeson, aeson-lens, amazonka, amazonka-core, base
, bytestring, exceptions, generic-lens, hedgehog, hspec
, hspec-discover, http-client, http-types, hw-hspec-hedgehog, lens
@@ -30346,34 +30344,9 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"antiope-dynamodb" = callPackage
- ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb
- , antiope-core, base, generic-lens, hspec-discover, lens, text
- , unliftio-core, unordered-containers
- }:
- mkDerivation {
- pname = "antiope-dynamodb";
- version = "7.5.1";
- sha256 = "19d7rbz4qqq3pd9nncydgvda798a5ziw21zkpa5d0smfna71zckp";
- libraryHaskellDepends = [
- aeson amazonka amazonka-core amazonka-dynamodb antiope-core base
- generic-lens lens text unliftio-core unordered-containers
- ];
- testHaskellDepends = [
- amazonka amazonka-core amazonka-dynamodb antiope-core base
- generic-lens lens text unliftio-core unordered-containers
- ];
- testToolDepends = [ hspec-discover ];
- description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
- license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
- }) {};
-
- "antiope-dynamodb_7_5_3" = callPackage
({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb
, antiope-core, base, generic-lens, hspec-discover, lens, text
, unliftio-core, unordered-containers
@@ -30417,30 +30390,6 @@ self: {
}) {};
"antiope-messages" = callPackage
- ({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring
- , generic-lens, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog
- , lens, lens-aeson, monad-loops, network-uri, scientific, text
- , unliftio-core
- }:
- mkDerivation {
- pname = "antiope-messages";
- version = "7.5.1";
- sha256 = "01hkq4n5jpfnb9i8ysaj73zknvkhpxb3mnq7csv2dc29ral4vzdp";
- libraryHaskellDepends = [
- aeson amazonka amazonka-core base bytestring generic-lens lens
- lens-aeson monad-loops network-uri text unliftio-core
- ];
- testHaskellDepends = [
- aeson amazonka amazonka-core base bytestring generic-lens hedgehog
- hspec hw-hspec-hedgehog lens lens-aeson monad-loops network-uri
- scientific text unliftio-core
- ];
- testToolDepends = [ hspec-discover ];
- description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "antiope-messages_7_5_3" = callPackage
({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring
, generic-lens, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog
, lens, lens-aeson, monad-loops, network-uri, scientific, text
@@ -30462,7 +30411,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"antiope-optparse-applicative" = callPackage
@@ -30487,34 +30435,6 @@ self: {
}) {};
"antiope-s3" = callPackage
- ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
- , antiope-core, antiope-messages, attoparsec, base, bytestring
- , conduit, conduit-extra, deepseq, dlist, exceptions, generic-lens
- , hedgehog, hspec, hspec-discover, http-types, hw-hspec-hedgehog
- , lens, mtl, network-uri, resourcet, text, time, unliftio-core
- }:
- mkDerivation {
- pname = "antiope-s3";
- version = "7.5.1";
- sha256 = "0nqs90pqk8dfjbrc55f4gdw4ybw2fslbx9z2x8k45mqpri3xwc0y";
- libraryHaskellDepends = [
- aeson amazonka amazonka-core amazonka-s3 antiope-core
- antiope-messages attoparsec base bytestring conduit conduit-extra
- deepseq dlist exceptions generic-lens http-types lens mtl
- network-uri resourcet text time unliftio-core
- ];
- testHaskellDepends = [
- aeson amazonka amazonka-core amazonka-s3 antiope-core attoparsec
- base bytestring conduit conduit-extra exceptions generic-lens
- hedgehog hspec http-types hw-hspec-hedgehog lens mtl network-uri
- resourcet text time unliftio-core
- ];
- testToolDepends = [ hspec-discover ];
- description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "antiope-s3_7_5_3" = callPackage
({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
, antiope-core, antiope-messages, attoparsec, base, bytestring
, conduit, conduit-extra, deepseq, dlist, exceptions, generic-lens
@@ -30540,7 +30460,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"antiope-shell" = callPackage
@@ -30573,29 +30492,6 @@ self: {
}) {};
"antiope-sns" = callPackage
- ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base
- , bytestring, generic-lens, hedgehog, hspec, hspec-discover
- , hw-hspec-hedgehog, lens, text, time, unliftio-core
- }:
- mkDerivation {
- pname = "antiope-sns";
- version = "7.5.1";
- sha256 = "13wzfjqihsi0xw7j869knj82a6k1fi74fywhlqc3bh1xc6wcir7q";
- libraryHaskellDepends = [
- aeson amazonka amazonka-core amazonka-sns base bytestring
- generic-lens lens text time unliftio-core
- ];
- testHaskellDepends = [
- aeson amazonka amazonka-core amazonka-sns base bytestring
- generic-lens hedgehog hspec hw-hspec-hedgehog lens text time
- unliftio-core
- ];
- testToolDepends = [ hspec-discover ];
- description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "antiope-sns_7_5_3" = callPackage
({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base
, bytestring, generic-lens, hedgehog, hspec, hspec-discover
, hw-hspec-hedgehog, lens, text, time, unliftio-core
@@ -30616,36 +30512,9 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"antiope-sqs" = callPackage
- ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base
- , bytestring, conduit, generic-lens, hedgehog, hspec
- , hspec-discover, hw-hspec-hedgehog, lens, lens-aeson, monad-loops
- , mtl, network-uri, split, text, time, unliftio-core
- , unordered-containers
- }:
- mkDerivation {
- pname = "antiope-sqs";
- version = "7.5.1";
- sha256 = "1y3fxqx5595agcnr157q3jap0dmcss8lyij187j9f29y0wkbkzv6";
- libraryHaskellDepends = [
- aeson amazonka amazonka-core amazonka-sqs base bytestring conduit
- generic-lens lens lens-aeson monad-loops mtl network-uri split text
- unliftio-core unordered-containers
- ];
- testHaskellDepends = [
- aeson amazonka amazonka-core amazonka-sqs base bytestring conduit
- generic-lens hedgehog hspec hw-hspec-hedgehog lens lens-aeson
- monad-loops mtl network-uri text time unliftio-core
- ];
- testToolDepends = [ hspec-discover ];
- description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "antiope-sqs_7_5_3" = callPackage
({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base
, bytestring, conduit, generic-lens, hedgehog, hspec
, hspec-discover, hw-hspec-hedgehog, lens, lens-aeson, monad-loops
@@ -30669,7 +30538,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"antiope-swf" = callPackage
@@ -35407,6 +35275,26 @@ self: {
broken = true;
}) {};
+ "aur_7_0_5" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, hashable, http-client
+ , http-client-tls, http-types, tasty, tasty-hunit, text
+ }:
+ mkDerivation {
+ pname = "aur";
+ version = "7.0.5";
+ sha256 = "16c4q0w6qpn4gg6xlggkcs92fcvm58a3qmykfm1dgcfsjhwwhxkx";
+ libraryHaskellDepends = [
+ aeson base bytestring hashable http-client http-types text
+ ];
+ testHaskellDepends = [
+ base http-client http-client-tls tasty tasty-hunit
+ ];
+ description = "Access metadata from the Arch Linux User Repository";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"aur-api" = callPackage
({ mkDerivation, aeson, base, bytestring, exceptions, hspec
, http-client, http-client-tls, mtl, text
@@ -35461,6 +35349,42 @@ self: {
broken = true;
}) {};
+ "aura_3_2_2" = callPackage
+ ({ mkDerivation, aeson, algebraic-graphs, aur, base, bytestring
+ , containers, filepath, hashable, http-client, http-client-tls
+ , http-types, language-bash, megaparsec, network-uri
+ , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
+ , rio, scheduler, stm, tasty, tasty-hunit, text, time, transformers
+ , typed-process, versions
+ }:
+ mkDerivation {
+ pname = "aura";
+ version = "3.2.2";
+ sha256 = "07ska8w2k3sl084aadjclw8v0ykrp8hiwhim5zd6wd7q95njyk2f";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson algebraic-graphs aur base bytestring containers filepath
+ hashable http-client http-types language-bash megaparsec
+ network-uri prettyprinter prettyprinter-ansi-terminal rio scheduler
+ stm text time transformers typed-process versions
+ ];
+ executableHaskellDepends = [
+ aeson aur base bytestring containers http-client http-client-tls
+ megaparsec optparse-applicative prettyprinter
+ prettyprinter-ansi-terminal rio scheduler text transformers
+ typed-process versions
+ ];
+ testHaskellDepends = [
+ base bytestring containers megaparsec rio tasty tasty-hunit text
+ versions
+ ];
+ description = "A secure package manager for Arch Linux and the AUR";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"authenticate" = callPackage
({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
, case-insensitive, conduit, containers, html-conduit, http-conduit
@@ -37648,8 +37572,8 @@ self: {
({ mkDerivation, barbies, base, split, template-haskell }:
mkDerivation {
pname = "barbies-th";
- version = "0.1.5";
- sha256 = "0bjbvamihrwh4l5zs8fnk2iq98fd1d2xkfbsvp6spfcp1ynqlj6k";
+ version = "0.1.7";
+ sha256 = "1wzy8j4i9mp1vlfkrixc49nv1c6prqspvhkjdwp16bvdz4fgbvpq";
libraryHaskellDepends = [ barbies base split template-haskell ];
testHaskellDepends = [ barbies base ];
description = "Create strippable HKD via TH";
@@ -45879,8 +45803,8 @@ self: {
pname = "broadcast-chan-tests";
version = "0.2.1.1";
sha256 = "0qx8j9sfky5qvrxrn4is9sja4qh6jh7jahq3zkyyq3a54jkwc8d3";
- revision = "2";
- editedCabalFile = "0dc7drwischhs0k95hjrlssxlqdg3ickrbbrki7wjslmk8k00bki";
+ revision = "3";
+ editedCabalFile = "1x34m1wk5m9ryfhp86wm4bmvwdghrknsmir356nnb3y3xm8558b4";
libraryHaskellDepends = [
async base broadcast-chan clock containers optparse-applicative
paramtree stm tagged tasty tasty-golden tasty-hunit tasty-travis
@@ -47120,22 +47044,23 @@ self: {
}) {};
"byline" = callPackage
- ({ mkDerivation, ansi-terminal, base, colour, exceptions, free
- , haskeline, mtl, relude, tasty, tasty-hunit, terminfo-hs, text
+ ({ mkDerivation, ansi-terminal, attoparsec, base, colour
+ , exceptions, free, haskeline, mtl, optparse-applicative, relude
+ , tasty, tasty-hunit, terminfo-hs, text
}:
mkDerivation {
pname = "byline";
- version = "1.0.0.0";
- sha256 = "1jwjdjiraq37pr2ysc9h5qqlma6j7rd2dkip2y2f6bx07d1v7fpr";
+ version = "1.1.0.1";
+ sha256 = "1vj17x2czfks5bdns8181iw7rbfghk9pgx5f75xwzn9p6xycg9hy";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- ansi-terminal base colour exceptions free haskeline mtl relude
- terminfo-hs text
+ ansi-terminal attoparsec base colour exceptions free haskeline mtl
+ optparse-applicative relude terminfo-hs text
];
testHaskellDepends = [
- ansi-terminal base colour exceptions free haskeline mtl relude
- tasty tasty-hunit terminfo-hs text
+ ansi-terminal attoparsec base colour exceptions free haskeline mtl
+ optparse-applicative relude tasty tasty-hunit terminfo-hs text
];
description = "Library for creating command-line interfaces (colors, menus, etc.)";
license = stdenv.lib.licenses.bsd2;
@@ -47572,8 +47497,8 @@ self: {
pname = "bytestring-handle";
version = "0.1.0.6";
sha256 = "18f17aja1ivhr3zyg2cccn2m03hdn5jf5410dndkhf12gvgiqs7y";
- revision = "1";
- editedCabalFile = "0x11aj6w1lijh84jcdq1qgyvdnc7i9ivbyq4wf9rxicg57viisz9";
+ revision = "2";
+ editedCabalFile = "1x1sy3dz2ph9v6jk22wmcv5gk2bka5fv4s68i8q0j9m9pk085w37";
libraryHaskellDepends = [ base bytestring ];
testHaskellDepends = [
base bytestring HUnit QuickCheck test-framework
@@ -48676,8 +48601,8 @@ self: {
}:
mkDerivation {
pname = "cabal-fmt";
- version = "0.1.4";
- sha256 = "0akc63g7h21nyyr9m0dwjlnxqw8k26zx5s2mzn8zak2q9i88ds1b";
+ version = "0.1.5";
+ sha256 = "1fsnjipd3j4vx77pmslkrdkf2wzqalqhwpcp5drxksl68nnxy8ad";
isLibrary = false;
isExecutable = true;
libraryHaskellDepends = [
@@ -50648,8 +50573,8 @@ self: {
}:
mkDerivation {
pname = "capnp";
- version = "0.6.0.3";
- sha256 = "0zrga41zk41881kr79grdwzl5caawv3khnvpbkhmhfzq3snmnhgd";
+ version = "0.7.0.0";
+ sha256 = "1mzs7f50840jbyzdipff47rwjmxv7i0rk6w4rdljzkw36yz4kj4v";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -51677,8 +51602,8 @@ self: {
}:
mkDerivation {
pname = "cassava-streams";
- version = "0.3.0.4";
- sha256 = "17g3qrinzfpmbcqyjrnwaycplmys0p93hb6841cp5rr1pjramb55";
+ version = "0.3.0.5";
+ sha256 = "1zv5y5jnzbpm407zz3lhfzsf7hr923dzshb2w2xyh5y3v427rwn5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -55488,8 +55413,8 @@ self: {
}:
mkDerivation {
pname = "clckwrks";
- version = "0.26.2.2";
- sha256 = "1m6a043y72da9nyr8x35v5lrh12is49rwarj5dlrm8clp8n987dp";
+ version = "0.26.2.3";
+ sha256 = "1bark213l3kx5gbr5nxnlhnrif5sg9z5v3igpcl47yisy99695p4";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
acid-state aeson aeson-qq attoparsec base blaze-html bytestring
@@ -55669,8 +55594,8 @@ self: {
}:
mkDerivation {
pname = "clckwrks-plugin-page";
- version = "0.4.3.23";
- sha256 = "0mk6vz98l2xxhk8w457mbgbcjslnbv34swjrwfjjqk9jhmcnmxss";
+ version = "0.4.3.24";
+ sha256 = "0zsf8j8l99cxskjql8zh407ar7920ph6xn42j8nxnh6qir16wdar";
libraryHaskellDepends = [
acid-state aeson attoparsec base clckwrks containers directory
filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl
@@ -61760,6 +61685,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "configurator-pg_0_2_5" = callPackage
+ ({ mkDerivation, base, bytestring, containers, filepath, HUnit
+ , megaparsec, protolude, scientific, test-framework
+ , test-framework-hunit, text
+ }:
+ mkDerivation {
+ pname = "configurator-pg";
+ version = "0.2.5";
+ sha256 = "1wmdg9zxfz8vhhsq5rraynhrhqc8fjrdhfrky2mfajzbp8dpaqsm";
+ libraryHaskellDepends = [
+ base containers megaparsec protolude scientific text
+ ];
+ testHaskellDepends = [
+ base bytestring filepath HUnit protolude test-framework
+ test-framework-hunit text
+ ];
+ description = "Reduced parser for configurator-ng config files";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"confsolve" = callPackage
({ mkDerivation, attoparsec, base, cmdargs, process, system-fileio
, system-filepath, text, time, unordered-containers
@@ -62573,8 +62519,8 @@ self: {
}:
mkDerivation {
pname = "context";
- version = "0.1.0.0";
- sha256 = "17w0narhg25ls1rs2xp8x0yxh5jhw52b0c3zgi9ivn99j7c8qrhd";
+ version = "0.1.1.1";
+ sha256 = "0zn8hnyf04q7brchll3xnk0ifxadl050wric191irmnl29m6p5k8";
libraryHaskellDepends = [ base containers ];
testHaskellDepends = [ async base ghc-prim hspec ];
testToolDepends = [ hspec-discover ];
@@ -64839,6 +64785,21 @@ self: {
broken = true;
}) {};
+ "crdt-event-fold" = callPackage
+ ({ mkDerivation, base, binary, containers, data-default-class
+ , data-dword
+ }:
+ mkDerivation {
+ pname = "crdt-event-fold";
+ version = "1.0.0.2";
+ sha256 = "0bhfbzxb7s49x6nk1gg1n5nf26h8xqgy41ln7d5j59zp0lri5c04";
+ libraryHaskellDepends = [
+ base binary containers data-default-class data-dword
+ ];
+ description = "Garbage collected event folding CRDT";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"creatur" = callPackage
({ mkDerivation, array, base, binary, bytestring, cereal, cond
, directory, exceptions, filepath, gray-extended, hdaemonize
@@ -67358,8 +67319,8 @@ self: {
}:
mkDerivation {
pname = "cut-the-crap";
- version = "2.1.1";
- sha256 = "0w0ir436gmh3d9ycdcjyxkgblrah7ij5njqmm44lx1kyhih6bk2x";
+ version = "2.2.0";
+ sha256 = "19i1wmh9163fb8wggnla4c8r51j71wiwyzhhh3mznckhaws40fqa";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -72727,6 +72688,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "deriving-show-simple" = callPackage
+ ({ mkDerivation, base, HUnit }:
+ mkDerivation {
+ pname = "deriving-show-simple";
+ version = "0";
+ sha256 = "0m0sill0h6k651l1il6g4g5ypinwq77x9xy01jbj5gawcs9mln0i";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base HUnit ];
+ description = "Derive a Show instance without field selector names";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"derp" = callPackage
({ mkDerivation, base, containers }:
mkDerivation {
@@ -75133,8 +75106,8 @@ self: {
}:
mkDerivation {
pname = "digit";
- version = "0.9";
- sha256 = "0xyghgg8kzjrvhrcjizqnbprcyq5a3ma3x0dfijrdvbyd3lzghvm";
+ version = "0.10";
+ sha256 = "1qvz2gj4f2fcq8m8s4h6q5r2y3z55dhk4zxxijxha3mqfiybh4ky";
libraryHaskellDepends = [
base lens parsers scientific semigroupoids semigroups
template-haskell
@@ -81306,7 +81279,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "egison_4_1_1" = callPackage
+ "egison_4_1_2" = callPackage
({ mkDerivation, array, base, containers, criterion, directory
, exceptions, filepath, ghc, ghc-paths, Glob, hashable, haskeline
, HUnit, megaparsec, mtl, optparse-applicative, parsec
@@ -81316,8 +81289,8 @@ self: {
}:
mkDerivation {
pname = "egison";
- version = "4.1.1";
- sha256 = "16z2zp3gjm3gwp884ab86g0vhkxkkfxma0p9h1as5fyc6kvnsdbn";
+ version = "4.1.2";
+ sha256 = "1h388s7pagjipzgxyy1l3w3f03vl17bg9vl0afidjdmqm294mp8m";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -81333,10 +81306,10 @@ self: {
regex-tdfa split text transformers unordered-containers vector
];
testHaskellDepends = [
- base filepath Glob HUnit mtl test-framework test-framework-hunit
- transformers
+ base filepath Glob HUnit mtl process test-framework
+ test-framework-hunit transformers
];
- benchmarkHaskellDepends = [ base criterion ];
+ benchmarkHaskellDepends = [ base criterion transformers ];
description = "Programming language with non-linear pattern-matching against non-free data";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -84729,6 +84702,35 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "esqueleto_3_4_0_0" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring
+ , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql
+ , mysql-simple, persistent, persistent-mysql, persistent-postgresql
+ , persistent-sqlite, persistent-template, postgresql-libpq
+ , postgresql-simple, resourcet, tagged, text, time, transformers
+ , unliftio, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "esqueleto";
+ version = "3.4.0.0";
+ sha256 = "0a4wrkcwlzgw0mds1pnxspv6ddzy9mz0md0qdx0x9s51z9ldswaj";
+ libraryHaskellDepends = [
+ aeson attoparsec base blaze-html bytestring conduit containers
+ monad-logger persistent resourcet tagged text time transformers
+ unliftio unordered-containers
+ ];
+ testHaskellDepends = [
+ aeson attoparsec base blaze-html bytestring conduit containers
+ exceptions hspec monad-logger mtl mysql mysql-simple persistent
+ persistent-mysql persistent-postgresql persistent-sqlite
+ persistent-template postgresql-libpq postgresql-simple resourcet
+ tagged text time transformers unliftio unordered-containers vector
+ ];
+ description = "Type-safe EDSL for SQL queries on persistent backends";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ess" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -86208,6 +86210,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "exception-via" = callPackage
+ ({ mkDerivation, base, template-haskell }:
+ mkDerivation {
+ pname = "exception-via";
+ version = "0.1.0.0";
+ sha256 = "046f787jw3v1c61q9c9canq0m266wv39rsk0613fyrhl96sss66m";
+ libraryHaskellDepends = [ base template-haskell ];
+ description = "DerivingVia for your hierarchical exceptions";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"exceptional" = callPackage
({ mkDerivation, base, exceptions }:
mkDerivation {
@@ -88037,8 +88050,8 @@ self: {
}:
mkDerivation {
pname = "faktory";
- version = "1.0.1.2";
- sha256 = "12pabsmy21il88qmdbg91152y9nzqci9y2cn9ljizlcndnsy7s5l";
+ version = "1.0.1.3";
+ sha256 = "1mxgkf54hxlj753dva21gxdqamq4mgfslcq5gqhp154gi0xmm79w";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -89748,10 +89761,8 @@ self: {
}:
mkDerivation {
pname = "ffmpeg-light";
- version = "0.12.2.2";
- sha256 = "0yn1qhj2kzicxpjmy09lb660psjavbrfib29q0m1b8zx0fvn5xzk";
- revision = "1";
- editedCabalFile = "1wwfbrpr5hz1a9lppn73j2gpal3l2jnn554k6w9n181fbk67xvjd";
+ version = "0.13.0";
+ sha256 = "1xvhpzd3kf2xn6s94lmpkxp9nv1jy20pr3x2qmqhc2gjxx9vcqg1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -91739,8 +91750,6 @@ self: {
];
description = "Principled and efficient bit-oriented binary serialization";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"flat-maybe" = callPackage
@@ -92795,23 +92804,6 @@ self: {
}) {};
"focus" = callPackage
- ({ mkDerivation, base, QuickCheck, quickcheck-instances, rerebase
- , tasty, tasty-hunit, tasty-quickcheck, transformers
- }:
- mkDerivation {
- pname = "focus";
- version = "1.0.1.3";
- sha256 = "1g10fzy76k5bjn8ysym8ywvrqrvxvhdi4b99wabhzznhzmankddx";
- libraryHaskellDepends = [ base transformers ];
- testHaskellDepends = [
- QuickCheck quickcheck-instances rerebase tasty tasty-hunit
- tasty-quickcheck
- ];
- description = "A general abstraction for manipulating elements of container data structures";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "focus_1_0_1_4" = callPackage
({ mkDerivation, base, QuickCheck, quickcheck-instances, rerebase
, tasty, tasty-hunit, tasty-quickcheck, transformers
}:
@@ -92826,7 +92818,6 @@ self: {
];
description = "A general abstraction for manipulating elements of container data structures";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"focuslist" = callPackage
@@ -103889,6 +103880,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "githash_0_1_5_0" = callPackage
+ ({ mkDerivation, base, bytestring, directory, filepath, hspec
+ , process, template-haskell, temporary, unliftio
+ }:
+ mkDerivation {
+ pname = "githash";
+ version = "0.1.5.0";
+ sha256 = "1m2dhmddn9k75j5wyjilbh40n7fkgi7cyic9l0k2s7g9z93yyvql";
+ libraryHaskellDepends = [
+ base bytestring directory filepath process template-haskell
+ ];
+ testHaskellDepends = [
+ base bytestring directory filepath hspec process template-haskell
+ temporary unliftio
+ ];
+ description = "Compile git revision info into Haskell projects";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"github" = callPackage
({ mkDerivation, aeson, base, base-compat, base16-bytestring
, binary, binary-instances, bytestring, containers, cryptohash-sha1
@@ -108424,8 +108435,8 @@ self: {
}:
mkDerivation {
pname = "google-server-api";
- version = "0.3.2.1";
- sha256 = "1bvj8pihsz4w53lax5k234p58v9r2k1gpkvdgjwl6n0vkqbw1qy8";
+ version = "0.3.3.1";
+ sha256 = "17lsjlfkr3crxyxhj7w77ga7h7c6va6z5qmyvmhwapmym1zmsqrs";
libraryHaskellDepends = [
aeson aeson-casing base base64-bytestring bytestring HsOpenSSL
http-api-data http-client http-client-tls http-media mime-mail
@@ -108565,8 +108576,8 @@ self: {
}:
mkDerivation {
pname = "gopro-plus";
- version = "0.4.1.0";
- sha256 = "1xim8kr58nnpfh1sj66p73alm1l8wwxqafx5b77wc51dwrjyz1p8";
+ version = "0.4.1.1";
+ sha256 = "1vcy9r4jnnrfc6xp34b4w5z4xgxhcnsv5sy26iazw6g07mg1v73p";
libraryHaskellDepends = [
aeson base bytestring containers exceptions filepath
generic-deriving lens lens-aeson mtl random retry text time
@@ -112983,8 +112994,8 @@ self: {
pname = "hackage-security-HTTP";
version = "0.1.1";
sha256 = "0chkrn4d33qjh50fpbkrkqj6jsxd5y5c2mrgqgwsdx3x08kaq8nd";
- revision = "1";
- editedCabalFile = "11k2jqnkqywdm2rzvcgib0p9i11z5g4d2yikfn932mjfr4ss51bj";
+ revision = "3";
+ editedCabalFile = "1nsvfqg2k1yj8pvbfx1083m29v1c9kcb9h389r380ga1b32v89nl";
libraryHaskellDepends = [
base bytestring hackage-security HTTP mtl network network-uri zlib
];
@@ -113492,34 +113503,6 @@ self: {
}) {};
"hadolint" = callPackage
- ({ mkDerivation, aeson, base, bytestring, containers, directory
- , filepath, gitrev, hspec, HsYAML, HUnit, language-docker
- , megaparsec, mtl, optparse-applicative, ShellCheck, split, text
- , void
- }:
- mkDerivation {
- pname = "hadolint";
- version = "1.18.0";
- sha256 = "1pvf1wr8sg2yv439yyd08jz75jzmpys5629pcii1kdx5vh2rp1yx";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson base bytestring containers directory filepath HsYAML
- language-docker megaparsec mtl ShellCheck split text void
- ];
- executableHaskellDepends = [
- base containers gitrev language-docker megaparsec
- optparse-applicative text
- ];
- testHaskellDepends = [
- aeson base bytestring hspec HsYAML HUnit language-docker megaparsec
- ShellCheck split text
- ];
- description = "Dockerfile Linter JavaScript API";
- license = stdenv.lib.licenses.gpl3;
- }) {};
-
- "hadolint_1_18_2" = callPackage
({ mkDerivation, aeson, async, base, bytestring, containers
, directory, filepath, gitrev, hspec, HsYAML, HUnit
, language-docker, megaparsec, mtl, optparse-applicative, parallel
@@ -113545,7 +113528,6 @@ self: {
];
description = "Dockerfile Linter JavaScript API";
license = stdenv.lib.licenses.gpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hadoop-formats" = callPackage
@@ -115525,8 +115507,8 @@ self: {
}:
mkDerivation {
pname = "happstack-clientsession";
- version = "7.3.1";
- sha256 = "1sl67wdzaf6j773iapjnc1v2k19ycd18irkdpb4px1a1mq6ym0sv";
+ version = "7.3.2";
+ sha256 = "0kl4g1y68hnj188n5a7hkj4a9s70943f837yyijanwahnmkgi1nc";
libraryHaskellDepends = [
base bytestring cereal clientsession happstack-server monad-control
mtl safecopy transformers-base
@@ -115759,8 +115741,8 @@ self: {
}:
mkDerivation {
pname = "happstack-hsp";
- version = "7.3.7.4";
- sha256 = "188fqqpq7m921qkfv2b64pikcx8zzsy376l4py4wxlkabl7fkydr";
+ version = "7.3.7.5";
+ sha256 = "1krjas0id8an3ry83xrgxl9cb18n17r394ivz05c45mwan6sbpqf";
libraryHaskellDepends = [
base bytestring happstack-server harp hsp hsx2hs mtl syb text
utf8-string
@@ -115813,8 +115795,8 @@ self: {
}:
mkDerivation {
pname = "happstack-jmacro";
- version = "7.0.12.2";
- sha256 = "0zgmh75z59g6hs8n924sbnhswjdd6b947ywiird2a3y6d2zwqj3v";
+ version = "7.0.12.3";
+ sha256 = "1phhy9sq7hiz3c50k5wyclrsjqacw8mcdyg80h3xi43zgjmff23w";
libraryHaskellDepends = [
base base64-bytestring bytestring cereal digest happstack-server
jmacro text utf8-string wl-pprint-text
@@ -125509,12 +125491,12 @@ self: {
}:
mkDerivation {
pname = "hex-text";
- version = "0.1.0.0";
- sha256 = "0if46jkzd67jwp56vmvd021qq2vfzpmaf1v2w07cy0w61icfvjxr";
+ version = "0.1.0.2";
+ sha256 = "0wgqm1ziblgljrh679i44gvdq7bqym37y1lnnpb1mk7qlv664c9h";
libraryHaskellDepends = [ base base16-bytestring bytestring text ];
testHaskellDepends = [ base doctest ];
description = "ByteString-Text hexidecimal conversions";
- license = stdenv.lib.licenses.asl20;
+ license = stdenv.lib.licenses.mit;
}) {};
"hexchat" = callPackage
@@ -126820,6 +126802,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hie-compat" = callPackage
+ ({ mkDerivation, array, base, bytestring, containers, directory
+ , filepath, ghc, ghc-boot, transformers
+ }:
+ mkDerivation {
+ pname = "hie-compat";
+ version = "0.1.0.0";
+ sha256 = "00wnb7ylahglw167n2n1b2a6b0b75ay167zzrl10jsskivxwx3h3";
+ libraryHaskellDepends = [
+ array base bytestring containers directory filepath ghc ghc-boot
+ transformers
+ ];
+ description = "HIE files for GHC 8.6 and other HIE file backports";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"hie-core" = callPackage
({ mkDerivation, aeson, async, base, binary, bytestring, containers
, data-default, deepseq, directory, extra, filepath, ghc, ghc-boot
@@ -135651,14 +135649,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hslua-module-doclayout_0_2_0" = callPackage
+ "hslua-module-doclayout_0_2_0_1" = callPackage
({ mkDerivation, base, doclayout, hslua, tasty, tasty-hunit
, tasty-lua, text
}:
mkDerivation {
pname = "hslua-module-doclayout";
- version = "0.2.0";
- sha256 = "1ilkyv0wscz2kv0jkn45qc8ng5l1hvvbkwh972zvisys1m3hri4y";
+ version = "0.2.0.1";
+ sha256 = "1fwzx85lv2547gs42lp7mx9w7b0vl4hpc0ql7ip5yqp17q58a08y";
libraryHaskellDepends = [ base doclayout hslua text ];
testHaskellDepends = [
base doclayout hslua tasty tasty-hunit tasty-lua
@@ -138698,6 +138696,26 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "http-client-openssl_0_3_2_0" = callPackage
+ ({ mkDerivation, base, bytestring, HsOpenSSL, HsOpenSSL-x509-system
+ , hspec, http-client, http-types, network
+ }:
+ mkDerivation {
+ pname = "http-client-openssl";
+ version = "0.3.2.0";
+ sha256 = "114aci8nvbzvhscla6172y7s47yp689rslhg8h7y3hmkh2zq7r65";
+ libraryHaskellDepends = [
+ base bytestring HsOpenSSL HsOpenSSL-x509-system http-client network
+ ];
+ testHaskellDepends = [
+ base HsOpenSSL hspec http-client http-types
+ ];
+ doCheck = false;
+ description = "http-client backend using the OpenSSL library";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"http-client-overrides" = callPackage
({ mkDerivation, aeson, base, bytestring, http-client
, http-client-tls, http-types, network-uri, tasty, tasty-hunit
@@ -138821,10 +138839,8 @@ self: {
}:
mkDerivation {
pname = "http-client-websockets";
- version = "0.1.0.0";
- sha256 = "1wx1dx3n8vjz3qa9l2a7l6i2scwbwxavjh0ss6awwphyirfl0v6p";
- revision = "1";
- editedCabalFile = "0wj1b817w8c0cjpqkbganvrbhz99hnr5gcj47l3g4bv4n90ygrpn";
+ version = "0.1.1.0";
+ sha256 = "1kmvwhfsp1l672km2a06pww0a3wmwbxcwwg1k78xcnc767wj0g1m";
libraryHaskellDepends = [
base bytestring http-client network-uri utf8-string websockets
];
@@ -139107,8 +139123,8 @@ self: {
}:
mkDerivation {
pname = "http-io-streams";
- version = "0.1.5.0";
- sha256 = "0c8x4iyvg2yjsvvfvvp96ddw9fpmjiaql4c7kpf93f9i5rkyxjy5";
+ version = "0.1.6.0";
+ sha256 = "03wndmw1pblnjqhni76s5lyyw3l8zbl1csydzl8bp0h1g5vmfpmp";
libraryHaskellDepends = [
attoparsec base base64-bytestring binary blaze-builder
brotli-streams bytestring case-insensitive containers
@@ -140381,8 +140397,8 @@ self: {
}:
mkDerivation {
pname = "hurl";
- version = "1.4.2.0";
- sha256 = "19qf4akwx7aazzy86zhkm5z60342hz07msqxir6ism98dd33fpwl";
+ version = "1.4.2.1";
+ sha256 = "158p0fnlvz03vj29q4b5lzv4070d3l64wa1zsg9v2xlcrr6lrp87";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -145053,8 +145069,8 @@ self: {
}:
mkDerivation {
pname = "in-other-words";
- version = "0.1.0.0";
- sha256 = "06ipmkbgncsgcq5rfyn0v4plhbbrzrcx3r4xr1f3f6xv760pfyra";
+ version = "0.1.1.0";
+ sha256 = "0f11si2bnxw2bm5mfnnqh9cfwhlzdcqkw5dfjql1y618db808am9";
libraryHaskellDepends = [
async base exceptions monad-control mtl stm transformers
transformers-base
@@ -145579,8 +145595,8 @@ self: {
}:
mkDerivation {
pname = "indigo";
- version = "0.3.0";
- sha256 = "1xga3i9rdd2y53m6c8v4c2r44clhs2f82nyynf81n8zjqfgxybkl";
+ version = "0.3.1";
+ sha256 = "1xc2gk7bihgpv78cl1c15x1izwsazmdpdsagan4d6yd0zw30xci4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -149599,8 +149615,8 @@ self: {
}:
mkDerivation {
pname = "j";
- version = "0.1.1.0";
- sha256 = "0a3xl4sr5s7436z8fnjg6vknk7wi202b8ryvswxrv1ks49h2zg8s";
+ version = "0.1.2.0";
+ sha256 = "053n10j75mv2iwrra51nv4vf48ki8q5aksqjbrlnzbhbm125jhf3";
libraryHaskellDepends = [ base bytestring repa unix ];
testHaskellDepends = [ base bytestring repa tasty tasty-hunit ];
description = "J in Haskell";
@@ -152276,8 +152292,8 @@ self: {
({ mkDerivation, base, tasty, tasty-golden, text, xml-conduit }:
mkDerivation {
pname = "junit-xml";
- version = "0.1.0.1";
- sha256 = "1r75ncsmr5yj7xbgrw4sipjii7l3v7hj6nfi1lidc26n4m7r8ib1";
+ version = "0.1.0.2";
+ sha256 = "0sm738irwvmdnn8cvf0rnvp8s5gmr0ih241l27sasqq18nra2v04";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base text xml-conduit ];
testHaskellDepends = [ base tasty tasty-golden ];
@@ -153957,22 +153973,24 @@ self: {
"keycloak-hs" = callPackage
({ mkDerivation, aeson, aeson-casing, base, base64-bytestring
- , bytestring, containers, exceptions, hslogger, http-api-data
- , http-client, http-types, jwt, lens, mtl, safe, string-conversions
- , text, word8, wreq
+ , bytestring, containers, exceptions, hashable, hslogger
+ , http-api-data, http-client, http-types, jose, lens, lens-aeson
+ , mtl, safe, string-conversions, text, unordered-containers, word8
+ , wreq
}:
mkDerivation {
pname = "keycloak-hs";
- version = "1.1.1";
- sha256 = "1ycr1q7sfr68zbx1jxnfv0c19w2nv2rxczi5aixd01ck8v1kx798";
+ version = "2.1.0";
+ sha256 = "0yki4fqbgirnvcaf5p00pskh91abspivgkkdi9m93andz56vl23v";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson aeson-casing base base64-bytestring bytestring containers
- exceptions hslogger http-api-data http-client http-types jwt lens
- mtl safe string-conversions text word8 wreq
+ exceptions hashable hslogger http-api-data http-client http-types
+ jose lens lens-aeson mtl safe string-conversions text
+ unordered-containers word8 wreq
];
- executableHaskellDepends = [ base ];
+ executableHaskellDepends = [ base hslogger ];
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -156505,27 +156523,6 @@ self: {
}) {};
"language-docker" = callPackage
- ({ mkDerivation, base, bytestring, containers, data-default-class
- , hspec, HUnit, megaparsec, prettyprinter, QuickCheck, split, text
- , time
- }:
- mkDerivation {
- pname = "language-docker";
- version = "9.1.1";
- sha256 = "1smrayjp8d8vqvn7lg2mg3lzsqqslysj6syh1ckbn1a5fmjpzfv2";
- libraryHaskellDepends = [
- base bytestring containers data-default-class megaparsec
- prettyprinter split text time
- ];
- testHaskellDepends = [
- base bytestring containers data-default-class hspec HUnit
- megaparsec prettyprinter QuickCheck split text time
- ];
- description = "Dockerfile parser, pretty-printer and embedded DSL";
- license = stdenv.lib.licenses.gpl3;
- }) {};
-
- "language-docker_9_1_2" = callPackage
({ mkDerivation, base, bytestring, containers, data-default-class
, hspec, HUnit, megaparsec, prettyprinter, QuickCheck, split, text
, time
@@ -156544,7 +156541,6 @@ self: {
];
description = "Dockerfile parser, pretty-printer and embedded DSL";
license = stdenv.lib.licenses.gpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"language-dockerfile" = callPackage
@@ -160509,8 +160505,8 @@ self: {
}:
mkDerivation {
pname = "liboath-hs";
- version = "0.0.1.1";
- sha256 = "0ikh4rch2zdv9xan70qkf68m9hdz8k86ji7jw9xci1cvg318zd1k";
+ version = "0.0.1.2";
+ sha256 = "08wnzsk82ahyb3fy2sd1ci6aw0h3wiiad2j4kxs1j90wbrwkd3ri";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -164445,6 +164441,8 @@ self: {
pname = "log-postgres";
version = "0.7.1.4";
sha256 = "1m96d5486xadypm5iby8rkb979k82md394j5iaik6xk5aavcn6xx";
+ revision = "1";
+ editedCabalFile = "0yyaxibkq8c9bwhaday8ijmfbm8k3i14wd9zsgfby99b6rxra351";
libraryHaskellDepends = [
aeson aeson-pretty base base64-bytestring bytestring deepseq
hpqtypes http-client lifted-base log-base mtl semigroups split text
@@ -165427,19 +165425,19 @@ self: {
({ mkDerivation, aeson-pretty, base, bimap, bytestring, constraints
, containers, data-default, first-class-families, fmt, interpolate
, lens, morley, morley-prelude, mtl, named, optparse-applicative
- , pretty-terminal, QuickCheck, singletons, template-haskell, text
- , text-manipulate, unordered-containers, vinyl, with-utf8
+ , singletons, template-haskell, text, text-manipulate
+ , unordered-containers, vinyl, with-utf8
}:
mkDerivation {
pname = "lorentz";
- version = "0.6.2";
- sha256 = "13xl9f538h729zn9dqjcj10qav1ggbma9rp4pyj0cdgj5mq8mv8w";
+ version = "0.7.0";
+ sha256 = "1nwz7cdjy0s1fa64q4ymyds2m6yhqx8vxjp0p9qn7b4l7civhk9c";
libraryHaskellDepends = [
aeson-pretty base bimap bytestring constraints containers
data-default first-class-families fmt interpolate lens morley
- morley-prelude mtl named optparse-applicative pretty-terminal
- QuickCheck singletons template-haskell text text-manipulate
- unordered-containers vinyl with-utf8
+ morley-prelude mtl named optparse-applicative singletons
+ template-haskell text text-manipulate unordered-containers vinyl
+ with-utf8
];
description = "EDSL for the Michelson Language";
license = stdenv.lib.licenses.mit;
@@ -170559,15 +170557,15 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
- "megaparsec_9_0_0" = callPackage
+ "megaparsec_9_0_1" = callPackage
({ mkDerivation, base, bytestring, case-insensitive, containers
, criterion, deepseq, mtl, parser-combinators, scientific, text
, transformers, weigh
}:
mkDerivation {
pname = "megaparsec";
- version = "9.0.0";
- sha256 = "1x10f2b14ww306am9w06s23va26ab3vwdh0jk67ql6ybigxh0asi";
+ version = "9.0.1";
+ sha256 = "00953zvxfyjibw8c1ssmixxh0cwn59pz24zbh6s34rk3v14vqa3j";
libraryHaskellDepends = [
base bytestring case-insensitive containers deepseq mtl
parser-combinators scientific text transformers
@@ -170606,7 +170604,7 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
- "megaparsec-tests_9_0_0" = callPackage
+ "megaparsec-tests_9_0_1" = callPackage
({ mkDerivation, base, bytestring, case-insensitive, containers
, hspec, hspec-discover, hspec-expectations, hspec-megaparsec
, megaparsec, mtl, parser-combinators, QuickCheck, scientific, text
@@ -170614,8 +170612,8 @@ self: {
}:
mkDerivation {
pname = "megaparsec-tests";
- version = "9.0.0";
- sha256 = "0zm246r8k48mj5v2dxjan7dsrcnw54bcm27swi5mh8c0yb3vcvab";
+ version = "9.0.1";
+ sha256 = "0synm14x1k9r5q7xmv21z0y95b42g7lvwn78mcnc3cx62x6393ng";
libraryHaskellDepends = [
base bytestring containers hspec hspec-expectations
hspec-megaparsec megaparsec mtl QuickCheck text transformers
@@ -173881,8 +173879,8 @@ self: {
({ mkDerivation, base, vector }:
mkDerivation {
pname = "mmsyn2";
- version = "0.2.0.0";
- sha256 = "1lxfl6gr42x9rhy4jpig9hwl0bnbidrv65i8f4fr39ifrx43fgxw";
+ version = "0.3.1.0";
+ sha256 = "06n8vxqafc698ahml782klb41g9bfsvqdrl4k0blnn3m3vavnzxy";
libraryHaskellDepends = [ base vector ];
description = "The library that can be used for multiple (Ord a) => a -> b transformations";
license = stdenv.lib.licenses.mit;
@@ -173904,8 +173902,8 @@ self: {
}:
mkDerivation {
pname = "mmsyn4";
- version = "0.4.0.0";
- sha256 = "0qfr2dlzigggbwgznh1sxxkp7qwvcba2rlhwdqs4rzaz53sx2xzj";
+ version = "0.5.0.0";
+ sha256 = "05r33lx2cxsf7a14809dgs7lhfqlglshpv22jfzrl2xy0rl3x4qz";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -173924,8 +173922,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "mmsyn5";
- version = "0.4.4.0";
- sha256 = "1yvsx82x7m5y2swxllhb7zzgspb3lfdhrbw6n5v3xsa9vxhwa35l";
+ version = "0.5.0.0";
+ sha256 = "0xbdmlq71pjnsls67mydrfzajnnyyzp0dvzgrg2lms3pssvzs6f1";
libraryHaskellDepends = [ base ];
description = "Various additional operations on lists (some with intermediate Monads)";
license = stdenv.lib.licenses.mit;
@@ -173937,8 +173935,8 @@ self: {
}:
mkDerivation {
pname = "mmsyn6ukr";
- version = "0.8.1.0";
- sha256 = "0r5lnx1m57kjfb1cfm9a22l9kn552y6vpfbkxpffi03ni407q65q";
+ version = "0.8.3.0";
+ sha256 = "017q1jf9490sddb0f6wjizcsv423izjqirgq7ymzpxcd4sbcdhyn";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -174116,8 +174114,8 @@ self: {
}:
mkDerivation {
pname = "mock-httpd";
- version = "0.0.0.0";
- sha256 = "0mv669gvn61by4j7sd4w2hvzr3vpa0szrhgzdciv5g1a0gsh3kk7";
+ version = "1.0.0";
+ sha256 = "1dn680lpvh2ww0ab4wgp9a7k2w309zymkjlp3igwk01q4cbjpsg2";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -174265,6 +174263,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "modern-uri_0_3_3_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, contravariant
+ , criterion, deepseq, exceptions, hspec, hspec-discover
+ , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck
+ , reflection, tagged, template-haskell, text, weigh
+ }:
+ mkDerivation {
+ pname = "modern-uri";
+ version = "0.3.3.0";
+ sha256 = "184vhcnpwjsvxwbdsipz7kc2xylfwfqflbbbyipag610w07a3qk2";
+ libraryHaskellDepends = [
+ base bytestring containers contravariant deepseq exceptions
+ megaparsec mtl profunctors QuickCheck reflection tagged
+ template-haskell text
+ ];
+ testHaskellDepends = [
+ base bytestring hspec hspec-megaparsec megaparsec QuickCheck text
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion deepseq megaparsec text weigh
+ ];
+ description = "Modern library for working with URIs";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"modify-fasta" = callPackage
({ mkDerivation, base, containers, fasta, mtl, optparse-applicative
, pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split
@@ -176818,15 +176843,14 @@ self: {
, generic-deriving, gitrev, haskeline, hex-text, interpolate, lens
, megaparsec, memory, morley-prelude, mtl, named
, optparse-applicative, parser-combinators, pretty-simple
- , QuickCheck, quickcheck-arbitrary-adt, quickcheck-instances
, semigroups, show-type, singletons, syb, template-haskell, text
, th-lift, th-lift-instances, time, timerep, transformers-compat
, unordered-containers, vector, vinyl, with-utf8, wl-pprint-text
}:
mkDerivation {
pname = "morley";
- version = "1.7.1";
- sha256 = "0za05qqx64zx92fsrnlk78m0d2g3ircw0k67fym7k5a9mck6bxg0";
+ version = "1.8.1";
+ sha256 = "1lchr282394vjwgi5l0innc7szxkp7pibrbma0yza37l3q295xz2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -176834,15 +176858,15 @@ self: {
bytestring constraints containers cryptonite data-default
first-class-families fmt generic-deriving gitrev hex-text
interpolate lens megaparsec memory morley-prelude mtl named
- optparse-applicative parser-combinators QuickCheck
- quickcheck-arbitrary-adt quickcheck-instances semigroups show-type
+ optparse-applicative parser-combinators semigroups show-type
singletons syb template-haskell text th-lift th-lift-instances time
timerep transformers-compat unordered-containers vector vinyl
with-utf8 wl-pprint-text
];
executableHaskellDepends = [
- aeson base bytestring fmt haskeline megaparsec morley-prelude named
- optparse-applicative pretty-simple text vinyl with-utf8
+ aeson base bytestring data-default fmt haskeline megaparsec
+ morley-prelude named optparse-applicative pretty-simple text vinyl
+ with-utf8
];
description = "Developer tools for the Michelson Language";
license = stdenv.lib.licenses.mit;
@@ -178467,8 +178491,8 @@ self: {
}:
mkDerivation {
pname = "mu-protobuf";
- version = "0.4.0.0";
- sha256 = "13323mk6maj4fn1vg98nkb80k1975mqaszbj67a4mr5n2s9vrlz2";
+ version = "0.4.0.1";
+ sha256 = "1dr2vgxkzxpkz0iiwzwbficm65flwfmcs5xbxx5mg5gwf7x0qz3l";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -178503,17 +178527,18 @@ self: {
}) {};
"mu-schema" = callPackage
- ({ mkDerivation, aeson, base, bytestring, containers, sop-core
- , template-haskell, text, th-abstraction, unordered-containers
- , uuid, vector
+ ({ mkDerivation, aeson, base, bytestring, containers
+ , first-class-families, sop-core, template-haskell, text
+ , th-abstraction, unordered-containers, uuid, vector
}:
mkDerivation {
pname = "mu-schema";
- version = "0.3.1.0";
- sha256 = "1kl62ask8cvjimjcb9f3y3vpvk544m3zlzp4jn1yrvbmzn3px0d1";
+ version = "0.3.1.1";
+ sha256 = "0n30xn2z1dl4n28mbfnif8csvz0namll0hab1r7mhnamp0yc3gs8";
libraryHaskellDepends = [
- aeson base bytestring containers sop-core template-haskell text
- th-abstraction unordered-containers uuid vector
+ aeson base bytestring containers first-class-families sop-core
+ template-haskell text th-abstraction unordered-containers uuid
+ vector
];
description = "Format-independent schemas for serialization";
license = stdenv.lib.licenses.asl20;
@@ -179813,8 +179838,8 @@ self: {
}:
mkDerivation {
pname = "musicw";
- version = "0.3.5.2";
- sha256 = "0mn5vnjxqkpd2pgjxmchlih74a1m52v06h6f08kyb26l0sjpbfx7";
+ version = "0.3.6";
+ sha256 = "0bi57x087r22547z90n58faz78ha6z6pfmf2chwrfdys48lr8wfq";
libraryHaskellDepends = [
array base bytestring containers data-default file-embed ghcjs-base
ghcjs-dom ghcjs-prim json monad-loops mtl safe text time
@@ -180504,6 +180529,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) mysql;};
+ "mysql_0_1_7_2" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql
+ }:
+ mkDerivation {
+ pname = "mysql";
+ version = "0.1.7.2";
+ sha256 = "0vkc39hx55hqwgkhqm80ckabbjaq4f9840msznf71glzihzg8k0n";
+ setupHaskellDepends = [ base Cabal ];
+ libraryHaskellDepends = [ base bytestring containers ];
+ librarySystemDepends = [ mysql ];
+ testHaskellDepends = [ base bytestring hspec ];
+ description = "A low-level MySQL client library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) mysql;};
+
"mysql-effect" = callPackage
({ mkDerivation, base, bytestring, extensible-effects, mysql
, mysql-simple
@@ -181608,8 +181649,8 @@ self: {
pname = "natural-transformation";
version = "0.4";
sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma";
- revision = "8";
- editedCabalFile = "007vgw2zaf2z9fyi9f0spmqn6fd8j438r3vnkgmazzvb43szmi0n";
+ revision = "9";
+ editedCabalFile = "1db5ln24wcn4fcf92096iff8jp7q531ccm8pgbqincrbxayahl1s";
libraryHaskellDepends = [ base ];
testHaskellDepends = [
base containers quickcheck-instances tasty tasty-quickcheck
@@ -184489,8 +184530,8 @@ self: {
}:
mkDerivation {
pname = "ngx-export-tools-extra";
- version = "0.5.6.0";
- sha256 = "08a13v1fx7lad7wdibij79vdcbqn10lcb2n6lhzq70097f8a06vm";
+ version = "0.5.7.0";
+ sha256 = "0dhw68vkrwfgv9q4skml8kq6zgrg7awjq4vxqp541szvamwvgh6y";
libraryHaskellDepends = [
aeson ansi-wl-pprint array base base64 binary bytestring
case-insensitive containers ede enclosed-exceptions http-client
@@ -186203,8 +186244,8 @@ self: {
}:
mkDerivation {
pname = "nri-env-parser";
- version = "0.1.0.1";
- sha256 = "1v6984ndlalrvdff10frik8bxqskmzf8cr13q6095jl6krjivkay";
+ version = "0.1.0.2";
+ sha256 = "0cl9f6p83k0r7ha6hzgmrv0abi9rw5p0wr838jyhazk179g37rrn";
libraryHaskellDepends = [
base modern-uri network-uri nri-prelude text
];
@@ -186223,8 +186264,8 @@ self: {
}:
mkDerivation {
pname = "nri-prelude";
- version = "0.1.0.4";
- sha256 = "0x8jvrp2kcj9a23g370fj9v6mmp3c3vi05dg3arq1ri5in4y6psa";
+ version = "0.2.0.0";
+ sha256 = "061klliw29a8kkbwgqkhqbil7jq85pxgmqn21xwszi0g16jb8ayx";
libraryHaskellDepends = [
aeson ansi-terminal async auto-update base bytestring
concurrent-output containers directory exceptions filepath hedgehog
@@ -191940,6 +191981,8 @@ self: {
pname = "pam";
version = "0.2.0.0";
sha256 = "0j4hm7ph0iszf8wyqpy5jiplr14jj37z2yvgcgy7p5ab5p5r38gx";
+ revision = "1";
+ editedCabalFile = "09d6acii3gimk3f04scy9k5f7di4sdam753ddi587px530pwdigb";
libraryHaskellDepends = [ base ];
librarySystemDepends = [ pam ];
libraryToolDepends = [ c2hs ];
@@ -192048,7 +192091,7 @@ self: {
maintainers = with stdenv.lib.maintainers; [ peti ];
}) {};
- "pandoc_2_11_0_2" = callPackage
+ "pandoc_2_11_0_4" = callPackage
({ mkDerivation, aeson, aeson-pretty, attoparsec, base
, base64-bytestring, binary, blaze-html, blaze-markup, bytestring
, case-insensitive, citeproc, commonmark, commonmark-extensions
@@ -192067,8 +192110,8 @@ self: {
}:
mkDerivation {
pname = "pandoc";
- version = "2.11.0.2";
- sha256 = "0lnzypad3jfix7h78gk4fvyl0x3n7f77i8bn6dn2lzdsf6wasy8x";
+ version = "2.11.0.4";
+ sha256 = "18nqdhvk0rgrzmbhab9vb05g8w9hvwx0ncf5cqp5ijxycilcskb8";
configureFlags = [ "-fhttps" "-f-trypandoc" ];
isLibrary = true;
isExecutable = true;
@@ -193668,8 +193711,8 @@ self: {
({ mkDerivation, base, parallel, tree-monad }:
mkDerivation {
pname = "parallel-tree-search";
- version = "0.4.1";
- sha256 = "1x2k649q6gqz9z16vwg1j59ajf2wp59lfwb65g8819fz4rwimncr";
+ version = "0.4.2";
+ sha256 = "08r8xl3x5zvsy3d3ss9m9l7kb0dyp7hjrwxlnz7g2jl7p5x8rjbd";
libraryHaskellDepends = [ base parallel tree-monad ];
description = "Parallel Tree Search";
license = stdenv.lib.licenses.publicDomain;
@@ -193734,8 +193777,8 @@ self: {
pname = "paramtree";
version = "0.1.1.1";
sha256 = "0ls9wzmz5lk7gyl8lx9cjs49zpwhrv955fs5q6ypv7bpbvjbchs1";
- revision = "2";
- editedCabalFile = "17wyi6q6azm2s04pm1alc183yp01a8qbvj1nymjxdzvrl2dkk2g6";
+ revision = "3";
+ editedCabalFile = "1nd342xk0sm9dlh5915b9kbksyd87wpji1mw8m8phm8d72prcxmi";
libraryHaskellDepends = [ base containers ];
testHaskellDepends = [
base bytestring tasty tasty-golden tasty-hunit temporary
@@ -195057,26 +195100,6 @@ self: {
}) {};
"path-io" = callPackage
- ({ mkDerivation, base, containers, directory, dlist, exceptions
- , filepath, hspec, path, temporary, time, transformers, unix-compat
- }:
- mkDerivation {
- pname = "path-io";
- version = "1.6.1";
- sha256 = "1qbnjwx72idbqwi5gkhnphf2phdszdf6y1aqf77y17kks3992vmn";
- libraryHaskellDepends = [
- base containers directory dlist exceptions filepath path temporary
- time transformers unix-compat
- ];
- testHaskellDepends = [
- base directory exceptions filepath hspec path transformers
- unix-compat
- ];
- description = "Interface to ‘directory’ package for users of ‘path’";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "path-io_1_6_2" = callPackage
({ mkDerivation, base, containers, directory, dlist, exceptions
, filepath, hspec, path, temporary, time, transformers, unix-compat
}:
@@ -195094,7 +195117,6 @@ self: {
];
description = "Interface to ‘directory’ package for users of ‘path’";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"path-like" = callPackage
@@ -196669,8 +196691,8 @@ self: {
}:
mkDerivation {
pname = "periodic-client";
- version = "1.1.7.1";
- sha256 = "0d9ngiq064fajiy2c4sddpgr93ia13iv83rdnvbk05x7agi0srjb";
+ version = "1.1.7.2";
+ sha256 = "0ldjxfq8p4spv4vgqjyklmcd8k3n2mrinma5w6k29d1wvyf5kxz5";
libraryHaskellDepends = [
base binary byteable bytestring hslogger metro metro-socket mtl
periodic-common resource-pool transformers unliftio
@@ -197672,7 +197694,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "persistent-test_2_0_3_2" = callPackage
+ "persistent-test_2_0_3_3" = callPackage
({ mkDerivation, aeson, base, blaze-html, bytestring, conduit
, containers, exceptions, hspec, hspec-expectations, HUnit
, monad-control, monad-logger, mtl, path-pieces, persistent
@@ -197682,8 +197704,8 @@ self: {
}:
mkDerivation {
pname = "persistent-test";
- version = "2.0.3.2";
- sha256 = "0d7a6m4qm6xzyv7h2fqn9hgv7r7q6dwh7x04ddsrygjxdgpwgqf3";
+ version = "2.0.3.3";
+ sha256 = "0ry6inln7grmcj58k3sfjid24069n4kmph6sikvm352b9ffw6h5x";
libraryHaskellDepends = [
aeson base blaze-html bytestring conduit containers exceptions
hspec hspec-expectations HUnit monad-control monad-logger mtl
@@ -197722,13 +197744,13 @@ self: {
"persistent-vector" = callPackage
({ mkDerivation, base, containers, criterion, deepseq, QuickCheck
- , test-framework, test-framework-quickcheck2
+ , test-framework, test-framework-quickcheck2, transformers
}:
mkDerivation {
pname = "persistent-vector";
- version = "0.1.1";
- sha256 = "1l5v02pjb24gk4hw28knjp55l7z6jzcfiklfikd2nqbl7866c2j2";
- libraryHaskellDepends = [ base deepseq ];
+ version = "0.2.0";
+ sha256 = "07fxfmkgjszssagj4miw1sx9vi782hwsf6gay7z6mb96mygbld5y";
+ libraryHaskellDepends = [ base deepseq transformers ];
testHaskellDepends = [
base QuickCheck test-framework test-framework-quickcheck2
];
@@ -198319,6 +198341,36 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "phonetic-languages-common" = callPackage
+ ({ mkDerivation, base, subG, vector }:
+ mkDerivation {
+ pname = "phonetic-languages-common";
+ version = "0.1.0.0";
+ sha256 = "12al80szl9mxapwq6b0kp6bnhnwqxjqzyf72ycxvpx1xlppsfza9";
+ libraryHaskellDepends = [ base subG vector ];
+ description = "A generalization of the uniqueness-periods-vector-common package";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "phonetic-languages-plus" = callPackage
+ ({ mkDerivation, base, bytestring, lists-flines, parallel
+ , uniqueness-periods-vector-stats
+ }:
+ mkDerivation {
+ pname = "phonetic-languages-plus";
+ version = "0.1.0.0";
+ sha256 = "1yzqrqkikkx6ii1n7zs5vf1k5m26v8bj8m0h43zmxb1j30klh2ir";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base lists-flines ];
+ executableHaskellDepends = [
+ base bytestring lists-flines parallel
+ uniqueness-periods-vector-stats
+ ];
+ description = "Some common shared between different packages functions";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"phonetic-languages-rhythmicity" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -198341,6 +198393,17 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "phonetic-languages-vector" = callPackage
+ ({ mkDerivation, base, vector }:
+ mkDerivation {
+ pname = "phonetic-languages-vector";
+ version = "0.1.0.0";
+ sha256 = "12mhmrfpdkxl00yfvy5jc74c7xnrj10pcydnn3xdhzj0fvp1zrll";
+ libraryHaskellDepends = [ base vector ];
+ description = "A generalization of the functionality of the uniqueness-periods-vector package";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"phooey" = callPackage
({ mkDerivation, array, base, mtl, reactive, TypeCompose, wx
, wxcore
@@ -200752,25 +200815,23 @@ self: {
}) {};
"playlists" = callPackage
- ({ mkDerivation, attoparsec, base, bytestring, doctest, filepath
- , hspec, optparse-applicative, text, word8
+ ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec
+ , optparse-applicative, text, word8
}:
mkDerivation {
pname = "playlists";
- version = "0.5.0.0";
- sha256 = "0653aifikinz69wq3d6sfkchcchhwlndh1lf40qrk96941qss0d6";
- revision = "1";
- editedCabalFile = "19vwlvva12p4r3ch1ik7m6h5r7cy0f35qn8smd41pv47v29dsxiq";
+ version = "0.5.1";
+ sha256 = "1hrxmp33pzmvpg9j102hjradnlq261hs9amqkivqjfn9y4pb8inm";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
attoparsec base bytestring filepath text word8
];
executableHaskellDepends = [
- base bytestring optparse-applicative text
+ attoparsec base bytestring filepath optparse-applicative text word8
];
testHaskellDepends = [
- base bytestring doctest filepath hspec text
+ attoparsec base bytestring filepath hspec text word8
];
description = "Library and executable for working with playlist files";
license = stdenv.lib.licenses.bsd3;
@@ -201997,6 +202058,36 @@ self: {
broken = true;
}) {};
+ "polysemy-extra" = callPackage
+ ({ mkDerivation, base, containers, polysemy, polysemy-zoo }:
+ mkDerivation {
+ pname = "polysemy-extra";
+ version = "0.1.0.0";
+ sha256 = "1y5k935jh6dfs87kdih1ibb61ljkp39wyrkg1n2zss020cdhbi7g";
+ libraryHaskellDepends = [ base containers polysemy polysemy-zoo ];
+ description = "Run a KVStore as a filesystem in polysemy";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "polysemy-fskvstore" = callPackage
+ ({ mkDerivation, base, bytestring, path, polysemy, polysemy-zoo
+ , rio, unliftio-path
+ }:
+ mkDerivation {
+ pname = "polysemy-fskvstore";
+ version = "0.1.0.0";
+ sha256 = "1hg552w21hgq5jvcbrw1kn1870xdyf44a3xqd87nrj9s9k2j4pk2";
+ libraryHaskellDepends = [
+ base bytestring path polysemy polysemy-zoo rio unliftio-path
+ ];
+ description = "Run a KVStore as a filesystem in polysemy";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"polysemy-http" = callPackage
({ mkDerivation, aeson, ansi-terminal, base, bytestring
, case-insensitive, co-log-core, co-log-polysemy, composition
@@ -202031,6 +202122,39 @@ self: {
broken = true;
}) {};
+ "polysemy-kvstore-jsonfile" = callPackage
+ ({ mkDerivation, aeson, base, containers, exceptions, extra, path
+ , polysemy, polysemy-zoo, unliftio-path
+ }:
+ mkDerivation {
+ pname = "polysemy-kvstore-jsonfile";
+ version = "0.1.0.0";
+ sha256 = "1lbjq1hlq6cf6px5f6zqi04sl0yz0rpyq2m2y16zknjz3wi7zqvi";
+ libraryHaskellDepends = [
+ aeson base containers exceptions extra path polysemy polysemy-zoo
+ unliftio-path
+ ];
+ description = "Run a KVStore as a single json file in polysemy";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "polysemy-methodology" = callPackage
+ ({ mkDerivation, base, polysemy, polysemy-plugin, polysemy-zoo }:
+ mkDerivation {
+ pname = "polysemy-methodology";
+ version = "0.1.2.1";
+ sha256 = "0is4jnmfn2gx78ijxwvhm8qwk2gqz31hh9pg5r8y43hyx7im40ay";
+ libraryHaskellDepends = [
+ base polysemy polysemy-plugin polysemy-zoo
+ ];
+ description = "Domain modelling algebra for polysemy";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"polysemy-optics" = callPackage
({ mkDerivation, base, optics, polysemy, polysemy-zoo }:
mkDerivation {
@@ -204778,28 +204902,30 @@ self: {
"predicate-typed" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, binary, bytestring
- , comonad, containers, deepseq, directory, doctest, hashable, lens
- , mtl, pcre-heavy, pcre-light, pretty, pretty-terminal, QuickCheck
- , safe, stm, string-conversions, tasty, tasty-hunit
- , tasty-quickcheck, template-haskell, text, th-lift, these, time
- , tree-view
+ , comonad, constraints, containers, deepseq, directory, doctest
+ , hashable, lens, lens-action, pcre-heavy, pcre-light
+ , pretty-terminal, QuickCheck, random, safe, stm
+ , string-conversions, tasty, tasty-hunit, tasty-quickcheck
+ , template-haskell, text, th-lift, these, time
}:
mkDerivation {
pname = "predicate-typed";
- version = "0.7.3.0";
- sha256 = "124f9bdvq30xaadg6020q0pmfv56mpkw25ws306xp8mfs61g1src";
+ version = "0.7.4.0";
+ sha256 = "04vxyw4bgzbkk56dw7p8b4x12m4wymxwh83537hvphdv9qj71ph9";
+ revision = "1";
+ editedCabalFile = "064zfd03nw1bd0p8vwymk0kscbpvxrgzbwmqys3ys1rqzjpnfdrp";
libraryHaskellDepends = [
- aeson aeson-pretty base binary bytestring comonad containers
- deepseq directory hashable lens mtl pcre-heavy pcre-light pretty
- pretty-terminal QuickCheck safe string-conversions template-haskell
- text th-lift these time tree-view
+ aeson aeson-pretty base binary bytestring comonad constraints
+ containers deepseq directory hashable lens lens-action pcre-heavy
+ pcre-light pretty-terminal QuickCheck random safe
+ string-conversions template-haskell text th-lift these time
];
testHaskellDepends = [
- aeson aeson-pretty base binary bytestring comonad containers
- deepseq directory doctest hashable lens mtl pcre-heavy pcre-light
- pretty pretty-terminal QuickCheck safe stm string-conversions tasty
- tasty-hunit tasty-quickcheck template-haskell text th-lift these
- time tree-view
+ aeson aeson-pretty base binary bytestring comonad constraints
+ containers deepseq directory doctest hashable lens lens-action
+ pcre-heavy pcre-light pretty-terminal QuickCheck random safe stm
+ string-conversions tasty tasty-hunit tasty-quickcheck
+ template-haskell text th-lift these time
];
description = "Predicates, Refinement types and Dsl";
license = stdenv.lib.licenses.bsd3;
@@ -205301,8 +205427,8 @@ self: {
}:
mkDerivation {
pname = "pretty-diff";
- version = "0.2.0.2";
- sha256 = "0nz6shwyw6pkwd8n4rvix4fn0f5mvxx1xkc6q4k1xrg2ylg73ksv";
+ version = "0.2.0.3";
+ sha256 = "1pnq05zw7zyfikga8y27pkya4wrf0m3mrksmzi8l7jp9qdhkyia1";
libraryHaskellDepends = [ base data-default Diff text ];
testHaskellDepends = [
base data-default Diff tasty tasty-hunit tasty-test-reporter text
@@ -213165,10 +213291,8 @@ self: {
}:
mkDerivation {
pname = "rank1dynamic";
- version = "0.4.0";
- sha256 = "07dbfp0sc32q1p8xh4ap8m3b287r9hh4r8vfsrppdm5pabz4nhiw";
- revision = "1";
- editedCabalFile = "1idh1iz15pzdhrhy19584i9ahz41ijbmf56wbb2wns2kipy6w9lr";
+ version = "0.4.1";
+ sha256 = "19x2w44f31589vf4s428m7g3dz75qykr7mv599rf3gls4zjx781r";
libraryHaskellDepends = [ base binary ];
testHaskellDepends = [
base HUnit test-framework test-framework-hunit
@@ -214811,7 +214935,7 @@ self: {
broken = true;
}) {};
- "reanimate_1_1_1_0" = callPackage
+ "reanimate_1_1_2_1" = callPackage
({ mkDerivation, aeson, ansi-terminal, array, attoparsec, base
, base64-bytestring, bytestring, cassava, cereal, colour
, containers, cryptohash-sha256, cubicbezier, directory, filelock
@@ -214826,8 +214950,8 @@ self: {
}:
mkDerivation {
pname = "reanimate";
- version = "1.1.1.0";
- sha256 = "05illhid0nnypkl7znzkmc7b3wc7lmv8jn2sdcj39xr1yr8hji7f";
+ version = "1.1.2.1";
+ sha256 = "043jpim33pliymnks47i39hz36wp61rvwjyk9f0k89whsi74bkd6";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson ansi-terminal array attoparsec base base64-bytestring
@@ -216581,6 +216705,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "reform-happstack_0_2_5_4" = callPackage
+ ({ mkDerivation, base, bytestring, happstack-server, mtl, random
+ , reform, text, utf8-string
+ }:
+ mkDerivation {
+ pname = "reform-happstack";
+ version = "0.2.5.4";
+ sha256 = "1xknj906vr0q6vrxrvna1777v7hsdg1l3r0wwnga7k1yn5hcfc76";
+ libraryHaskellDepends = [
+ base bytestring happstack-server mtl random reform text utf8-string
+ ];
+ description = "Happstack support for reform";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"reform-hsp" = callPackage
({ mkDerivation, base, hsp, hsx2hs, reform, text }:
mkDerivation {
@@ -224663,17 +224803,17 @@ self: {
, containers, crackNum, deepseq, directory, doctest, filepath
, gauge, Glob, hlint, mtl, pretty, process, QuickCheck, random
, silently, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
- , template-haskell, time, transformers, z3
+ , template-haskell, time, transformers, uniplate, z3
}:
mkDerivation {
pname = "sbv";
- version = "8.8";
- sha256 = "0xm05g9kxh38jjbssnhyw6c8q4rsyjndm2b8r36cqwx0n607zvgy";
+ version = "8.9";
+ sha256 = "1h8bhi1pjlg0v16wwqcvil7gq98b6dn8ckzmrsgb8sc3qz0nxj51";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
array async base containers crackNum deepseq directory filepath mtl
pretty process QuickCheck random syb template-haskell time
- transformers
+ transformers uniplate
];
testHaskellDepends = [
base bytestring containers crackNum directory doctest filepath Glob
@@ -238081,6 +238221,49 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "snap-server_1_1_2_0" = callPackage
+ ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
+ , bytestring, bytestring-builder, case-insensitive, clock
+ , containers, criterion, deepseq, directory, filepath, HsOpenSSL
+ , http-common, http-streams, HUnit, io-streams, io-streams-haproxy
+ , lifted-base, monad-control, mtl, network, old-locale
+ , openssl-streams, parallel, QuickCheck, random, snap-core
+ , test-framework, test-framework-hunit, test-framework-quickcheck2
+ , text, threads, time, transformers, unix, unix-compat, vector
+ }:
+ mkDerivation {
+ pname = "snap-server";
+ version = "1.1.2.0";
+ sha256 = "0w4yv9a5ilpma0335ariwap2iscmdbaaif88lq3cm7px910nyc4j";
+ configureFlags = [ "-fopenssl" ];
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ attoparsec base blaze-builder bytestring bytestring-builder
+ case-insensitive clock containers filepath HsOpenSSL io-streams
+ io-streams-haproxy lifted-base mtl network old-locale
+ openssl-streams snap-core text time transformers unix unix-compat
+ vector
+ ];
+ testHaskellDepends = [
+ attoparsec base base16-bytestring blaze-builder bytestring
+ bytestring-builder case-insensitive clock containers deepseq
+ directory filepath HsOpenSSL http-common http-streams HUnit
+ io-streams io-streams-haproxy lifted-base monad-control mtl network
+ old-locale openssl-streams parallel QuickCheck random snap-core
+ test-framework test-framework-hunit test-framework-quickcheck2 text
+ threads time transformers unix unix-compat vector
+ ];
+ benchmarkHaskellDepends = [
+ attoparsec base blaze-builder bytestring bytestring-builder
+ criterion io-streams io-streams-haproxy snap-core transformers
+ vector
+ ];
+ description = "A web server for the Snap Framework";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"snap-stream" = callPackage
({ mkDerivation, attoparsec, base, bytestring, io-streams
, snap-core
@@ -242501,8 +242684,8 @@ self: {
}:
mkDerivation {
pname = "stack-clean-old";
- version = "0.1";
- sha256 = "12q3x0lj8mjhfr6zrizl7995qca28qccjfqwhriciv35l4sny9md";
+ version = "0.2";
+ sha256 = "1mk92hgh1prnw0piwccxb1nf1383yap7csx03abnwp8anl8xw5dc";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -242774,10 +242957,8 @@ self: {
}:
mkDerivation {
pname = "stack2cabal";
- version = "1.0.11";
- sha256 = "1lm4dl743xscrksgqg1v1ylm4bb3i8j470yih8si968k7xzcdvx2";
- revision = "1";
- editedCabalFile = "1ga8z004rvrvi58yfr7vmikngn3q8134z87nzaj0lll39kljni83";
+ version = "1.0.12";
+ sha256 = "0424qz4fy8218a0zr8pw5kbaldrb3wddvsb87sjqbb4q5qcm7rj7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -243997,27 +244178,28 @@ self: {
"staversion" = callPackage
({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal
- , containers, directory, filepath, heredoc, hspec, http-client
- , http-client-tls, http-types, megaparsec, optparse-applicative
- , pretty, process, QuickCheck, semigroups, text, transformers
- , transformers-compat, unordered-containers, yaml
+ , containers, directory, filepath, hashable, heredoc, hspec
+ , http-client, http-client-tls, http-types, megaparsec
+ , optparse-applicative, pretty, process, QuickCheck, semigroups
+ , text, transformers, transformers-compat, unordered-containers
+ , yaml
}:
mkDerivation {
pname = "staversion";
- version = "0.2.3.7";
- sha256 = "0mrkm7gr6s27dngws7p3mcfyp9pdvyr25mg9nd3ygklaql74jmng";
+ version = "0.2.4.0";
+ sha256 = "1n6f7ka4ncadp4svd3bc81qxdgiff85mws5apx7wdhcwfn8wbsib";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson ansi-wl-pprint base bytestring Cabal containers directory
- filepath http-client http-client-tls http-types megaparsec
+ filepath hashable http-client http-client-tls http-types megaparsec
optparse-applicative pretty process semigroups text transformers
transformers-compat unordered-containers yaml
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
base bytestring Cabal filepath heredoc hspec QuickCheck semigroups
- text
+ text unordered-containers
];
description = "What version is the package X in stackage lts-Y.ZZ?";
license = stdenv.lib.licenses.bsd3;
@@ -245511,6 +245693,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "streaming-bytestring_0_2_0" = callPackage
+ ({ mkDerivation, base, bytestring, deepseq, exceptions, ghc-prim
+ , mmorph, mtl, resourcet, smallcheck, streaming, tasty, tasty-hunit
+ , tasty-smallcheck, transformers, transformers-base
+ }:
+ mkDerivation {
+ pname = "streaming-bytestring";
+ version = "0.2.0";
+ sha256 = "1vmbg84xc7ix7ihs96ia13gdpi7z3grrkq9qai6j8s1klnzpljhi";
+ libraryHaskellDepends = [
+ base bytestring deepseq exceptions ghc-prim mmorph mtl resourcet
+ streaming transformers transformers-base
+ ];
+ testHaskellDepends = [
+ base bytestring resourcet smallcheck streaming tasty tasty-hunit
+ tasty-smallcheck transformers
+ ];
+ description = "Fast, effectful byte streams";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"streaming-cassava" = callPackage
({ mkDerivation, base, bytestring, cassava, hspec, mtl, QuickCheck
, quickcheck-instances, streaming, streaming-bytestring, text
@@ -246532,6 +246736,8 @@ self: {
pname = "string-interpolate";
version = "0.3.0.2";
sha256 = "1dkw4q2fxnr7gnish45lryxwrmdy93ffa1010qdnjlnz5m3dxbyl";
+ revision = "1";
+ editedCabalFile = "1rwylfxa821260mxfsr6l6grcyz7gxk18mvjijfhg5sm53v4c1ka";
libraryHaskellDepends = [
base bytestring haskell-src-exts haskell-src-meta split
template-haskell text text-conversions utf8-string
@@ -251871,15 +252077,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "tasty_1_3_1" = callPackage
+ "tasty_1_4" = callPackage
({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl
, optparse-applicative, stm, tagged, unbounded-delays, unix
, wcwidth
}:
mkDerivation {
pname = "tasty";
- version = "1.3.1";
- sha256 = "1p8lq0yd1880knnygv4spgjj3j2mi8bawd018vcxy9rml7sdzm8w";
+ version = "1.4";
+ sha256 = "0jkia4zg01936gm2klpn3c4grlmdgiq0qnqq1cz7xg4baza14q3b";
libraryHaskellDepends = [
ansi-terminal async base clock containers mtl optparse-applicative
stm tagged unbounded-delays unix wcwidth
@@ -252460,6 +252666,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "tasty-rerun_1_1_18" = callPackage
+ ({ mkDerivation, base, containers, mtl, optparse-applicative, split
+ , stm, tagged, tasty, transformers
+ }:
+ mkDerivation {
+ pname = "tasty-rerun";
+ version = "1.1.18";
+ sha256 = "0sccp5zx9v2rx741nbmgd8mzjhy5m4v74hk26d23xz93ph8aqx7s";
+ libraryHaskellDepends = [
+ base containers mtl optparse-applicative split stm tagged tasty
+ transformers
+ ];
+ description = "Rerun only tests which failed in a previous test run";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"tasty-silver" = callPackage
({ mkDerivation, ansi-terminal, async, base, bytestring, containers
, deepseq, directory, filepath, mtl, optparse-applicative, process
@@ -252534,8 +252757,8 @@ self: {
}:
mkDerivation {
pname = "tasty-test-reporter";
- version = "0.1.1.2";
- sha256 = "1v6s3dd3ynzw0690hz1abi8l2j6zlpfj61g072w176n7is6x7p73";
+ version = "0.1.1.4";
+ sha256 = "0aail968niiy4yicbb0nfd7z46vxgp5zf1k9ndh4smskihz8kjin";
libraryHaskellDepends = [
ansi-terminal base concurrent-output containers directory filepath
junit-xml mtl safe-exceptions stm tagged tasty text
@@ -253146,8 +253369,8 @@ self: {
}:
mkDerivation {
pname = "telegram-bot-simple";
- version = "0.3.1";
- sha256 = "09r64kgvgc5xx4wa5mxlc6fi4cf5qa81j7334wr7niv88fs659yb";
+ version = "0.3.3";
+ sha256 = "0lbk7j6y2hzkd5hhd1wsdvsixgnim1xzy1nram2msm5jin9wy9rb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -256568,16 +256791,21 @@ self: {
}) {};
"th-lego" = callPackage
- ({ mkDerivation, base, template-haskell
+ ({ mkDerivation, base, QuickCheck, quickcheck-instances, rerebase
+ , tasty, tasty-hunit, tasty-quickcheck, template-haskell
, template-haskell-compat-v0208, text
}:
mkDerivation {
pname = "th-lego";
- version = "0.1.0.4";
- sha256 = "16pls283c6r4rx9aiyqacfrq5cy8d1q964fnzzk62517nicb9xyv";
+ version = "0.2.2";
+ sha256 = "0z9bpycyayvjr01pl704yhmchdfiyfi58drkq9ccxahgrwa0gpfc";
libraryHaskellDepends = [
base template-haskell template-haskell-compat-v0208 text
];
+ testHaskellDepends = [
+ QuickCheck quickcheck-instances rerebase tasty tasty-hunit
+ tasty-quickcheck template-haskell
+ ];
description = "Template Haskell construction utilities";
license = stdenv.lib.licenses.mit;
}) {};
@@ -256932,8 +257160,8 @@ self: {
}:
mkDerivation {
pname = "themoviedb";
- version = "1.2.0.0";
- sha256 = "1dchnsk9mx2v01apj5ilnsl3w9vj6f5pkqrm9701zw7rcp7xds0w";
+ version = "1.2.0.1";
+ sha256 = "1n6raffsjn9iq427nyh7hnnx1jvgvilisfy6dz72hl4ry5198sdq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -261761,8 +261989,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "tree-monad";
- version = "0.3";
- sha256 = "1zs1qgp908d0y7dm9mhzwl529z2aw24zr8balsvn1lzl1aynzslm";
+ version = "0.3.1";
+ sha256 = "0ny57rygkgwn8i733gz2zb12i5niq5q7lrqvzfwsnjd0b40yighf";
libraryHaskellDepends = [ base ];
description = "Non-Determinism Monad for Tree Search";
license = stdenv.lib.licenses.bsd3;
@@ -265853,8 +266081,8 @@ self: {
({ mkDerivation, base, bytestring, mmsyn2, mmsyn5, vector }:
mkDerivation {
pname = "ukrainian-phonetics-basic";
- version = "0.1.1.0";
- sha256 = "0k7lv4lzmkjyfk5r664gmdaqbj08s1kp7n4w8lw7kn7fmxvwkraf";
+ version = "0.1.7.0";
+ sha256 = "0rjyy6yxwd799svqd34wjjz5wvxzlkr7bl65s1wmvdfbs9dvfk95";
libraryHaskellDepends = [ base bytestring mmsyn2 mmsyn5 vector ];
description = "A library to work with the basic Ukrainian phonetics and syllable segmentation";
license = stdenv.lib.licenses.mit;
@@ -266925,8 +267153,8 @@ self: {
}) {};
"uniqueness-periods-vector-examples" = callPackage
- ({ mkDerivation, base, bytestring, lists-flines, mmsyn6ukr
- , parallel, phonetic-languages-ukrainian, print-info
+ ({ mkDerivation, base, mmsyn6ukr, parallel, phonetic-languages-plus
+ , phonetic-languages-ukrainian, print-info
, uniqueness-periods-vector, uniqueness-periods-vector-common
, uniqueness-periods-vector-filters
, uniqueness-periods-vector-general
@@ -266935,17 +267163,16 @@ self: {
}:
mkDerivation {
pname = "uniqueness-periods-vector-examples";
- version = "0.13.1.0";
- sha256 = "0z6jglwli11845x4nlk8b3wk4d6j6i1m7jr3vhgri64g34qj1767";
+ version = "0.14.1.0";
+ sha256 = "191ihc62lzgdnzr0z0skgrxb5zg1jbnv2g6faafy9krla3j4rn4s";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base lists-flines uniqueness-periods-vector
- uniqueness-periods-vector-common
- uniqueness-periods-vector-properties vector
+ base uniqueness-periods-vector uniqueness-periods-vector-common
+ uniqueness-periods-vector-properties
];
executableHaskellDepends = [
- base bytestring lists-flines mmsyn6ukr parallel
+ base mmsyn6ukr parallel phonetic-languages-plus
phonetic-languages-ukrainian print-info uniqueness-periods-vector
uniqueness-periods-vector-common uniqueness-periods-vector-filters
uniqueness-periods-vector-general
@@ -266973,8 +267200,8 @@ self: {
}:
mkDerivation {
pname = "uniqueness-periods-vector-general";
- version = "0.5.1.0";
- sha256 = "1abqcxrlchhi5jag6rvaar48ip356p9r1zcndbja72z4dxg9b9q0";
+ version = "0.5.2.0";
+ sha256 = "08jprdi4rlq6i923q9lg6mjbiyphh26ray6kbi1pk84im3y0s6bm";
libraryHaskellDepends = [
base print-info uniqueness-periods-vector-common vector
];
@@ -267561,6 +267788,8 @@ self: {
pname = "unjson";
version = "0.15.3";
sha256 = "1p2bk9j5ww0zbkaw1wvl2122h763zn4ddjzg5rka948q3d6zivvi";
+ revision = "1";
+ editedCabalFile = "1jgin4v0j5siyrchrlkp8y5abs30mk8j9d5ah3r0b84683whnnrx";
libraryHaskellDepends = [
aeson attoparsec base bytestring containers free hashable invariant
pretty primitive scientific semigroups text time
@@ -267629,6 +267858,32 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "unliftio_0_2_13_1" = callPackage
+ ({ mkDerivation, async, base, bytestring, containers, deepseq
+ , directory, filepath, gauge, hspec, process, QuickCheck, stm, time
+ , transformers, unix, unliftio-core
+ }:
+ mkDerivation {
+ pname = "unliftio";
+ version = "0.2.13.1";
+ sha256 = "08q00kqg934y9cpj18kcgzcw3a2wgs6kjvgldgvr2a3vndwn95m0";
+ libraryHaskellDepends = [
+ async base bytestring deepseq directory filepath process stm time
+ transformers unix unliftio-core
+ ];
+ testHaskellDepends = [
+ async base bytestring containers deepseq directory filepath hspec
+ process QuickCheck stm time transformers unix unliftio-core
+ ];
+ benchmarkHaskellDepends = [
+ async base bytestring deepseq directory filepath gauge process stm
+ time transformers unix unliftio-core
+ ];
+ description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"unliftio-core" = callPackage
({ mkDerivation, base, transformers }:
mkDerivation {
@@ -269387,11 +269642,11 @@ self: {
}:
mkDerivation {
pname = "uuagc";
- version = "0.9.53";
- sha256 = "0cij4kf8f2151xz2q935bn9bhrqig9alc008vds7cw6pkb32ngz6";
+ version = "0.9.53.1";
+ sha256 = "0agmvc1ng1dpnl0z8njilc2r51rgl9fh3lmxgprwc0y5dqqrn6zr";
isLibrary = true;
isExecutable = true;
- setupHaskellDepends = [ base Cabal ];
+ setupHaskellDepends = [ base Cabal uuagc-cabal ];
libraryHaskellDepends = [
array base containers directory filepath ghc-prim haskell-src-exts
mtl uuagc-cabal uulib
@@ -269635,15 +269890,15 @@ self: {
}:
mkDerivation {
pname = "uusi";
- version = "0.0.0.0";
- sha256 = "0wii4azq5aj8d1c8n5plsfqqvf9x5s4qw82mhvjhnzja3d6cck4f";
+ version = "0.0.1.0";
+ sha256 = "1kxhrkfsw6n2ic5f41bw2cjpix1k9ij5s3fhvsxgfiiwn7h5g7x2";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
base Cabal colourista directory microlens optparse-applicative
process text
];
- description = "A program removing all version constraints of dependencies in .cabal file";
+ description = "Remove all version constraints of dependencies in .cabal file";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -271864,8 +272119,8 @@ self: {
}:
mkDerivation {
pname = "vimeta";
- version = "0.3.0.0";
- sha256 = "0npz5mx9w6srz5p0is3yzgfwssakdycv8h0h38ff7q0sivq3pfnv";
+ version = "0.3.0.1";
+ sha256 = "0i834y50b4820109asrzp61bqprxs9rfgr9b8310zhsisrlbxgl3";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -272665,8 +272920,8 @@ self: {
({ mkDerivation, base, bytestring, transformers, vector, vulkan }:
mkDerivation {
pname = "vulkan";
- version = "3.6.10";
- sha256 = "028c6n6f62nnwszb4px5mhg2spqb2z4psm06fbc2r1qw6vpqhxn6";
+ version = "3.6.11";
+ sha256 = "065l0nk4w3if01aavfzgnalpp39xz1j8xw022l9w9pmdmb2y0fjm";
libraryHaskellDepends = [ base bytestring transformers vector ];
librarySystemDepends = [ vulkan ];
description = "Bindings to the Vulkan graphics API";
@@ -274368,8 +274623,8 @@ self: {
}:
mkDerivation {
pname = "wai-saml2";
- version = "0.2.1.0";
- sha256 = "0yljqfrrp426pn17fq28arw3ygrb3i84fr28r0hns0cv4a4sz4gx";
+ version = "0.2.1.2";
+ sha256 = "1hd408fs4w0lpqg0shnrwpx98fh6idzk8la3gn8xghhml189xgwl";
libraryHaskellDepends = [
base base64-bytestring bytestring c14n cryptonite
data-default-class http-types mtl text time vault wai wai-extra
@@ -275505,8 +275760,8 @@ self: {
}:
mkDerivation {
pname = "web-routes-happstack";
- version = "0.23.12";
- sha256 = "0p5fa2cdpk6s9n0wa7nllhk1naa3a8a8vx63q6da8ifk6x8jn68a";
+ version = "0.23.12.1";
+ sha256 = "06gifknfv6g9rd9f83r75hc3sld4xb4f1czxs9k5ca7n1l1vlccy";
libraryHaskellDepends = [
base bytestring happstack-server text web-routes
];
@@ -276669,6 +276924,8 @@ self: {
pname = "what4";
version = "1.0";
sha256 = "0yyyq2gzl7srjq6inj1dqdhpxd58r1rhjajwxi0gr5pmxfzv7k8w";
+ revision = "1";
+ editedCabalFile = "04ab8nvnngb3bjv94mkcr17hh2m943m4pyk3klbnmpwyp9ip6pmf";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -276734,8 +276991,8 @@ self: {
({ mkDerivation, base, shelly, template-haskell, text }:
mkDerivation {
pname = "which";
- version = "0.1.0.0";
- sha256 = "0w1jik9bkndx8ssd00i1ii686kb0fd2sc0slr7ki561g5z1xa7dz";
+ version = "0.2";
+ sha256 = "1c1l79bdpqfg4n3p5gkc3x362m9k11hmyydr2y3j0xs4hhm3d5aa";
libraryHaskellDepends = [ base shelly template-haskell text ];
description = "Determine the full path to an executable";
license = stdenv.lib.licenses.bsd3;
@@ -277090,33 +277347,33 @@ self: {
}) {};
"winery" = callPackage
- ({ mkDerivation, aeson, base, binary, bytestring, cereal
- , containers, cpu, deepseq, directory, fast-builder, gauge
- , hashable, HUnit, megaparsec, mtl, prettyprinter
- , prettyprinter-ansi-terminal, QuickCheck, quickcheck-instances
- , scientific, semigroups, serialise, store, text, time
- , transformers, unordered-containers, vector
+ ({ mkDerivation, aeson, barbies, barbies-th, base, binary
+ , bytestring, cereal, containers, cpu, deepseq, directory
+ , fast-builder, gauge, hashable, HUnit, megaparsec, mtl
+ , prettyprinter, prettyprinter-ansi-terminal, QuickCheck
+ , quickcheck-instances, scientific, semigroups, serialise, store
+ , text, time, transformers, unordered-containers, vector
}:
mkDerivation {
pname = "winery";
- version = "1.3.1";
- sha256 = "0p504hglnih3gxc8x2iqqq9sih1l6chq53nijlv8f6wy15j9p5hh";
+ version = "1.3.2";
+ sha256 = "0ll6zm6zmhl9xmlbhj8is33zny4l7hwvf8lpvgqw0jcvz7j955a2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base bytestring containers cpu fast-builder hashable HUnit
- megaparsec mtl prettyprinter prettyprinter-ansi-terminal QuickCheck
- scientific semigroups text time transformers unordered-containers
- vector
+ aeson barbies barbies-th base bytestring containers cpu
+ fast-builder hashable HUnit megaparsec mtl prettyprinter
+ prettyprinter-ansi-terminal QuickCheck scientific semigroups text
+ time transformers unordered-containers vector
];
executableHaskellDepends = [
aeson base bytestring megaparsec prettyprinter
prettyprinter-ansi-terminal text
];
testHaskellDepends = [
- base bytestring containers fast-builder QuickCheck
- quickcheck-instances scientific text time unordered-containers
- vector
+ barbies barbies-th base bytestring containers fast-builder
+ QuickCheck quickcheck-instances scientific text time
+ unordered-containers vector
];
benchmarkHaskellDepends = [
aeson base binary bytestring cereal deepseq directory gauge
@@ -277124,6 +277381,8 @@ self: {
];
description = "A compact, well-typed seralisation format for Haskell values";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"winio" = callPackage
@@ -279928,8 +280187,8 @@ self: {
}:
mkDerivation {
pname = "xlsx";
- version = "0.8.1";
- sha256 = "1prb6369af2w0rni2ha32yzd9r17yi0xnyn1dzwdzq03maxikgy9";
+ version = "0.8.2";
+ sha256 = "0kjfnp24nc97qqla1z65wzy59cch336pjncz1kdfakmgv27mv38a";
libraryHaskellDepends = [
attoparsec base base64-bytestring binary-search bytestring conduit
containers data-default deepseq errors extra filepath lens mtl
@@ -283594,43 +283853,6 @@ self: {
}) {};
"yesod-core" = callPackage
- ({ mkDerivation, aeson, async, auto-update, base, blaze-html
- , blaze-markup, bytestring, case-insensitive, cereal, clientsession
- , conduit, conduit-extra, containers, cookie, deepseq, fast-logger
- , gauge, hspec, hspec-expectations, http-types, HUnit, memory
- , monad-logger, mtl, network, parsec, path-pieces, primitive
- , random, resourcet, shakespeare, streaming-commons
- , template-haskell, text, time, transformers, unix-compat, unliftio
- , unordered-containers, vector, wai, wai-extra, wai-logger, warp
- , word8
- }:
- mkDerivation {
- pname = "yesod-core";
- version = "1.6.18.4";
- sha256 = "1i69k0782prgf3wzi714fx0g3jsd654kncn62c7sijsbs0zc6h5h";
- libraryHaskellDepends = [
- aeson auto-update base blaze-html blaze-markup bytestring
- case-insensitive cereal clientsession conduit conduit-extra
- containers cookie deepseq fast-logger http-types memory
- monad-logger mtl parsec path-pieces primitive random resourcet
- shakespeare template-haskell text time transformers unix-compat
- unliftio unordered-containers vector wai wai-extra wai-logger warp
- word8
- ];
- testHaskellDepends = [
- async base bytestring clientsession conduit conduit-extra
- containers cookie hspec hspec-expectations http-types HUnit network
- path-pieces random resourcet shakespeare streaming-commons
- template-haskell text transformers unliftio wai wai-extra warp
- ];
- benchmarkHaskellDepends = [
- base blaze-html bytestring gauge shakespeare text
- ];
- description = "Creation of type-safe, RESTful web applications";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "yesod-core_1_6_18_5" = callPackage
({ mkDerivation, aeson, async, auto-update, base, blaze-html
, blaze-markup, bytestring, case-insensitive, cereal, clientsession
, conduit, conduit-extra, containers, cookie, deepseq, fast-logger
@@ -283665,7 +283887,6 @@ self: {
];
description = "Creation of type-safe, RESTful web applications";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yesod-crud" = callPackage
@@ -287695,36 +287916,34 @@ self: {
}) {};
"zxcvbn-hs" = callPackage
- ({ mkDerivation, attoparsec, base, base64-bytestring, binary
+ ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary
, binary-instances, containers, criterion, fgl, hedgehog, lens
, math-functions, tasty, tasty-hedgehog, tasty-hunit, text, time
, unordered-containers, vector, zlib
}:
mkDerivation {
pname = "zxcvbn-hs";
- version = "0.2.1.0";
- sha256 = "1gvarz005nlz9q5bkdwvplvsmwwchhx0arpq1grmh39r706lh4d8";
- revision = "2";
- editedCabalFile = "05l4pni4264rcivixzakjkph5qr4jr8qb4jbfj2nw106n1zhjaka";
+ version = "0.3.0.0";
+ sha256 = "13rz0bjvcj9hrxnxqbw7bl6529yz4aqawq6abssj4nmxbmgrj7xf";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- attoparsec base base64-bytestring binary binary-instances
+ aeson attoparsec base base64-bytestring binary binary-instances
containers fgl lens math-functions text time unordered-containers
vector zlib
];
executableHaskellDepends = [
- attoparsec base base64-bytestring binary binary-instances
+ aeson attoparsec base base64-bytestring binary binary-instances
containers fgl lens math-functions text time unordered-containers
vector zlib
];
testHaskellDepends = [
- attoparsec base base64-bytestring binary binary-instances
+ aeson attoparsec base base64-bytestring binary binary-instances
containers fgl hedgehog lens math-functions tasty tasty-hedgehog
tasty-hunit text time unordered-containers vector zlib
];
benchmarkHaskellDepends = [
- attoparsec base base64-bytestring binary binary-instances
+ aeson attoparsec base base64-bytestring binary binary-instances
containers criterion fgl lens math-functions text time
unordered-containers vector zlib
];
From 718aafa5f7e17e47fd8eef6c5070a58cbea20a74 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 27 Oct 2020 09:20:34 +0100
Subject: [PATCH 568/590] pandoc: update overrides for the new release
---
pkgs/development/haskell-modules/configuration-common.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1e694a8801b7..ce3093763966 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1467,7 +1467,7 @@ self: super: {
skylighting-core = doDistribute super.skylighting-core_0_10_0_3;
hslua = doDistribute self.hslua_1_1_2;
jira-wiki-markup = doDistribute self.jira-wiki-markup_1_3_2;
- pandoc = doDistribute self.pandoc_2_11_0_2;
+ pandoc = doDistribute self.pandoc_2_11_0_4;
# jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc
pandoc-citeproc = doJailbreak (doDistribute self.pandoc-citeproc_0_17_0_2);
pandoc-types = doDistribute self.pandoc-types_1_22;
From ed41afe60a75bb284ff5fe8c9038f99efa22a63f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 30 Oct 2020 14:53:45 +0100
Subject: [PATCH 569/590] haskell: update Cabal overrides for the new 3.2.1.0
release
---
.../haskell-modules/configuration-ghc-8.2.x.nix | 2 +-
.../haskell-modules/configuration-ghc-8.4.x.nix | 4 ++--
.../haskell-modules/configuration-ghc-8.6.x.nix | 8 ++++----
.../haskell-modules/configuration-ghc-8.8.x.nix | 8 ++++----
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index f1260735479b..bd9f43e90c9d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -44,7 +44,7 @@ self: super: {
text = self.text_1_2_4_0;
# Needs Cabal 3.0.x.
- jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_0_0; };
+ jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_1_0; };
# https://github.com/bmillwood/applicative-quoters/issues/6
applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index d5ae77e8246e..27bf04b914e7 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -41,8 +41,8 @@ self: super: {
xhtml = null;
# Needs Cabal 3.2.x.
- cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
- jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_0_0; };
+ cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; });
+ jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_1_0; };
# Restricts aeson to <1.4
# https://github.com/purescript/purescript/pull/3537
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 339fda5d6fbf..f2da20426ace 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -42,8 +42,8 @@ self: super: {
xhtml = null;
# Needs Cabal 3.0.x.
- cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
- jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_0_0; };
+ cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; });
+ jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_1_0; };
# https://github.com/tibbe/unordered-containers/issues/214
unordered-containers = dontCheck super.unordered-containers;
@@ -77,10 +77,10 @@ self: super: {
# cabal2nix needs the latest version of Cabal, and the one
# hackage-db uses must match, so take the latest
- cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
+ cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; });
# cabal2spec needs a recent version of Cabal
- cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
+ cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; });
# Builds only with ghc-8.8.x and beyond.
policeman = markBroken super.policeman;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index a2562e44527b..220a8e5c207a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -53,8 +53,8 @@ self: super: {
haddock-api = self.haddock-api_2_23_1;
# These builds need Cabal 3.2.x.
- cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_0_0; };
- cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
+ cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_1_0; };
+ cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; });
# Ignore overly restrictive upper version bounds.
aeson-diff = doJailbreak super.aeson-diff;
@@ -109,10 +109,10 @@ self: super: {
apply-refact = super.apply-refact_0_7_0_0;
# The package needs the latest Cabal version.
- cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
+ cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; });
# cabal-fmt requires Cabal3
- cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_0_0; };
+ cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_1_0; };
# liquidhaskell does not support ghc version 8.8.x.
liquid = markBroken super.liquid;
From d3025ee8c62cba6e92de8d3900beb73889ca01ca Mon Sep 17 00:00:00 2001
From: V <v@anomalous.eu>
Date: Fri, 22 May 2020 00:44:58 +0200
Subject: [PATCH 570/590] iosevka-bin: add support for variants
This adds the ability to select a specific prebuilt variant. It also adds
an updater script for generating their hashes. Additionally, switching
to TTC files reduces the package size by an order of magnitude.
Example usage:
fonts.fonts = with pkgs; [
(iosevka-bin.override { variant = "ss10"; })
(iosevka-bin.override { variant = "sparkle"; })
(iosevka-bin.override { variant = "aile"; })
];
---
pkgs/data/fonts/iosevka/bin.nix | 37 ++++++++++++++++++++--------
pkgs/data/fonts/iosevka/update.sh | 28 +++++++++++++++++++++
pkgs/data/fonts/iosevka/variants.nix | 24 ++++++++++++++++++
3 files changed, 79 insertions(+), 10 deletions(-)
create mode 100755 pkgs/data/fonts/iosevka/update.sh
create mode 100644 pkgs/data/fonts/iosevka/variants.nix
diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix
index 0f88aa05e4cf..c3e77c1051fb 100644
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/pkgs/data/fonts/iosevka/bin.nix
@@ -1,20 +1,35 @@
-{ stdenv, fetchzip }:
+{ stdenv, lib, fetchurl, unzip
+, variant ? ""
+}:
let
- version = "3.4.6";
-in fetchzip {
- name = "iosevka-bin-${version}";
+ name = "iosevka" + lib.optionalString (variant != "") "-" + variant;
- url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-iosevka-${version}.zip";
+ variantHashes = import ./variants.nix;
+ validVariants = map (lib.removePrefix "iosevka-")
+ (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
+in stdenv.mkDerivation rec {
+ pname = "${name}-bin";
+ version = "3.7.1";
- postFetch = ''
+ src = fetchurl {
+ url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
+ sha256 = variantHashes.${name} or (throw ''
+ No such variant "${variant}" for package iosevka-bin.
+ Valid variants are: ${lib.concatStringsSep ", " validVariants}.
+ '');
+ };
+
+ nativeBuildInputs = [ unzip ];
+
+ phases = [ "unpackPhase" ];
+
+ unpackPhase = ''
mkdir -p $out/share/fonts
- unzip -j $downloadedFile \*.ttc -d $out/share/fonts/truetype
+ unzip -d $out/share/fonts/truetype $src
'';
- sha256 = "1nab49gkpxahwvvw39xcc32q425qkccr7ffmz87jbcdv71qy7pp9";
-
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = "https://be5invis.github.io/Iosevka/";
downloadPage = "https://github.com/be5invis/Iosevka/releases";
description = ''
@@ -25,4 +40,6 @@ in fetchzip {
platforms = platforms.all;
maintainers = [ maintainers.cstrahan ];
};
+
+ passthru.updateScript = ./update.sh;
}
diff --git a/pkgs/data/fonts/iosevka/update.sh b/pkgs/data/fonts/iosevka/update.sh
new file mode 100755
index 000000000000..df78c62a6ce8
--- /dev/null
+++ b/pkgs/data/fonts/iosevka/update.sh
@@ -0,0 +1,28 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p curl jq
+
+set -e
+
+release=$(curl -s https://api.github.com/repos/be5invis/Iosevka/releases/latest)
+
+oldVersion=$(nix-instantiate --eval -E 'with import ./. {}; lib.getVersion iosevka-bin' | tr -d '"')
+version=$(echo "$release" | jq -r .tag_name | tr -d v)
+
+if test "$oldVersion" = "$version"; then
+ echo "New version same as old version, nothing to do." >&2
+ exit 0
+fi
+
+file=$(nix-instantiate --eval -A iosevka-bin.meta.position | sed -r 's/^"(.*):[0-9]+"$/\1/')
+sed -i "s/$oldVersion/$version/" "$file"
+
+{
+ echo '# This file was autogenerated. DO NOT EDIT!'
+ echo '{'
+ for asset in $(echo "$release" | jq -r '.assets[].name | select(startswith("ttc"))'); do
+ printf ' %s = "%s";\n' \
+ $(echo "$asset" | sed -r "s/^ttc-(.*)-$version.zip$/\1/") \
+ $(nix-prefetch-url "https://github.com/be5invis/Iosevka/releases/download/v$version/$asset")
+ done
+ echo '}'
+} >$(dirname "$file")/variants.nix
diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix
new file mode 100644
index 000000000000..b3fd986c4caf
--- /dev/null
+++ b/pkgs/data/fonts/iosevka/variants.nix
@@ -0,0 +1,24 @@
+# This file was autogenerated. DO NOT EDIT!
+{
+ iosevka = "0h226f32nwlqnsdc86bwk2wcdl2hsq5q1s2ln6dsf9m7w8ajn0nr";
+ iosevka-aile = "05k3h7n7mkpdsjcxha27vjj503b4129jd90wj8qyk5h0nrgy1rc6";
+ iosevka-curly = "0fxcc99n9ghkdjmfxba9mg4fc0dwlvnnxlmc618jv6s3k2xn7sza";
+ iosevka-curly-slab = "1qgxyw5v91l4cw3mvqzagk9amyy63iqh72bnsz63daxgss3fpsab";
+ iosevka-etoile = "184rjidnjayv5wsrxxxf39mvdcjafdwcvp0h4rfniy9s0ifrwjvf";
+ iosevka-slab = "1cbrv5pyhnvwrdaj8r011igw2yjgzzigd82g1r10d348lk64wja1";
+ iosevka-sparkle = "124jnjzffnfw58b78svw8rzgal10z5nspwc267pvq7q0f2ak1wpp";
+ iosevka-ss01 = "18ckb0ch4za4vgwqz8azx8vhg9v9a922ffbckrbmy8n5bi03dl7w";
+ iosevka-ss02 = "0cwm2jdni5m9z0xagpmq9vvjp3yvin7c7bnavsj15yfvpq8b8qsp";
+ iosevka-ss03 = "1yzbvkr726f8mm024qzy2hdd7nz4kymgjm0cj5208c57bln0byr2";
+ iosevka-ss04 = "1kpz84a1cb39rxc87whw0fh0k9ak2qbcq59hm425da2acf27a648";
+ iosevka-ss05 = "1xnnm96jnw90mhwylsw1ad6m8pr4r1bd02l7g82m5hmr7bc4b7dd";
+ iosevka-ss06 = "1raw01ijiawaqxfmj0m8z8jrb2ns7vzy68lak63mss8j35xzg1l5";
+ iosevka-ss07 = "0bjhjwjif7qw6wyyrzfg2pdvy1b070k053ndmjard6sh1rcln02d";
+ iosevka-ss08 = "1qwgk8riff57np4hlmd0kcl9bx511x9zmnlrjq3ilfn6abdwgm7i";
+ iosevka-ss09 = "0sfnhmcrsv1v7l756hx70y1mrp35fbs6wrsczw4vxfbbaigs767r";
+ iosevka-ss10 = "10n70z7588h8y2z274vjn6hvzc7lg87znibcmkk2brmx2g5bw2wl";
+ iosevka-ss11 = "0mnyd04vdqr8jm3syv6ddrn61f27k91kxkdy86pp34xaac2ipmm0";
+ iosevka-ss12 = "1f8pn2220s6r566b40ncnqrfmfdhnlr0nkvzj9swgvx66jr8mlhj";
+ iosevka-ss13 = "1py5qgfqm9wp9pzcxg83mydvf3r6nhrqi21d0fvmnk04ghk1psd6";
+ iosevka-ss14 = "0z47kqicd26x5v94zy97xyl277v0s6856pbllfn1gv92ax2dg5cy";
+}
From 76cd5444557b02efd98d6143d779a0c76b22b1ac Mon Sep 17 00:00:00 2001
From: eyjhb <eyjhbb@gmail.com>
Date: Thu, 22 Oct 2020 16:15:06 +0200
Subject: [PATCH 571/590] among-sus: init at 2020-10-29
---
pkgs/games/among-sus/default.nix | 29 +++++++++++++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 ++
2 files changed, 31 insertions(+)
create mode 100644 pkgs/games/among-sus/default.nix
diff --git a/pkgs/games/among-sus/default.nix b/pkgs/games/among-sus/default.nix
new file mode 100644
index 000000000000..c422ed1c8e52
--- /dev/null
+++ b/pkgs/games/among-sus/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchgit, port ? "1234" }:
+
+stdenv.mkDerivation {
+ pname = "among-sus-unstable";
+ version = "2020-10-29";
+
+ src = fetchgit {
+ url = "https://git.sr.ht/~martijnbraam/among-sus";
+ rev = "1f4c8d800d025d36ac66826937161be3252fbc57";
+ sha256 = "19jq7ygh9l11dl1h6702bg57m04y35nqd6yqx1rgp1kxwhp45xyh";
+ };
+
+ patchPhase = ''
+ sed -i 's/port = 1234/port = ${port}/g' main.c
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+ install -Dm755 among-sus $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://git.sr.ht/~martijnbraam/among-sus";
+ description = "Among us, but it's a text adventure";
+ license = licenses.agpl3Plus;
+ maintainers = [ maintainers.eyjhb ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9fb3029c693..b635f4518058 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -140,6 +140,8 @@ in
alda = callPackage ../development/interpreters/alda { };
+ among-sus = callPackage ../games/among-sus { };
+
ankisyncd = callPackage ../servers/ankisyncd { };
avro-tools = callPackage ../development/tools/avro-tools { };
From 79e81e840415651f4470942f86f19c3fd254efab Mon Sep 17 00:00:00 2001
From: Florian Pester <florian.pester@cyberus-technology.de>
Date: Fri, 30 Oct 2020 21:30:32 +0100
Subject: [PATCH 572/590] python-miio: fix
---
.../python-modules/python-miio/default.nix | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix
index abce18c8841a..6bd140ae5b4c 100644
--- a/pkgs/development/python-modules/python-miio/default.nix
+++ b/pkgs/development/python-modules/python-miio/default.nix
@@ -4,8 +4,11 @@
, appdirs
, click
, construct
+, croniter
, cryptography
+, importlib-metadata
, pytest
+, pytest-mock
, zeroconf
, attrs
, pytz
@@ -13,6 +16,7 @@
, netifaces
}:
+
buildPythonPackage rec {
pname = "python-miio";
version = "0.5.3";
@@ -22,8 +26,17 @@ buildPythonPackage rec {
sha256 = "3be5275b569844dfa267c80a1e23dc0957411dd501cae0ed3cccf43467031ceb";
};
- checkInputs = [ pytest ];
- propagatedBuildInputs = [ appdirs click construct cryptography zeroconf attrs pytz tqdm netifaces ];
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "zeroconf>=0.25.1,<0.26.0" "zeroconf"
+ substituteInPlace setup.py \
+ --replace "pytz>=2019.3,<2020.0" "pytz"
+ substituteInPlace setup.py \
+ --replace "cryptography>=2.9,<3.0" "cryptography"
+ '';
+
+ checkInputs = [ pytest pytest-mock];
+ propagatedBuildInputs = [ appdirs click construct croniter cryptography importlib-metadata zeroconf attrs pytz tqdm netifaces ];
checkPhase = ''
pytest
From 822edc571c26ce6149901d6a92c4bbe5db7c1e22 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Fri, 30 Oct 2020 16:49:57 -0400
Subject: [PATCH 573/590] maintainers: my name should be stylized
---
maintainers/maintainer-list.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d81993d59669..d02d06f9b95a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9334,7 +9334,7 @@
email = "worldofpeace@protonmail.ch";
github = "worldofpeace";
githubId = 28888242;
- name = "worldofpeace";
+ name = "WORLDofPEACE";
};
wscott = {
email = "wsc9tt@gmail.com";
From 3e1652f8f07e7f0e346317a813369a44c430f008 Mon Sep 17 00:00:00 2001
From: V <v@anomalous.eu>
Date: Fri, 30 Oct 2020 23:15:07 +0100
Subject: [PATCH 574/590] lib/sources.nix: fix incorrect inherit
split comes from builtins, not lib.
error: attribute 'split' missing, at /nix/path/nixpkgs/lib/sources.nix:4:4
(use '--show-trace' to show detailed location information)
---
lib/sources.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/sources.nix b/lib/sources.nix
index 702a0ef88921..1a3afcae67da 100644
--- a/lib/sources.nix
+++ b/lib/sources.nix
@@ -6,6 +6,7 @@ let
hasContext
match
readDir
+ split
storeDir
tryEval
;
@@ -15,7 +16,6 @@ let
isString
pathExists
readFile
- split
;
in
rec {
From 21b2619ee600261d8fe69c739ec7b4a8115000ac Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 31 Oct 2020 08:35:39 +1000
Subject: [PATCH 575/590] buildah: 1.16.5 -> 1.17.0
https://github.com/containers/buildah/releases/tag/v1.17.0
---
pkgs/development/tools/buildah/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index 5f4f2a479285..ecd714176330 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -14,13 +14,13 @@
buildGoModule rec {
pname = "buildah";
- version = "1.16.5";
+ version = "1.17.0";
src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
- sha256 = "1d2k7n1d9mpkyjy7hp1svl34ssai62df3mp5awsill092dlwn8p2";
+ sha256 = "1bghi5m1rg42a781sgh194hqmqiflhwdrnxxn7cbb2b6jfiik08l";
};
outputs = [ "out" "man" ];
From 9b813793ef9f2c4e9d717a919125f8f44e43cb05 Mon Sep 17 00:00:00 2001
From: Ivan Petkov <ivanppetkov@gmail.com>
Date: Fri, 30 Oct 2020 16:32:09 -0700
Subject: [PATCH 576/590] topgrade: 5.7.0 -> 5.8.1
---
pkgs/tools/misc/topgrade/default.nix | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix
index b7b38766db38..9da96dd352f5 100644
--- a/pkgs/tools/misc/topgrade/default.nix
+++ b/pkgs/tools/misc/topgrade/default.nix
@@ -1,21 +1,25 @@
-{ stdenv, lib, fetchFromGitHub, rustPlatform, Foundation }:
+{ stdenv, lib, fetchFromGitHub, rustPlatform, Foundation, installShellFiles }:
rustPlatform.buildRustPackage rec {
pname = "topgrade";
- version = "5.7.0";
+ version = "5.8.1";
src = fetchFromGitHub {
owner = "r-darwish";
repo = pname;
rev = "v${version}";
- sha256 = "0nxqi2rykfxhvn8jzprklsc47iilxp1pmm2f17ikfyf5dgi69whb";
+ sha256 = "0m3kqk0ghlpzysyql777jlk5c0nb36z44vabw6r0484fh5vncwrh";
};
- cargoSha256 = "05afmz2n006331hc8yi2mq9kj574xi1iq6gr983jj75ix7n40rgg";
+ cargoSha256 = "1h5cyiyhpagdin9a8gfsccbl4jahw33nbkg5m74axyp4qrfc1mkz";
buildInputs = lib.optional stdenv.isDarwin Foundation;
- # TODO: add manpage (topgrade.8) to postInstall on next update
+ nativeBuildInputs = [ installShellFiles ];
+
+ postInstall = ''
+ installManPage topgrade.8
+ '';
meta = with lib; {
description = "Upgrade all the things";
From a5bce15b5dc04e5e32abde659db79e4e1859d655 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Fri, 30 Oct 2020 16:07:53 +0100
Subject: [PATCH 577/590] skype_call_recorder: drop
hasn't worked since 2017: https://atdot.ch/scr/2017/06/important-information-regarding-skype-version-5/
the version packaged here is also from 2008, as far as I can tell
the last upstream release was 2016
---
.../skype-call-recorder/conference.patch | 148 ------------------
.../skype-call-recorder/default.nix | 28 ----
pkgs/top-level/aliases.nix | 1 +
pkgs/top-level/all-packages.nix | 2 -
4 files changed, 1 insertion(+), 178 deletions(-)
delete mode 100644 pkgs/applications/networking/instant-messengers/skype-call-recorder/conference.patch
delete mode 100644 pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/skype-call-recorder/conference.patch b/pkgs/applications/networking/instant-messengers/skype-call-recorder/conference.patch
deleted file mode 100644
index 8b8ce8fd7bbf..000000000000
--- a/pkgs/applications/networking/instant-messengers/skype-call-recorder/conference.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From abd67f1d44eef81baf2e9729f95e002c4ecc7350 Mon Sep 17 00:00:00 2001
-From: jlh <jlh@gmx.ch>
-Date: Fri, 16 Oct 2009 17:40:54 +0200
-Subject: [PATCH] Rudimentary support for recording hosted conference calls
-
----
- call.cpp | 37 +++++++++++++++++++++++++++++++++++--
- call.h | 11 ++++++++++-
- 2 files changed, 45 insertions(+), 3 deletions(-)
-
-diff --git a/call.cpp b/call.cpp
-index c2b02f2..663c1c1 100644
---- a/call.cpp
-+++ b/call.cpp
-@@ -90,9 +90,10 @@ void AutoSync::reset() {
-
- // Call class
-
--Call::Call(QObject *p, Skype *sk, CallID i) :
-- QObject(p),
-+Call::Call(CallHandler *h, Skype *sk, CallID i) :
-+ QObject(h),
- skype(sk),
-+ handler(h),
- id(i),
- status("UNKNOWN"),
- writer(NULL),
-@@ -119,6 +120,13 @@ Call::Call(QObject *p, Skype *sk, CallID i) :
- debug(QString("Call %1: cannot get partner display name").arg(id));
- displayName = "Unnamed Caller";
- }
-+
-+ // Skype does not properly send updates when the CONF_ID property
-+ // changes. since we need this information, check it now on all calls
-+ handler->updateConfIDs();
-+ // this call isn't yet in the list of calls, thus we need to
-+ // explicitely check its CONF_ID
-+ updateConfID();
- }
-
- Call::~Call() {
-@@ -134,6 +142,10 @@ Call::~Call() {
- // QT takes care of deleting servers and sockets
- }
-
-+void Call::updateConfID() {
-+ confID = skype->getObject(QString("CALL %1 CONF_ID").arg(id)).toLong();
-+}
-+
- bool Call::okToDelete() const {
- // this is used for checking whether past calls may now be deleted.
- // when a past call hasn't been decided yet whether it should have been
-@@ -270,6 +282,11 @@ void Call::startRecording(bool force) {
- if (isRecording)
- return;
-
-+ if (handler->isConferenceRecording(confID)) {
-+ debug(QString("Call %1: call is part of a conference that is already being recorded").arg(id));
-+ return;
-+ }
-+
- if (force) {
- emit showLegalInformation();
- } else {
-@@ -589,6 +606,22 @@ CallHandler::~CallHandler() {
- delete legalInformationDialog;
- }
-
-+void CallHandler::updateConfIDs() {
-+ QList<Call *> list = calls.values();
-+ for (int i = 0; i < list.size(); i++)
-+ list.at(i)->updateConfID();
-+}
-+
-+bool CallHandler::isConferenceRecording(CallID id) const {
-+ QList<Call *> list = calls.values();
-+ for (int i = 0; i < list.size(); i++) {
-+ Call *c = list.at(i);
-+ if (c->getConfID() == id && c->getIsRecording())
-+ return true;
-+ }
-+ return false;
-+}
-+
- void CallHandler::callCmd(const QStringList &args) {
- CallID id = args.at(0).toInt();
-
-diff --git a/call.h b/call.h
-index cb8396d..b746f46 100644
---- a/call.h
-+++ b/call.h
-@@ -43,6 +43,8 @@ class QTcpServer;
- class QTcpSocket;
- class LegalInformationDialog;
-
-+class CallHandler;
-+
- typedef int CallID;
-
- class AutoSync {
-@@ -68,18 +70,21 @@ private:
- class Call : public QObject {
- Q_OBJECT
- public:
-- Call(QObject *, Skype *, CallID);
-+ Call(CallHandler *, Skype *, CallID);
- ~Call();
- void startRecording(bool = false);
- void stopRecording(bool = true);
-+ void updateConfID();
- bool okToDelete() const;
- void setStatus(const QString &);
- QString getStatus() const { return status; }
- bool statusDone() const;
- bool statusActive() const;
- CallID getID() const { return id; }
-+ CallID getConfID() const { return confID; }
- void removeFile();
- void hideConfirmation(int);
-+ bool getIsRecording() const { return isRecording; }
-
- signals:
- void startedCall(int, const QString &);
-@@ -99,10 +104,12 @@ private:
-
- private:
- Skype *skype;
-+ CallHandler *handler;
- CallID id;
- QString status;
- QString skypeName;
- QString displayName;
-+ CallID confID;
- AudioFileWriter *writer;
- bool isRecording;
- int stereo;
-@@ -140,6 +147,8 @@ class CallHandler : public QObject {
- public:
- CallHandler(QObject *, Skype *);
- ~CallHandler();
-+ void updateConfIDs();
-+ bool isConferenceRecording(CallID) const;
- void callCmd(const QStringList &);
-
- signals:
---
-1.6.5.GIT
-
diff --git a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix
deleted file mode 100644
index 57d1ffece71a..000000000000
--- a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, cmake, lame, id3lib, libvorbis, qt4, libogg }:
-
-stdenv.mkDerivation {
- name = "skype-call-recorder-0.8";
- src = fetchurl {
- url = "https://atdot.ch/scr/files/0.8/skype-call-recorder-0.8.tar.gz";
- sha256 = "1iijkhq3aj9gr3bx6zl8ryvzkqcdhsm9yisimakwq0lnw0lgf5di";
- };
-
- # Keep an rpath reference to the used libogg
- prePatch = ''
- sed -i -e '/ADD_EXECUTABLE/aSET(LIBRARIES ''${LIBRARIES} ogg)' CMakeLists.txt
- '';
-
- # Better support for hosted conferences
- patches = [ ./conference.patch ];
-
- buildInputs = [ cmake lame id3lib libvorbis qt4 libogg ];
- NIX_LDFLAGS = "-lvorbis";
-
- meta = {
- homepage = "http://atdot.ch/scr/";
- description = "Open source tool to record your Skype calls on Linux";
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = with stdenv.lib.platforms; linux;
- maintainers = with stdenv.lib.maintainers; [viric];
- };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index eeb5519233ce..7a498f69d748 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -527,6 +527,7 @@ mapAliases ({
skrooge2 = skrooge; # added 2017-02-18
sky = throw "sky has been removed from nixpkgs (2020-09-16)";
skype = skypeforlinux; # added 2017-07-27
+ skype_call_recorder = throw "skype_call_recorder has been removed from nixpkgs, because it stopped working when classic Skype was retired."; # added 2020-10-31
skydive = throw "skydive has been removed from nixpkgs (2019-09-10)";
slack-dark = slack; # added 2020-03-27
slic3r-prusa3d = prusa-slicer; # added 2019-05-21
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 319d24d2e25d..302ba3807827 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23343,8 +23343,6 @@ in
skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { };
- skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { };
-
SkypeExport = callPackage ../applications/networking/instant-messengers/SkypeExport { };
slmenu = callPackage ../applications/misc/slmenu {};
From 32573f4b6e15e57c6260b1973a4f802f3a6e1b68 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Sat, 31 Oct 2020 10:59:02 +1100
Subject: [PATCH 578/590] last: 1066 -> 1133
---
pkgs/applications/science/biology/last/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix
index 13f6a23913fc..775852931163 100644
--- a/pkgs/applications/science/biology/last/default.nix
+++ b/pkgs/applications/science/biology/last/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "last";
- version = "1066";
+ version = "1133";
src = fetchurl {
url = "http://last.cbrc.jp/last-${version}.zip";
- sha256 = "098j3f3a80rmhd01ds7rnb9y1xykmll2yh5ivpnvskssd8z2vc4r";
+ sha256 = "0a600p1fymm1ylaxzjwg46zdwz6ilaaak1f4n8xr3hp3ir9rgfjq";
};
nativeBuildInputs = [ unzip ];
From 703010347ffff5a5280965512b357e4a74efa9ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 30 Oct 2020 23:18:53 +0100
Subject: [PATCH 579/590] shfmt: 3.1.2 -> 3.2.0
---
pkgs/tools/text/shfmt/default.nix | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix
index ec58cbdd1a94..694b1db58f5f 100644
--- a/pkgs/tools/text/shfmt/default.nix
+++ b/pkgs/tools/text/shfmt/default.nix
@@ -1,30 +1,22 @@
-{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
+{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "shfmt";
- version = "3.1.2";
+ version = "3.2.0";
src = fetchFromGitHub {
owner = "mvdan";
repo = "sh";
rev = "v${version}";
- sha256 = "03zgi0rlra3gz8cbqwmhpjxsg5048anfc6ccd2w50fjhx6farsnv";
+ sha256 = "1ybrx82c4djp7izyqhvzk0rcf9ac7nv5g5ahxr0k0jhm752ba5z2";
};
- vendorSha256 = "1jq2x4yxshsy4ahp7nrry8dc9cyjj46mljs447rq57sgix4ndpq8";
+ vendorSha256 = "1ma7nvyn6ylbi8bd7x900i94pzs877kfy9xh0nf1bbify1vcpd29";
subPackages = [ "cmd/shfmt" ];
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
- patches = [
- # fix failing test on go 1.15, remove with > 3.1.2
- (fetchpatch {
- url = "https://github.com/mvdan/sh/commit/88956f97dae1f268af6c030bf2ba60762ebb488a.patch";
- sha256 = "1zg8i7kklr12zjkaxh8djd2bzkdx8klgfj271r2wivkc2x61shgv";
- })
- ];
-
meta = with lib; {
homepage = "https://github.com/mvdan/sh";
description = "A shell parser and formatter";
From 1e20b2dce4213b6a79e7fb7d3e1c5dad0ef5430f Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 31 Oct 2020 09:22:22 +1000
Subject: [PATCH 580/590] shfmt: install man page
---
pkgs/tools/text/shfmt/default.nix | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix
index 694b1db58f5f..1d1def43177c 100644
--- a/pkgs/tools/text/shfmt/default.nix
+++ b/pkgs/tools/text/shfmt/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles, scdoc }:
buildGoModule rec {
pname = "shfmt";
@@ -17,6 +17,13 @@ buildGoModule rec {
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
+ nativeBuildInputs = [ installShellFiles scdoc ];
+
+ postBuild = ''
+ scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
+ installManPage shfmt.1
+ '';
+
meta = with lib; {
homepage = "https://github.com/mvdan/sh";
description = "A shell parser and formatter";
From 9a8d6011aacf22cb12b371978eb89ee5f49ae1f0 Mon Sep 17 00:00:00 2001
From: David Anderson <dave@natulte.net>
Date: Fri, 21 Aug 2020 04:07:41 +0000
Subject: [PATCH 581/590] nixos/tailscale: add tailscale to
environment.systemPackages.
Use of Tailscale requires using the `tailscale` CLI to talk to the
daemon. If the CLI isn't in systemPackages, the resulting user experience
is confusing as the Tailscale daemon does nothing.
Signed-off-by: David Anderson <dave@natulte.net>
---
nixos/modules/services/networking/tailscale.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix
index 4d6aeb75ebd1..9a692f12b3d4 100644
--- a/nixos/modules/services/networking/tailscale.nix
+++ b/nixos/modules/services/networking/tailscale.nix
@@ -17,6 +17,7 @@ in {
};
config = mkIf cfg.enable {
+ environment.systemPackages = [ pkgs.tailscale ]; # for the CLI
systemd.services.tailscale = {
description = "Tailscale client daemon";
From a32ede5635cf13eda25aef12eed0d3d0c3309621 Mon Sep 17 00:00:00 2001
From: Masanori Ogino <167209+omasanori@users.noreply.github.com>
Date: Sat, 31 Oct 2020 14:02:35 +0900
Subject: [PATCH 582/590] kmscon: add omasanori as a maintainer (#102206)
Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
---
pkgs/os-specific/linux/kmscon/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/os-specific/linux/kmscon/default.nix
index 29f99629df87..8b01fe94d4c7 100644
--- a/pkgs/os-specific/linux/kmscon/default.nix
+++ b/pkgs/os-specific/linux/kmscon/default.nix
@@ -54,6 +54,7 @@ stdenv.mkDerivation rec {
description = "KMS/DRM based System Console";
homepage = "http://www.freedesktop.org/wiki/Software/kmscon/";
license = licenses.mit;
+ maintainers = with maintainers; [ omasanori ];
platforms = platforms.linux;
};
}
From ec38df81a9c189c5d5cd1286bba1f43dc0ed978d Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 28 Oct 2020 13:00:17 -0700
Subject: [PATCH 583/590] buildFHSUserEnvBubblewrap: fix whitespace with root
directories
---
pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
index c7cfd27d3faa..83d5d371b397 100644
--- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
+++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
@@ -77,13 +77,13 @@ let
done
fi
- auto_mounts=""
+ declare -a auto_mounts
# loop through all directories in the root
for dir in /*; do
# if it is a directory and it is not in the blacklist
if [[ -d "$dir" ]] && grep -v "$dir" <<< "$blacklist" >/dev/null; then
# add it to the mount list
- auto_mounts="$auto_mounts --bind $dir $dir"
+ auto_mounts+=(--bind "$dir" "$dir")
fi
done
@@ -97,7 +97,7 @@ let
--ro-bind /nix /nix \
${etcBindFlags} \
$ro_mounts \
- $auto_mounts \
+ "''${auto_mounts[@]}" \
${init runScript}/bin/${name}-init ${initArgs}
'';
From b8f45c32f89931b68fda102649d3cb6f4e17fa6a Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 20 Oct 2020 09:10:16 -0700
Subject: [PATCH 584/590] python3Packages.tensorflow: break if gast not correct
---
pkgs/development/python-modules/tensorflow/1/default.nix | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/tensorflow/1/default.nix b/pkgs/development/python-modules/tensorflow/1/default.nix
index 5df3ad32afb4..599f809f8646 100644
--- a/pkgs/development/python-modules/tensorflow/1/default.nix
+++ b/pkgs/development/python-modules/tensorflow/1/default.nix
@@ -445,5 +445,7 @@ in buildPythonPackage {
libtensorflow = bazel-build.out;
};
- inherit (bazel-build) meta;
+ meta = bazel-build.meta // {
+ broken = gast.version != "0.3.2";
+ };
}
From 0544a7f672749c88b7569f49b33ed5f2437a2e15 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 25 Oct 2020 22:07:10 -0700
Subject: [PATCH 585/590] scripts/mark-broken: improve
This improves on the previous verison of this script.
Previously it only accepted one attr, and required
explicit passing of the "broken" value.
This script is meant to be used to mark failing hydra builds as broken in the meta attrs
To use the script, you should pass the list of failing attrs as arguments to the script.
Example: `cat failing-attrs | xargs ./pkgs/common-update/scripts/mark-broken`
Generating a list of failing attrs: (this should be improved at a later date)
- Go to the most recent hydra evaluation with all builds completed
- Select the "builds still failing" tab
- Highlight and select all packages, should be prefixed with `nixpkgs.`
- Use regex and editor foo to leave only the attr names
- Use the above example command to then execute the script
OTHER NOTES:
- The `denyFileList` and `denyAttrList` will likely need to be updated slightly
to align with the conventions used in nixpkgs at execution time
- Any attrs which failed for any reason will be written to `failed-marks.txt`.
Those attrs will likely need manual attention as disablement will likely be conditional.
---
pkgs/common-updater/scripts/mark-broken | 152 ++++++++++++++----------
1 file changed, 86 insertions(+), 66 deletions(-)
diff --git a/pkgs/common-updater/scripts/mark-broken b/pkgs/common-updater/scripts/mark-broken
index d128d0d458ba..ee80616d0cbe 100755
--- a/pkgs/common-updater/scripts/mark-broken
+++ b/pkgs/common-updater/scripts/mark-broken
@@ -1,86 +1,106 @@
#!/usr/bin/env bash
-set -e
+
+# This script is meant to be used to mark failing hydra builds as broken in the meta attrs
+# To use the script, you should pass the list of failing attrs as arguments to the script.
+#
+# Example: `cat failing-attrs | xargs ./pkgs/common-update/scripts/mark-broken`
+#
+# Generating a list of failing attrs: (this should be improved at a later date)
+# - Go to the most recent hydra evaluation with all builds completed
+# - Select the "builds still failing" tab
+# - Highlight and select all packages, should be prefixed with `nixpkgs.`
+# - Use regex and editor foo to leave only the attr names
+# - Use the above example command to then execute the script
+#
+# OTHER NOTES:
+# - The `denyFileList` and `denyAttrList` will likely need to be updated slightly
+# to align with the conventions used in nixpkgs at execution time
+# - Any attrs which failed for any reason will be written to `failed-marks.txt`.
+# Those attrs will likely need manual attention as disablement will likely be conditional.
scriptName=mark-broken # do not use the .wrapped name
-die() {
- echo "$scriptName: error: $1" >&2
- exit 1
+failMark() {
+ local attr=$1
+ shift 1
+
+ echo "$attr: $@" >&2
+ echo $attr >> failed-marks.txt
}
usage() {
- echo "Usage: $scriptName <attr> [--new-value=<new-value>]"
+ echo "Usage: $scriptName <attrs>"
}
-args=()
-
-for arg in "$@"; do
- case $arg in
- --new-value=*)
- newValue="${arg#*=}"
- ;;
- --help)
- usage
- exit 0
- ;;
- --*)
- echo "$scriptName: Unknown argument: $arg"
- usage
- exit 1
- ;;
- *)
- args["${#args[*]}"]=$arg
- ;;
- esac
-done
-
-attr=${args[0]}
-
-if (( "${#args[*]}" < 1 )); then
+if (( "${#@}" < 1 )); then
echo "$scriptName: Too few arguments"
usage
exit 1
fi
-if (( "${#args[*]}" > 1 )); then
- echo "$scriptName: Too many arguments"
- usage
- exit 1
-fi
+# in case we resolve to an auto-generated file, just skip these entries
+denyFileList=(
+ node-packages.nix # node, it will mark all node packages as broken
+ generic-builder.nix # haskell, it will mark all haskell packages as broken
+)
-if [ -z $newValue ]; then
- newValue="true"
-fi
+# ignore older versions of parameterized packages sets, these likely need
+# to be conditionally disabled
+denyAttrList=(
+ python27Packages
+ python37Packages
+ libsForQt512
+ linuxPackages_
+ rubyPackages_
+)
-nixFile=$(nix-instantiate --eval --json -E "with import ./. {}; (builtins.unsafeGetAttrPos \"description\" $attr.meta).file" | jq -r .)
-if [[ ! -f "$nixFile" ]]; then
- die "Couldn't evaluate 'builtins.unsafeGetAttrPos \"description\" $attr.meta' to locate the .nix file!"
-fi
+function attemptToMarkBroken() {
+ local attr=$1
-# Insert broken attribute
-sed -i.bak "$nixFile" -r \
- -e "/^\s*broken\s*=.*$/d" \
- -e "s/(\s*)meta\s*=.*\{/&\n\1 broken = $newValue;/"
+ # skip likely to be noisy attrs
+ for badAttr in ${denyAttrList[@]};do
+ if [[ $attr =~ $badAttr ]]; then
+ failMark $attr "attr contained $badAttr, skipped."
+ return
+ fi
+ done
-if cmp -s "$nixFile" "$nixFile.bak"; then
- mv "$nixFile.bak" "$nixFile"
- die "Failed to mark the package as broken! Does it have a meta attribute?"
-fi
+ nixFile=$(nix-instantiate --eval --json -E "with import ./. {}; (builtins.unsafeGetAttrPos \"description\" $attr.meta).file" 2>/dev/null | jq -r .)
+ if [[ ! -f "$nixFile" ]]; then
+ failMark $attr "Couldn't locate correct file"
+ return
+ fi
-if [[ "$newValue" == "true" ]]; then
- # broken should evaluate to true in any case now
- markedSuccessfully=$(nix-instantiate --eval -E "with import ./. {}; $attr.meta.broken" || true)
- if [[ ! "$markedSuccessfully" == "true" ]]; then
- mv "$nixFile.bak" "$nixFile"
- die "Couldn't verify the broken attribute to be set correctly, restoring backup!"
- fi
-else
- # we can not check if broken evaluates to the correct value, but we can check that it does evaluate
- if ! nix-instantiate --eval -E "with import ./. {}; $attr.meta.broken" >/dev/null; then
- mv "$nixFile.bak" "$nixFile"
- die "Couldn't verify the broken attribute to be set correctly, restoring backup!"
- fi
-fi
+ # skip files which are auto-generated
+ for filename in ${denyFileList[@]};do
+ if [[ "$filename" == $(basename $nixFile) ]]; then
+ failMark $attr "filename matched $filename, skipped."
+ return
+ fi
+ done
-rm -f "$nixFile.bak"
-rm -f "$attr.fetchlog"
+ # Insert broken attribute
+ sed -i.bak "$nixFile" -r \
+ -e "/^\s*broken\s*=.*$/d" \
+ -e "s/(\s*)meta\s*=.*\{/&\n\1 broken = true;/"
+
+ if cmp -s "$nixFile" "$nixFile.bak"; then
+ mv "$nixFile.bak" "$nixFile"
+ failMark $attr "Does it have a meta attribute?"
+ return
+ fi
+
+ # broken should evaluate to true in any case now
+ markedSuccessfully=$(nix-instantiate --eval -E "with import ./. {}; $attr.meta.broken")
+ if [[ "$markedSuccessfully" != "true" ]]; then
+ mv "$nixFile.bak" "$nixFile"
+ failMark $attr "$attr.meta.broken doesn't evaluate to true."
+ return
+ fi
+
+ rm -f "$nixFile.bak"
+}
+
+for attr in $@; do
+ attemptToMarkBroken $attr
+done
From 2df221ec8a95566ba771f102fd421c12b41d875c Mon Sep 17 00:00:00 2001
From: Jade <software@lfcode.ca>
Date: Sat, 31 Oct 2020 00:35:19 -0700
Subject: [PATCH 586/590] nixos/postgresql: fix inaccurate docs for
authentication (#97622)
* nixos/postgresql: fix inaccurate docs for authentication
We actually use peer authentication, then md5 based authentication.
trust is not used.
* Use a link for mkForce docs
Co-authored-by: aszlig <aszlig@redmoonstudios.org>
Co-authored-by: lf- <lf-@users.noreply.github.com>
Co-authored-by: aszlig <aszlig@redmoonstudios.org>
---
nixos/modules/services/databases/postgresql.nix | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 5056d50153f6..f582b0592774 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -69,11 +69,16 @@ in
type = types.lines;
default = "";
description = ''
- Defines how users authenticate themselves to the server. By
- default, "trust" access to local users will always be granted
- along with any other custom options. If you do not want this,
- set this option using "lib.mkForce" to override this
- behaviour.
+ Defines how users authenticate themselves to the server. See the
+ <link xlink:href="https://www.postgresql.org/docs/current/auth-pg-hba-conf.html">
+ PostgreSQL documentation for pg_hba.conf</link>
+ for details on the expected format of this option. By default,
+ peer based authentication will be used for users connecting
+ via the Unix socket, and md5 password authentication will be
+ used for users connecting via TCP. Any added rules will be
+ inserted above the default rules. If you'd like to replace the
+ default rules entirely, you can use <function>lib.mkForce</function> in your
+ module.
'';
};
From 8cab21b48b46086d5240dcee4dd018cb4a78c074 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 28 Oct 2020 17:25:40 +0100
Subject: [PATCH 587/590] Revert "coq: propagate and install ocaml and findlib"
This reverts commit 5d0e2dedd5594cdf3ebbda8bc61310e227235a9c.
---
pkgs/applications/science/logic/coq/default.nix | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 9b7e007ce503..946cba41b143 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -109,7 +109,7 @@ self = stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ]
++ stdenv.lib.optional (!versionAtLeast "8.6") gnumake42
;
- buildInputs = [ ncurses ]
+ buildInputs = [ ncurses ocamlPackages.ocaml ocamlPackages.findlib ]
++ stdenv.lib.optional (!versionAtLeast "8.10") ocamlPackages.camlp5
++ stdenv.lib.optional (!versionAtLeast "8.12") ocamlPackages.num
++ stdenv.lib.optionals buildIde
@@ -117,10 +117,7 @@ self = stdenv.mkDerivation {
then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ]
else [ ocamlPackages.lablgtk ]);
- propagatedBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ]
- ++ stdenv.lib.optional (versionAtLeast "8.12") ocamlPackages.num;
-
- propagatedUserEnvPkgs = [ ocamlPackages.ocaml ocamlPackages.findlib ];
+ propagatedBuildInputs = stdenv.lib.optional (versionAtLeast "8.12") ocamlPackages.num;
postPatch = ''
UNAME=$(type -tp uname)
From d7ea5189581352d448e36f01efdcd5d9dee472d1 Mon Sep 17 00:00:00 2001
From: Jonathan Wilkins <jonathan@wilkins.tech>
Date: Sat, 31 Oct 2020 00:05:20 +0000
Subject: [PATCH 588/590] i3status-rust: 0.14.1 -> 0.14.2
---
pkgs/applications/window-managers/i3/status-rust.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix
index 8bd3d581434e..f6acf5698f4c 100644
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/pkgs/applications/window-managers/i3/status-rust.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "i3status-rust";
- version = "0.14.1";
+ version = "0.14.2";
src = fetchFromGitHub {
owner = "greshake";
repo = pname;
rev = "v${version}";
- sha256 = "11qhzjml04njhfa033v98m4yd522zj91s6ffvrm0m6sk7m0wyjsc";
+ sha256 = "1f1gvgb1zk8gw596vaz9iihbpybwzs5shd25qq7bn2bhr4hqlbb9";
};
- cargoSha256 = "0jmmxld4rsjj6p5nazi3d8j1hh7r34q6kyfqq4wv0sjc77gcpaxd";
+ cargoSha256 = "1dcfclk8lbqvq2hywr80jm63p1i1kz3893zq99ipgryia46vd397";
nativeBuildInputs = [ pkgconfig ];
From f28c4a120f5cacdad318782ccdd5b3599cea7e65 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 31 Oct 2020 21:22:09 +1000
Subject: [PATCH 589/590] vgrep: 2.4.0 -> 2.5.0
https://github.com/vrothberg/vgrep/releases/tag/v2.5.0
---
pkgs/tools/text/vgrep/default.nix | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/text/vgrep/default.nix b/pkgs/tools/text/vgrep/default.nix
index 12880b2e4eca..c51fce43467e 100644
--- a/pkgs/tools/text/vgrep/default.nix
+++ b/pkgs/tools/text/vgrep/default.nix
@@ -1,20 +1,28 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, go-md2man, installShellFiles }:
buildGoModule rec {
pname = "vgrep";
- version = "2.4.0";
+ version = "2.5.0";
src = fetchFromGitHub {
owner = "vrothberg";
repo = pname;
rev = "v${version}";
- sha256 = "109j04my2xib8m52a0337996a27nvfgzackpg20zs3nzn66dmvb7";
+ sha256 = "1waxp66286q325avvsq58s8qkfjqa39s5p8c3z59scpm0244nr80";
};
vendorSha256 = null;
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
+ nativeBuildInputs = [ go-md2man installShellFiles ];
+
+ postBuild = ''
+ sed -i '/SHELL= /d' Makefile
+ make docs
+ installManPage docs/*.[1-9]
+ '';
+
meta = with lib; {
description = "User-friendly pager for grep/git-grep/ripgrep";
homepage = "https://github.com/vrothberg/vgrep";
From 680d3201230c7864755bff80fcdef30d7487500a Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 31 Oct 2020 13:57:22 +0100
Subject: [PATCH 590/590] tdesktop: 2.4.4 -> 2.4.5
---
.../telegram/tdesktop/default.nix | 4 +-
.../telegram/tdesktop/tg_owt-install.patch | 159 ------------------
.../telegram/tdesktop/tg_owt.nix | 6 +-
3 files changed, 4 insertions(+), 165 deletions(-)
delete mode 100644 pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt-install.patch
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 379922ee5855..ed1b643960c9 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -22,12 +22,12 @@ let
in mkDerivation rec {
pname = "telegram-desktop";
- version = "2.4.4";
+ version = "2.4.5";
# Telegram-Desktop with submodules
src = fetchurl {
url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
- sha256 = "09lhikaybf57rki62miqcaxxrdg1ni2rj9aj4w9mrbzdv849fyc8";
+ sha256 = "0nhzypgc45f5gqy53azj7mljnj7p9p0m7bil02f9cih1dg5sdxx5";
};
postPatch = ''
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt-install.patch b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt-install.patch
deleted file mode 100644
index bc8a23eb31e5..000000000000
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt-install.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6fbc0da..6cbff3c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1856,3 +1856,41 @@ configure_file(
- "${CMAKE_CURRENT_BINARY_DIR}/tg_owtConfig.cmake"
- COPYONLY
- )
-+
-+install(
-+TARGETS
-+ tg_owt
-+ libabsl
-+ libopenh264
-+ libpffft
-+ librnnoise
-+ libsrtp
-+ libusrsctp
-+ libvpx
-+ ${vpx_export}
-+ libwebrtcbuild
-+ libyuv
-+ ${platform_export}
-+EXPORT tg_owtTargets
-+RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-+)
-+
-+install(
-+ DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/src/
-+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-+ FILES_MATCHING PATTERN "*.h"
-+)
-+
-+install(
-+ EXPORT tg_owtTargets
-+ NAMESPACE tg_owt::
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/tg_owt
-+)
-+
-+install(
-+ FILES ${CMAKE_CURRENT_BINARY_DIR}/tg_owtConfig.cmake
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/tg_owt
-+)
-diff --git a/cmake/libabsl.cmake b/cmake/libabsl.cmake
-index 2fb3b8c..4a4f85b 100644
---- a/cmake/libabsl.cmake
-+++ b/cmake/libabsl.cmake
-@@ -123,5 +123,6 @@ PRIVATE
-
- target_include_directories(libabsl
- PUBLIC
-- ${libabsl_loc}
-+ $<BUILD_INTERFACE:${libabsl_loc}>
-+ $<INSTALL_INTERFACE:include/third_party/abseil-cpp>
- )
-diff --git a/cmake/libpffft.cmake b/cmake/libpffft.cmake
-index a6ceb3e..435d3a3 100644
---- a/cmake/libpffft.cmake
-+++ b/cmake/libpffft.cmake
-@@ -24,5 +24,6 @@ endif()
-
- target_include_directories(libpffft
- PUBLIC
-- ${libpffft_loc}
-+ $<BUILD_INTERFACE:${libpffft_loc}>
-+ $<INSTALL_INTERFACE:include/third_party/pffft/src>
- )
-diff --git a/cmake/libsrtp.cmake b/cmake/libsrtp.cmake
-index 57c54b5..26b3466 100644
---- a/cmake/libsrtp.cmake
-+++ b/cmake/libsrtp.cmake
-@@ -30,6 +30,8 @@ PRIVATE
-
- target_include_directories(libsrtp
- PUBLIC
-- ${libsrtp_loc}/include
-- ${libsrtp_loc}/crypto/include
-+ $<BUILD_INTERFACE:${libsrtp_loc}/include>
-+ $<BUILD_INTERFACE:${libsrtp_loc}/crypto/include>
-+ $<INSTALL_INTERFACE:include/third_party/libsrtp/include>
-+ $<INSTALL_INTERFACE:include/third_party/libsrtp/crypto/include>
- )
-diff --git a/cmake/libusrsctp.cmake b/cmake/libusrsctp.cmake
-index caa0529..38d2ef6 100644
---- a/cmake/libusrsctp.cmake
-+++ b/cmake/libusrsctp.cmake
-@@ -67,6 +67,8 @@ endif()
-
- target_include_directories(libusrsctp
- PUBLIC
-- ${third_party_loc}/usrsctp/usrsctplib
-- ${libusrsctp_loc}
-+ $<BUILD_INTERFACE:${third_party_loc}/usrsctp/usrsctplib>
-+ $<BUILD_INTERFACE:${libusrsctp_loc}>
-+ $<INSTALL_INTERFACE:include/third_party/usrsctp/usrsctplib/usrsctplib>
-+ $<INSTALL_INTERFACE:include/third_party/usrsctp/usrsctplib>
- )
-diff --git a/cmake/libvpx.cmake b/cmake/libvpx.cmake
-index e192e7e..78cf25b 100644
---- a/cmake/libvpx.cmake
-+++ b/cmake/libvpx.cmake
-@@ -68,6 +68,11 @@ else()
- set(ASM_SUFFIX ".asm.S")
- endif()
-
-+foreach(dir ${include_directories})
-+ string(REPLACE ${libvpx_loc} include/third_party/libvpx install_include_dir ${dir})
-+ list(APPEND install_include_directories ${install_include_dir})
-+endforeach()
-+
- function(add_sublibrary postfix)
- add_library(libvpx_${postfix} OBJECT)
- init_feature_target(libvpx_${postfix} ${postfix})
-@@ -75,6 +80,8 @@ function(add_sublibrary postfix)
- target_include_directories(libvpx_${postfix}
- PRIVATE
- ${include_directories}
-+ "$<BUILD_INTERFACE:${include_directories}>"
-+ "$<INSTALL_INTERFACE:${install_include_directories}>"
- )
- set(sources_list ${ARGV})
- list(REMOVE_AT sources_list 0)
-@@ -725,5 +732,6 @@ endif()
-
- target_include_directories(libvpx
- PUBLIC
-- ${include_directories}
-+ "$<BUILD_INTERFACE:${include_directories}>"
-+ "$<INSTALL_INTERFACE:${install_include_directories}>"
- )
-diff --git a/cmake/libwebrtcbuild.cmake b/cmake/libwebrtcbuild.cmake
-index c3520b8..9b4b543 100644
---- a/cmake/libwebrtcbuild.cmake
-+++ b/cmake/libwebrtcbuild.cmake
-@@ -44,5 +44,6 @@ endif()
-
- target_include_directories(libwebrtcbuild
- INTERFACE
-- ${webrtc_loc}
-+ $<BUILD_INTERFACE:${webrtc_loc}>
-+ $<INSTALL_INTERFACE:include>
- )
-diff --git a/cmake/libyuv.cmake b/cmake/libyuv.cmake
-index ebfc6f0..18e70ef 100644
---- a/cmake/libyuv.cmake
-+++ b/cmake/libyuv.cmake
-@@ -126,7 +126,8 @@ endif()
-
- target_include_directories(libyuv
- PUBLIC
-- ${libyuv_loc}/include
-+ $<BUILD_INTERFACE:${libyuv_loc}/include>
-+ $<INSTALL_INTERFACE:include/third_party/libyuv/include>
- )
-
- target_compile_definitions(libyuv
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
index 47e9b6787e3e..4695e61f7d5b 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
@@ -3,8 +3,8 @@
}:
let
- rev = "c73a4718cbff7048373a63db32068482e5fd11ef";
- sha256 = "0nr20mvvmmg8ii8f2rljd7iv2szplcfjn40rpy6llkmf705mwr1k";
+ rev = "1d4f7d74ff1a627db6e45682efd0e3b85738e426";
+ sha256 = "1w03xmjn693ff489pg368jv21478vr4ldxyya4lsrx87fn88caj3";
in stdenv.mkDerivation {
pname = "tg_owt";
@@ -16,8 +16,6 @@ in stdenv.mkDerivation {
inherit rev sha256;
};
- patches = [ ./tg_owt-install.patch ];
-
nativeBuildInputs = [ pkg-config cmake ninja yasm ];
buildInputs = [ libjpeg openssl libopus ffmpeg alsaLib libpulseaudio ];