From fa3bd91478c43e2e2497578d04a47c26e335b9b5 Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Mon, 1 Jun 2020 13:57:17 +0100 Subject: [PATCH 001/124] agda-categories: 0.1 -> 0.1.3.1 --- .../libraries/agda/agda-categories/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/agda/agda-categories/default.nix b/pkgs/development/libraries/agda/agda-categories/default.nix index 9eb68b5a64a..13ca6c52d71 100644 --- a/pkgs/development/libraries/agda/agda-categories/default.nix +++ b/pkgs/development/libraries/agda/agda-categories/default.nix @@ -1,14 +1,14 @@ { lib, mkDerivation, fetchFromGitHub, standard-library }: mkDerivation rec { - version = "0.1"; + version = "0.1.3.1"; pname = "agda-categories"; src = fetchFromGitHub { owner = "agda"; repo = "agda-categories"; - rev = "release/v${version}"; - sha256 = "0m4pjy92jg6zfziyv0bxv5if03g8k4413ld8c3ii2xa8bzfn04m2"; + rev = "v${version}"; + sha256 = "08mc20qaz9vp5rhi60rh8wvjkg5aby3bgwwdhfnxha1663qf1q24"; }; buildInputs = [ standard-library ]; @@ -18,11 +18,6 @@ mkDerivation rec { description = "A new Categories library"; license = licenses.bsd3; platforms = platforms.unix; - # agda categories takes a lot of memory to build. - # This can be removed if this is eventually fixed upstream. - hydraPlatforms = []; - # Waiting for release 0.2 for this to work - broken = true; maintainers = with maintainers; [ alexarice turion ]; }; } From 2608e5266418138b74648c47611d3f77e45c65a4 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 18 Jun 2020 13:19:44 +0200 Subject: [PATCH 002/124] cargo-c: init at 0.6.7 This crate is required for building the C-API for rav1e [0] but is also used by other projects [1]. [0]: https://github.com/xiph/rav1e#building-the-c-api [1]: https://github.com/lu-zero/cargo-c/#users --- .../tools/rust/cargo-c/default.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-c/default.nix diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix new file mode 100644 index 00000000000..bd2d370d1c8 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-c/default.nix @@ -0,0 +1,48 @@ +{ rustPlatform, stdenv, lib, fetchFromGitHub, fetchurl +, pkg-config, openssl +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-c"; + version = "0.6.7"; + + src = stdenv.mkDerivation rec { + name = "${pname}-source-${version}"; + + src = fetchFromGitHub { + owner = "lu-zero"; + repo = pname; + rev = "v${version}"; + sha256 = "0n52xh4qg12bvvp2dgx5wfj5f31qijdqahasa3qfa3c3aqq7cvvg"; + }; + cargoLock = fetchurl { + url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock"; + sha256 = "0296187hsaxxmqhsrrva4qf313jwh3z08j1vxcbislxdq8xg32qb"; + }; + + installPhase = '' + mkdir -p $out + cp -R ./* $out/ + cp ${cargoLock} $out/Cargo.lock + ''; + }; + + cargoSha256 = "1gwyszpcmss2d0lm5hvf3b48jy7b0fm7xizhrl3wd6rzw7pg06zd"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + meta = with lib; { + description = "A cargo subcommand to build and install C-ABI compatibile dynamic and static libraries"; + longDescription = '' + Cargo C-ABI helpers. A cargo applet that produces and installs a correct + pkg-config file, a static library and a dynamic library, and a C header + to be used by any C (and C-compatible) software. + ''; + homepage = "https://github.com/lu-zero/cargo-c"; + changelog = "https://github.com/lu-zero/cargo-c/releases/tag/v${version}"; + 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 0a0bb8018ef..be4c03fd539 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9198,6 +9198,7 @@ in cargo-audit = callPackage ../tools/package-management/cargo-audit { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-c = callPackage ../development/tools/rust/cargo-c { }; cargo-deb = callPackage ../tools/package-management/cargo-deb { inherit (darwin.apple_sdk.frameworks) Security; }; From 7024a01211d9d0a4f8ab138a611349c37ac5a537 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 18 Jun 2020 18:17:54 +0200 Subject: [PATCH 003/124] rav1e: Build and install C-compatible libraries This is required for AV1 encoding support via librav1e in FFmpeg 4.3: https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/d8bf24459b694338de4ceb2a2e6d4d2949d6658d --- pkgs/tools/video/rav1e/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index b8e43fe4f10..f8d547b0285 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchFromGitHub, lib, nasm }: +{ rustPlatform, fetchFromGitHub, lib, nasm, cargo-c }: rustPlatform.buildRustPackage rec { pname = "rav1e"; @@ -13,7 +13,15 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1xaincrmpicp0skf9788w5631x1hxvifvq06hh5ribdz79zclzx3"; - nativeBuildInputs = [ nasm ]; + nativeBuildInputs = [ nasm cargo-c ]; + + postBuild = '' + cargo cbuild --release --frozen --prefix=${placeholder "out"} + ''; + + postInstall = '' + cargo cinstall --release --frozen --prefix=${placeholder "out"} + ''; meta = with lib; { description = "The fastest and safest AV1 encoder"; From 956d35b9904d1643b5b49c716afe40c5c01dd13c Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Wed, 22 Jul 2020 00:05:17 +0200 Subject: [PATCH 004/124] openhantek6022: init at 3.1.1 --- .../electronics/openhantek6022/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/science/electronics/openhantek6022/default.nix diff --git a/pkgs/applications/science/electronics/openhantek6022/default.nix b/pkgs/applications/science/electronics/openhantek6022/default.nix new file mode 100644 index 00000000000..5a70831d824 --- /dev/null +++ b/pkgs/applications/science/electronics/openhantek6022/default.nix @@ -0,0 +1,31 @@ +{ mkDerivation, lib, fetchFromGitHub, makeWrapper, cmake, qtbase, qttools, fftw, libusb1, libglvnd }: + +mkDerivation rec { + pname = "openhantek6022"; + version = "3.1.1"; + + src = fetchFromGitHub { + owner = "OpenHantek"; + repo = "OpenHantek6022"; + rev = version; + sha256 = "17b0qmz7g0nk7n7jhbh5xhs135dpj9kv41n42vvpdzwr6z5rk4qm"; + }; + + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ fftw libusb1 libglvnd qtbase qttools ]; + + postPatch = '' + # Fix up install paths & checks + sed -i 's#if(EXISTS ".*")#if(1)#g' CMakeLists.txt + sed -i 's#/lib/udev#lib/udev#g' CMakeLists.txt + sed -i 's#/usr/share#share#g' CMakeLists.txt + ''; + + meta = with lib; { + description = "Free software for Hantek and compatible (Voltcraft/Darkwire/Protek/Acetech) USB digital signal oscilloscopes"; + homepage = "https://github.com/OpenHantek/OpenHantek6022"; + license = licenses.gpl3; + maintainers = with maintainers; [ baracoder ]; + platforms = qtbase.meta.platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 220b3d43659..98c0b33fdb7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5742,6 +5742,8 @@ in openjade = callPackage ../tools/text/sgml/openjade { }; + openhantek6022 = libsForQt5.callPackage ../applications/science/electronics/openhantek6022 { }; + openimagedenoise = callPackage ../development/libraries/openimagedenoise { }; openmvg = callPackage ../applications/science/misc/openmvg { }; From 2a597059fe8c3182b053dd50295c2b016ed0e0f3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 11:17:22 +0000 Subject: [PATCH 005/124] freerdp: 2.1.2 -> 2.2.0 --- pkgs/applications/networking/remote/freerdp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 11f97206b6e..52f8decf170 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "1yvi7zd0ic0rv7njd0wi9q1mfvz4d9qrx3i45dd6hcq465wg8dp7"; + sha256 = "02zlg5r704zbryx09a5rjjf7q137kj16i9qh25dw9q1y69ri619n"; }; postPatch = '' From e89ba5ac5613fbcae5e709e2ba30c0a1f64ae300 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 1 Aug 2020 22:31:20 +0200 Subject: [PATCH 006/124] mopidy-tunein: init at 1.0.0 --- pkgs/applications/audio/mopidy/default.nix | 2 ++ pkgs/applications/audio/mopidy/tunein.nix | 28 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 31 insertions(+) create mode 100644 pkgs/applications/audio/mopidy/tunein.nix diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 6c2a7d9fe33..23322ca5663 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -40,6 +40,8 @@ let mopidy-iris = callPackage ./iris.nix { }; + mopidy-tunein = callPackage ./tunein.nix { }; + }; in self diff --git a/pkgs/applications/audio/mopidy/tunein.nix b/pkgs/applications/audio/mopidy/tunein.nix new file mode 100644 index 00000000000..569d08fb4a0 --- /dev/null +++ b/pkgs/applications/audio/mopidy/tunein.nix @@ -0,0 +1,28 @@ +{ stdenv, python3Packages, mopidy }: + +python3Packages.buildPythonApplication rec { + pname = "mopidy-tunein"; + version = "1.0.0"; + + src = python3Packages.fetchPypi { + inherit version; + pname = "Mopidy-TuneIn"; + sha256 = "0insasf4w8ajsqjh5zmax7pkzmrk1p245vh4y8ddicldj45p6qfj"; + }; + + propagatedBuildInputs = [ + mopidy + ]; + + # tests fail with "ValueError: Namespace Gst not available" in mopidy itself + doCheck = false; + + pythonImportsCheck = [ "mopidy_tunein.tunein" ]; + + meta = with stdenv.lib; { + description = "Mopidy extension for playing music from tunein."; + homepage = "https://github.com/kingosticks/mopidy-tunein"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c5a2b0886d..6d7e1d3254a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21365,6 +21365,7 @@ in mopidy-soundcloud mopidy-spotify mopidy-spotify-tunigo + mopidy-tunein mopidy-youtube; motif = callPackage ../development/libraries/motif { }; From f77e28d83df6ac53ac44156e06203d152ec5f667 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 30 Jul 2020 23:44:43 +0300 Subject: [PATCH 007/124] nixos/gitea: enable data access only for 'gitea' group --- nixos/modules/services/misc/gitea.nix | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index f8bcedc94fe..15aeb191f57 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -357,12 +357,20 @@ in }; systemd.tmpfiles.rules = [ - "d '${cfg.stateDir}' - ${cfg.user} gitea - -" - "d '${cfg.stateDir}/conf' - ${cfg.user} gitea - -" - "d '${cfg.stateDir}/custom' - ${cfg.user} gitea - -" - "d '${cfg.stateDir}/custom/conf' - ${cfg.user} gitea - -" - "d '${cfg.stateDir}/log' - ${cfg.user} gitea - -" - "d '${cfg.repositoryRoot}' - ${cfg.user} gitea - -" + "d '${cfg.repositoryRoot}' 0750 ${cfg.user} gitea - -" + "z '${cfg.repositoryRoot}' 0750 ${cfg.user} gitea - -" + "Z '${cfg.repositoryRoot}' - ${cfg.user} gitea - -" + "d '${cfg.stateDir}' 0750 ${cfg.user} gitea - -" + "d '${cfg.stateDir}/conf' 0750 ${cfg.user} gitea - -" + "d '${cfg.stateDir}/custom' 0750 ${cfg.user} gitea - -" + "d '${cfg.stateDir}/custom/conf' 0750 ${cfg.user} gitea - -" + "d '${cfg.stateDir}/log' 0750 ${cfg.user} gitea - -" + "z '${cfg.stateDir}' 0750 ${cfg.user} gitea - -" + "z '${cfg.stateDir}/.ssh' 0700 ${cfg.user} gitea - -" + "z '${cfg.stateDir}/conf' 0750 ${cfg.user} gitea - -" + "z '${cfg.stateDir}/custom' 0750 ${cfg.user} gitea - -" + "z '${cfg.stateDir}/custom/conf' 0750 ${cfg.user} gitea - -" + "z '${cfg.stateDir}/log' 0750 ${cfg.user} gitea - -" "Z '${cfg.stateDir}' - ${cfg.user} gitea - -" # If we have a folder or symlink with gitea locales, remove it @@ -440,7 +448,8 @@ in ProtectKernelTunables = true; ProtectKernelModules = true; ProtectControlGroups = true; - ReadWritePaths = cfg.stateDir; + ReadWritePaths = [ cfg.repositoryRoot cfg.stateDir ]; + UMask = "0027"; # Caps CapabilityBoundingSet = ""; NoNewPrivileges = true; From 4e68da6337638e49af9a17b0857196a60934c13f Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 31 Jul 2020 00:04:23 +0300 Subject: [PATCH 008/124] nixos/gitea: add 'backupDir' option --- nixos/modules/services/misc/gitea.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 15aeb191f57..28609f8ec8a 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -162,6 +162,12 @@ in 7. ''; }; + + backupDir = mkOption { + type = types.str; + default = "${cfg.stateDir}/dump"; + description = "Path to the dump files."; + }; }; appName = mkOption { @@ -357,6 +363,9 @@ in }; systemd.tmpfiles.rules = [ + "d '${cfg.dump.backupDir}' 0750 ${cfg.user} gitea - -" + "z '${cfg.dump.backupDir}' 0750 ${cfg.user} gitea - -" + "Z '${cfg.dump.backupDir}' - ${cfg.user} gitea - -" "d '${cfg.repositoryRoot}' 0750 ${cfg.user} gitea - -" "z '${cfg.repositoryRoot}' 0750 ${cfg.user} gitea - -" "Z '${cfg.repositoryRoot}' - ${cfg.user} gitea - -" @@ -448,7 +457,7 @@ in ProtectKernelTunables = true; ProtectKernelModules = true; ProtectControlGroups = true; - ReadWritePaths = [ cfg.repositoryRoot cfg.stateDir ]; + ReadWritePaths = [ cfg.dump.backupDir cfg.repositoryRoot cfg.stateDir ]; UMask = "0027"; # Caps CapabilityBoundingSet = ""; @@ -513,7 +522,7 @@ in Type = "oneshot"; User = cfg.user; ExecStart = "${gitea}/bin/gitea dump"; - WorkingDirectory = cfg.stateDir; + WorkingDirectory = cfg.dump.backupDir; }; }; From 1a0e633c600805cae48e09f2ecae5201fa369ba0 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 31 Jul 2020 00:20:27 +0300 Subject: [PATCH 009/124] nixos/gitea: enable pid file --- nixos/modules/services/misc/gitea.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 28609f8ec8a..e672440564a 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -448,8 +448,11 @@ in User = cfg.user; Group = "gitea"; WorkingDirectory = cfg.stateDir; - ExecStart = "${gitea}/bin/gitea web"; + ExecStart = "${gitea}/bin/gitea web --pid /run/gitea/gitea.pid"; Restart = "always"; + # Runtime directory and mode + RuntimeDirectory = "gitea"; + RuntimeDirectoryMode = "0755"; # Filesystem ProtectHome = true; From 6a0fd33b4c15d7e0e0b0cdad5ef280eba32ccdcc Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 31 Jul 2020 01:16:53 +0300 Subject: [PATCH 010/124] nixos/gitea: add support socket connection --- nixos/modules/services/misc/gitea.nix | 30 ++++++++++++++++++++------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index e672440564a..734bf79ddf6 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -206,6 +206,12 @@ in description = "HTTP listen port."; }; + enableUnixSocket = mkOption { + type = types.bool; + default = false; + description = "Configure Gitea to listen on a unix socket instead of the default TCP port."; + }; + cookieSecure = mkOption { type = types.bool; default = false; @@ -306,14 +312,22 @@ in ROOT = cfg.repositoryRoot; }; - server = { - DOMAIN = cfg.domain; - HTTP_ADDR = cfg.httpAddress; - HTTP_PORT = cfg.httpPort; - ROOT_URL = cfg.rootUrl; - STATIC_ROOT_PATH = cfg.staticRootPath; - LFS_JWT_SECRET = "#jwtsecret#"; - }; + server = mkMerge [ + { + DOMAIN = cfg.domain; + STATIC_ROOT_PATH = cfg.staticRootPath; + LFS_JWT_SECRET = "#jwtsecret#"; + ROOT_URL = cfg.rootUrl; + } + (mkIf cfg.enableUnixSocket { + PROTOCOL = "unix"; + HTTP_ADDR = "/run/gitea/gitea.sock"; + }) + (mkIf (!cfg.enableUnixSocket) { + HTTP_ADDR = cfg.httpAddress; + HTTP_PORT = cfg.httpPort; + }) + ]; session = { COOKIE_NAME = "session"; From dfd32f11f3ff1da571e499ed993dff99037e73bd Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 31 Jul 2020 15:53:48 +0300 Subject: [PATCH 011/124] nixos/gitea: update sandboxing options --- nixos/modules/services/misc/gitea.nix | 35 ++++++++++++++++----------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 734bf79ddf6..6c6541b9369 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -467,27 +467,34 @@ in # Runtime directory and mode RuntimeDirectory = "gitea"; RuntimeDirectoryMode = "0755"; - - # Filesystem - ProtectHome = true; - PrivateDevices = true; - ProtectKernelTunables = true; - ProtectKernelModules = true; - ProtectControlGroups = true; + # Access write directories ReadWritePaths = [ cfg.dump.backupDir cfg.repositoryRoot cfg.stateDir ]; UMask = "0027"; - # Caps + # Capabilities CapabilityBoundingSet = ""; + # Security NoNewPrivileges = true; - # Misc. - LockPersonality = true; - RestrictRealtime = true; - PrivateMounts = true; + # Sandboxing + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; PrivateUsers = true; + ProtectHostname = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + RestrictAddressFamilies = [ "AF_UNIX AF_INET AF_INET6" ]; + LockPersonality = true; MemoryDenyWriteExecute = true; - SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @raw-io @reboot @resources @setuid @swap"; + RestrictRealtime = true; + RestrictSUIDSGID = true; + PrivateMounts = true; + # System Call Filtering SystemCallArchitectures = "native"; - RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6"; + SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @raw-io @reboot @resources @setuid @swap"; }; environment = { From 6c258a7c212fed4b4cdf13f5a2957f98989675ff Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 1 Aug 2020 12:03:38 +0300 Subject: [PATCH 012/124] nixos/gitea: add ssh options --- nixos/modules/services/misc/gitea.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 6c6541b9369..7fb6be5ea84 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -170,6 +170,25 @@ in }; }; + ssh = { + enable = mkOption { + type = types.bool; + default = true; + description = "Enable external SSH feature."; + }; + + clonePort = mkOption { + type = types.int; + default = 22; + example = 2222; + description = '' + SSH port displayed in clone URL. + The option is required to configure a service when the external visible port + differs from the local listening port i.e. if port forwarding is used. + ''; + }; + }; + appName = mkOption { type = types.str; default = "gitea: Gitea Service"; @@ -327,6 +346,13 @@ in HTTP_ADDR = cfg.httpAddress; HTTP_PORT = cfg.httpPort; }) + (mkIf cfg.ssh.enable { + DISABLE_SSH = false; + SSH_PORT = cfg.ssh.clonePort; + }) + (mkIf (!cfg.ssh.enable) { + DISABLE_SSH = true; + }) ]; session = { From 31ce2636a4219123c05e63e5a20221453ee5ca42 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 2 Aug 2020 20:32:17 +0300 Subject: [PATCH 013/124] nixos/gitea: add lfs options --- nixos/modules/services/misc/gitea.nix | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 7fb6be5ea84..af80e99746b 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -189,6 +189,20 @@ in }; }; + lfs = { + enable = mkOption { + type = types.bool; + default = false; + description = "Enables git-lfs support."; + }; + + contentDir = mkOption { + type = types.str; + default = "${cfg.stateDir}/data/lfs"; + description = "Where to store LFS files."; + }; + }; + appName = mkOption { type = types.str; default = "gitea: Gitea Service"; @@ -353,6 +367,11 @@ in (mkIf (!cfg.ssh.enable) { DISABLE_SSH = true; }) + (mkIf cfg.lfs.enable { + LFS_START_SERVER = true; + LFS_CONTENT_PATH = cfg.lfs.contentDir; + }) + ]; session = { @@ -406,6 +425,9 @@ in "d '${cfg.dump.backupDir}' 0750 ${cfg.user} gitea - -" "z '${cfg.dump.backupDir}' 0750 ${cfg.user} gitea - -" "Z '${cfg.dump.backupDir}' - ${cfg.user} gitea - -" + "d '${cfg.lfs.contentDir}' 0750 ${cfg.user} gitea - -" + "z '${cfg.lfs.contentDir}' 0750 ${cfg.user} gitea - -" + "Z '${cfg.lfs.contentDir}' - ${cfg.user} gitea - -" "d '${cfg.repositoryRoot}' 0750 ${cfg.user} gitea - -" "z '${cfg.repositoryRoot}' 0750 ${cfg.user} gitea - -" "Z '${cfg.repositoryRoot}' - ${cfg.user} gitea - -" @@ -494,7 +516,7 @@ in RuntimeDirectory = "gitea"; RuntimeDirectoryMode = "0755"; # Access write directories - ReadWritePaths = [ cfg.dump.backupDir cfg.repositoryRoot cfg.stateDir ]; + ReadWritePaths = [ cfg.dump.backupDir cfg.repositoryRoot cfg.stateDir cfg.lfs.contentDir ]; UMask = "0027"; # Capabilities CapabilityBoundingSet = ""; From 3fcd7415a742a87c3a3937f51df65679bb7e6210 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Thu, 6 Aug 2020 13:33:38 +0000 Subject: [PATCH 014/124] luajit_2_0, luajit_2_1: 2.1.0-2020-03-20 -> 2.1.0-2020-08-05 --- pkgs/development/interpreters/luajit/2.0.nix | 6 +++--- pkgs/development/interpreters/luajit/2.1.nix | 6 +++--- pkgs/development/interpreters/luajit/default.nix | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index 3f0fa7303eb..e96a7c604c7 100644 --- a/pkgs/development/interpreters/luajit/2.0.nix +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -1,10 +1,10 @@ { self, callPackage, lib }: callPackage ./default.nix { inherit self; - version = "2.0.5-2020-03-20"; - rev = "e613105"; + version = "2.0.5-2020-08-05"; + rev = "2211f6f"; isStable = true; - sha256 = "0k843z90s4hi0qhri6ixy8sv21nig8jwbznpqgqg845ji530kqj7"; + sha256 = "01adxmknq2xyb3w9sn8ilnar8181h7ksd9i80yrsbwzix5lwkn6m"; extraMeta = { # this isn't precise but it at least stops the useless Hydra build platforms = with lib; filter (p: p != "aarch64-linux") (platforms.linux ++ platforms.darwin); diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix index b5a7894e98d..f08bbd0e972 100644 --- a/pkgs/development/interpreters/luajit/2.1.nix +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -1,8 +1,8 @@ { self, callPackage }: callPackage ./default.nix { inherit self; - version = "2.1.0-2020-03-20"; - rev = "9143e86"; + version = "2.1.0-2020-08-05"; + rev = "10ddae7"; isStable = false; - sha256 = "1zw1yr0375d6jr5x20zvkvk76hkaqamjynbswpl604w6r6id070b"; + sha256 = "1lmjs0gz9vgbhh5f45jvvibpj7f3sz81r8cz4maln9yhc67f2zmk"; } diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 9bc76c44937..9658186b9c0 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -104,6 +104,6 @@ stdenv.mkDerivation rec { homepage = "http://luajit.org"; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ thoughtpolice smironov vcunat andir ]; + maintainers = with maintainers; [ thoughtpolice smironov vcunat andir lblasc ]; } // extraMeta; } From 6302eb2bfb7796dc93d5943000ea91d9eb4277a4 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Fri, 7 Aug 2020 20:56:34 -0400 Subject: [PATCH 015/124] apacheHttpd: 2.4.43 -> 2.4.46 --- pkgs/servers/http/apache-httpd/2.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 8d8a0fceefb..867723018d3 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.43"; + version = "2.4.46"; pname = "apache-httpd"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "0hqgw47r3p3521ygkkqs8s30s5crm683081avj6330gwncm6b5x4"; + sha256 = "1sj1rwgbcjgkzac3ybjy7j68c9b3dv3ap71m48mrjhf6w7vds3kl"; }; # FIXME: -dev depends on -doc From 7c365103d7c51a72ab03bd2526eae56efd718661 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sun, 9 Aug 2020 07:26:07 +0000 Subject: [PATCH 016/124] luajit.pkgs.luaexpat: fix redefinition of luaL_setfuncs() --- pkgs/development/lua-modules/luaexpat.patch | 36 +++++++++++++++++++++ pkgs/development/lua-modules/overrides.nix | 3 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/lua-modules/luaexpat.patch diff --git a/pkgs/development/lua-modules/luaexpat.patch b/pkgs/development/lua-modules/luaexpat.patch new file mode 100644 index 00000000000..3dd60910842 --- /dev/null +++ b/pkgs/development/lua-modules/luaexpat.patch @@ -0,0 +1,36 @@ +diff --git a/src/lxplib.c b/src/lxplib.c +index 1c972db..5712611 100644 +--- a/src/lxplib.c ++++ b/src/lxplib.c +@@ -590,7 +590,7 @@ static void set_info (lua_State *L) { + /* + ** Adapted from Lua 5.2.0 + */ +-static void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) { ++static void compat_luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) { + luaL_checkstack(L, nup, "too many upvalues"); + for (; l->name != NULL; l++) { /* fill the table with given functions */ + int i; +@@ -602,6 +602,8 @@ static void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) { + } + lua_pop(L, nup); /* remove upvalues */ + } ++#else ++#define compat_luaL_setfuncs(L, reg, nup) luaL_setfuncs(L, reg, nup) + #endif + + +@@ -612,11 +614,11 @@ int luaopen_lxp (lua_State *L) { + lua_pushvalue(L, -2); + lua_rawset(L, -3); + +- luaL_setfuncs (L, lxp_meths, 0); ++ compat_luaL_setfuncs (L, lxp_meths, 0); + lua_pop (L, 1); /* remove metatable */ + + lua_newtable (L); +- luaL_setfuncs (L, lxp_funcs, 0); ++ compat_luaL_setfuncs (L, lxp_funcs, 0); + set_info (L); + return 1; + } diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 26260872e18..03fcc933013 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -204,6 +204,9 @@ with super; externalDeps = [ { name = "EXPAT"; dep = pkgs.expat; } ]; + patches = [ + ./luaexpat.patch + ]; }); # TODO Somehow automatically amend buildInputs for things that need luaffi From 64fde26355541523fc4c461843844aac6c84916d Mon Sep 17 00:00:00 2001 From: Stijn DW Date: Sun, 9 Aug 2020 13:18:21 +0200 Subject: [PATCH 017/124] nixos/redmine: patch mercurial integration --- .../redmine/0001-python3.patch | 275 ++++++++++++++++++ .../version-management/redmine/default.nix | 4 + 2 files changed, 279 insertions(+) create mode 100644 pkgs/applications/version-management/redmine/0001-python3.patch diff --git a/pkgs/applications/version-management/redmine/0001-python3.patch b/pkgs/applications/version-management/redmine/0001-python3.patch new file mode 100644 index 00000000000..98213c781a1 --- /dev/null +++ b/pkgs/applications/version-management/redmine/0001-python3.patch @@ -0,0 +1,275 @@ +--- a/lib/redmine/scm/adapters/mercurial/redminehelper.py ++++ b/lib/redmine/scm/adapters/mercurial/redminehelper.py +@@ -45,17 +45,20 @@ Output example of rhmanifest:: + + + """ +-import re, time, cgi, urllib ++import re, time, html, urllib + from mercurial import cmdutil, commands, node, error, hg, registrar + + cmdtable = {} + command = registrar.command(cmdtable) if hasattr(registrar, 'command') else cmdutil.command(cmdtable) + +-_x = cgi.escape +-_u = lambda s: cgi.escape(urllib.quote(s)) ++_x = lambda s: html.escape(s.decode('utf-8')).encode('utf-8') ++_u = lambda s: html.escape(urllib.parse.quote(s)).encode('utf-8') ++ ++def unquoteplus(*args, **kwargs): ++ return urllib.parse.unquote_to_bytes(*args, **kwargs).replace(b'+', b' ') + + def _changectx(repo, rev): +- if isinstance(rev, str): ++ if isinstance(rev, bytes): + rev = repo.lookup(rev) + if hasattr(repo, 'changectx'): + return repo.changectx(rev) +@@ -70,10 +73,10 @@ def _tip(ui, repo): + except TypeError: # Mercurial < 1.1 + return repo.changelog.count() - 1 + tipctx = _changectx(repo, tiprev()) +- ui.write('\n' ++ ui.write(b'\n' + % (tipctx.rev(), _x(node.hex(tipctx.node())))) + +-_SPECIAL_TAGS = ('tip',) ++_SPECIAL_TAGS = (b'tip',) + + def _tags(ui, repo): + # see mercurial/commands.py:tags +@@ -84,7 +87,7 @@ def _tags(ui, repo): + r = repo.changelog.rev(n) + except error.LookupError: + continue +- ui.write('\n' ++ ui.write(b'\n' + % (r, _x(node.hex(n)), _x(t))) + + def _branches(ui, repo): +@@ -104,136 +107,148 @@ def _branches(ui, repo): + return repo.branchheads(branch) + def lookup(rev, n): + try: +- return repo.lookup(rev) ++ return repo.lookup(str(rev).encode('utf-8')) + except RuntimeError: + return n + for t, n, r in sorted(iterbranches(), key=lambda e: e[2], reverse=True): + if lookup(r, n) in branchheads(t): +- ui.write('\n' ++ ui.write(b'\n' + % (r, _x(node.hex(n)), _x(t))) + + def _manifest(ui, repo, path, rev): + ctx = _changectx(repo, rev) +- ui.write('\n' ++ ui.write(b'\n' + % (ctx.rev(), _u(path))) + + known = set() +- pathprefix = (path.rstrip('/') + '/').lstrip('/') ++ pathprefix = (path.decode('utf-8').rstrip('/') + '/').lstrip('/') + for f, n in sorted(ctx.manifest().iteritems(), key=lambda e: e[0]): +- if not f.startswith(pathprefix): ++ fstr = f.decode('utf-8') ++ if not fstr.startswith(pathprefix): + continue +- name = re.sub(r'/.*', '/', f[len(pathprefix):]) ++ name = re.sub(r'/.*', '/', fstr[len(pathprefix):]) + if name in known: + continue + known.add(name) + + if name.endswith('/'): +- ui.write('\n' ++ ui.write(b'\n' + % _x(urllib.quote(name[:-1]))) + else: + fctx = repo.filectx(f, fileid=n) + tm, tzoffset = fctx.date() +- ui.write('\n' ++ ui.write(b'\n' + % (_u(name), fctx.rev(), _x(node.hex(fctx.node())), + tm, fctx.size(), )) + +- ui.write('\n') ++ ui.write(b'\n') + +-@command('rhannotate', +- [('r', 'rev', '', 'revision'), +- ('u', 'user', None, 'list the author (long with -v)'), +- ('n', 'number', None, 'list the revision number (default)'), +- ('c', 'changeset', None, 'list the changeset'), ++@command(b'rhannotate', ++ [(b'r', b'rev', b'', b'revision'), ++ (b'u', b'user', None, b'list the author (long with -v)'), ++ (b'n', b'number', None, b'list the revision number (default)'), ++ (b'c', b'changeset', None, b'list the changeset'), + ], +- 'hg rhannotate [-r REV] [-u] [-n] [-c] FILE...') ++ b'hg rhannotate [-r REV] [-u] [-n] [-c] FILE...') + def rhannotate(ui, repo, *pats, **opts): +- rev = urllib.unquote_plus(opts.pop('rev', None)) ++ rev = unquoteplus(opts.pop('rev', b'')) + opts['rev'] = rev +- return commands.annotate(ui, repo, *map(urllib.unquote_plus, pats), **opts) ++ return commands.annotate(ui, repo, *map(unquoteplus, pats), **opts) + +-@command('rhcat', +- [('r', 'rev', '', 'revision')], +- 'hg rhcat ([-r REV] ...) FILE...') ++@command(b'rhcat', ++ [(b'r', b'rev', b'', b'revision')], ++ b'hg rhcat ([-r REV] ...) FILE...') + def rhcat(ui, repo, file1, *pats, **opts): +- rev = urllib.unquote_plus(opts.pop('rev', None)) ++ rev = unquoteplus(opts.pop('rev', b'')) + opts['rev'] = rev +- return commands.cat(ui, repo, urllib.unquote_plus(file1), *map(urllib.unquote_plus, pats), **opts) ++ return commands.cat(ui, repo, unquoteplus(file1), *map(unquoteplus, pats), **opts) + +-@command('rhdiff', +- [('r', 'rev', [], 'revision'), +- ('c', 'change', '', 'change made by revision')], +- 'hg rhdiff ([-c REV] | [-r REV] ...) [FILE]...') ++@command(b'rhdiff', ++ [(b'r', b'rev', [], b'revision'), ++ (b'c', b'change', b'', b'change made by revision')], ++ b'hg rhdiff ([-c REV] | [-r REV] ...) [FILE]...') + def rhdiff(ui, repo, *pats, **opts): + """diff repository (or selected files)""" + change = opts.pop('change', None) + if change: # add -c option for Mercurial<1.1 + base = _changectx(repo, change).parents()[0].rev() +- opts['rev'] = [str(base), change] ++ opts['rev'] = [base, change] + opts['nodates'] = True +- return commands.diff(ui, repo, *map(urllib.unquote_plus, pats), **opts) +- +-@command('rhlog', +- [ +- ('r', 'rev', [], 'show the specified revision'), +- ('b', 'branch', [], +- 'show changesets within the given named branch'), +- ('l', 'limit', '', +- 'limit number of changes displayed'), +- ('d', 'date', '', +- 'show revisions matching date spec'), +- ('u', 'user', [], +- 'revisions committed by user'), +- ('', 'from', '', +- ''), +- ('', 'to', '', +- ''), +- ('', 'rhbranch', '', +- ''), +- ('', 'template', '', +- 'display with template')], +- 'hg rhlog [OPTION]... [FILE]') ++ return commands.diff(ui, repo, *map(unquoteplus, pats), **opts) ++ ++@command(b'rhlog', ++ [ ++ (b'r', b'rev', [], b'show the specified revision'), ++ (b'b', b'branch', [], ++ b'show changesets within the given named branch'), ++ (b'l', b'limit', b'', ++ b'limit number of changes displayed'), ++ (b'd', b'date', b'', ++ b'show revisions matching date spec'), ++ (b'u', b'user', [], ++ b'revisions committed by user'), ++ (b'', b'from', b'', ++ b''), ++ (b'', b'to', b'', ++ b''), ++ (b'', b'rhbranch', b'', ++ b''), ++ (b'', b'template', b'', ++ b'display with template')], ++ b'hg rhlog [OPTION]... [FILE]') ++ + def rhlog(ui, repo, *pats, **opts): + rev = opts.pop('rev') + bra0 = opts.pop('branch') +- from_rev = urllib.unquote_plus(opts.pop('from', None)) +- to_rev = urllib.unquote_plus(opts.pop('to' , None)) +- bra = urllib.unquote_plus(opts.pop('rhbranch', None)) +- from_rev = from_rev.replace('"', '\\"') +- to_rev = to_rev.replace('"', '\\"') +- if hg.util.version() >= '1.6': +- opts['rev'] = ['"%s":"%s"' % (from_rev, to_rev)] ++ from_rev = unquoteplus(opts.pop('from', b'')) ++ to_rev = unquoteplus(opts.pop('to' , b'')) ++ bra = unquoteplus(opts.pop('rhbranch', b'')) ++ from_rev = from_rev.replace(b'"', b'\\"') ++ to_rev = to_rev.replace(b'"', b'\\"') ++ if (from_rev != b'') or (to_rev != b''): ++ if from_rev != b'': ++ quotefrom = b'"%s"' % (from_rev) ++ else: ++ quotefrom = from_rev ++ if to_rev != b'': ++ quoteto = b'"%s"' % (to_rev) ++ else: ++ quoteto = to_rev ++ opts['rev'] = [b'%s:%s' % (quotefrom, quoteto)] + else: +- opts['rev'] = ['%s:%s' % (from_rev, to_rev)] +- opts['branch'] = [bra] +- return commands.log(ui, repo, *map(urllib.unquote_plus, pats), **opts) +- +-@command('rhmanifest', +- [('r', 'rev', '', 'show the specified revision')], +- 'hg rhmanifest [-r REV] [PATH]') +-def rhmanifest(ui, repo, path='', **opts): ++ opts['rev'] = rev ++ if (bra != b''): ++ opts['branch'] = [bra] ++ return commands.log(ui, repo, *map(unquoteplus, pats), **opts) ++ ++ ++@command(b'rhmanifest', ++ [(b'r', b'rev', b'', b'show the specified revision')], ++ b'hg rhmanifest -r REV [PATH]') ++def rhmanifest(ui, repo, path=b'', **opts): + """output the sub-manifest of the specified directory""" +- ui.write('\n') +- ui.write('\n') +- ui.write('\n' % _u(repo.root)) ++ ui.write(b'\n') ++ ui.write(b'\n') ++ ui.write(b'\n' % _u(repo.root)) + try: +- _manifest(ui, repo, urllib.unquote_plus(path), urllib.unquote_plus(opts.get('rev'))) ++ _manifest(ui, repo, unquoteplus(path), unquoteplus(opts.get('rev'))) + finally: +- ui.write('\n') +- ui.write('\n') ++ ui.write(b'\n') ++ ui.write(b'\n') + +-@command('rhsummary',[], 'hg rhsummary') ++@command(b'rhsummary',[], b'hg rhsummary') + def rhsummary(ui, repo, **opts): + """output the summary of the repository""" +- ui.write('\n') +- ui.write('\n') +- ui.write('\n' % _u(repo.root)) ++ ui.write(b'\n') ++ ui.write(b'\n') ++ ui.write(b'\n' % _u(repo.root)) + try: + _tip(ui, repo) + _tags(ui, repo) + _branches(ui, repo) + # TODO: bookmarks in core (Mercurial>=1.8) + finally: +- ui.write('\n') +- ui.write('\n') ++ ui.write(b'\n') ++ ui.write(b'\n') + diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 2344e8dbd4b..defbf9c2aec 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -21,6 +21,10 @@ in buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ]; + # taken from https://www.redmine.org/issues/33784 + # can be dropped when the upstream bug is closed and the fix is present in the upstream release + patches = [ ./0001-python3.patch ]; + buildPhase = '' mv config config.dist mv public/themes public/themes.dist From d4c6ffaf34849cdfea853262901be358b7ba1fcb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 10 Aug 2020 04:32:39 +0000 Subject: [PATCH 018/124] clightning: 0.8.2.1 -> 0.9.0 --- pkgs/applications/blockchains/clightning.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning.nix index 6777e5998ce..f289139d8d8 100644 --- a/pkgs/applications/blockchains/clightning.nix +++ b/pkgs/applications/blockchains/clightning.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "clightning"; - version = "0.8.2.1"; + version = "0.9.0"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "02incjr59fv75q6hlrln9h4b5gq7ipd778scbz8b8dahj7x1a6i5"; + sha256 = "11ig5bqxvhx82gq9nl7c5iqaf3x8xbwfx7cf2318pyqdimz4r1v6"; }; enableParallelBuilding = true; From b8aa0991e04b77139dc82783abdecab6367916d3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 10 Aug 2020 12:03:26 +0000 Subject: [PATCH 019/124] gnss-sdr: 0.0.12 -> 0.0.13 --- pkgs/applications/radio/gnss-sdr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index 4e423094e90..cc89ffb4f87 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "gnss-sdr"; - version = "0.0.12"; + version = "0.0.13"; src = fetchFromGitHub { owner = "gnss-sdr"; repo = "gnss-sdr"; rev = "v${version}"; - sha256 = "0i9cz85jc2m758pzy3bq4dk4vj9wv7k2z118lasb09xldx01dwsq"; + sha256 = "0a3k47fl5dizzhbqbrbmckl636lznyjby2d2nz6fz21637hvrnby"; }; buildInputs = [ From f91f307a3342ef65c4b4cbadc3690b1fff34c374 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 10 Aug 2020 13:06:41 +0000 Subject: [PATCH 020/124] humioctl: 0.26.0 -> 0.26.1 --- pkgs/applications/logging/humioctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/applications/logging/humioctl/default.nix index 5210e10f814..202b74b4d80 100644 --- a/pkgs/applications/logging/humioctl/default.nix +++ b/pkgs/applications/logging/humioctl/default.nix @@ -1,8 +1,8 @@ { buildGoModule, fetchFromGitHub, installShellFiles, stdenv }: let - humioCtlVersion = "0.26.0"; - sha256 = "1j33hmvhkb546dbi2qd5hmpcv715yg9rnpxicc1mayr9f1i2aj2i"; + humioCtlVersion = "0.26.1"; + sha256 = "1zpcbfv7zlym0jfyz78piggm8zhqlzbwpwq0dn255d0zc48zp773"; vendorSha256 = "1l2wa4w43srfrkb4qrgiyzdb6bnaqvp9g3fnrln6bhrcw6jsgj4z"; in buildGoModule { name = "humioctl-${humioCtlVersion}"; From c63ece099885aa68d56db5faddb8e6d67b3275b1 Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Mon, 10 Aug 2020 10:02:57 +0100 Subject: [PATCH 021/124] agdaPackages.generic: init at v0.1 --- .../libraries/agda/generic/default.nix | 31 +++++++++++++++++++ pkgs/top-level/agda-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/agda/generic/default.nix diff --git a/pkgs/development/libraries/agda/generic/default.nix b/pkgs/development/libraries/agda/generic/default.nix new file mode 100644 index 00000000000..1287e08bda1 --- /dev/null +++ b/pkgs/development/libraries/agda/generic/default.nix @@ -0,0 +1,31 @@ +{ lib, mkDerivation, fetchFromGitHub, standard-library }: + +mkDerivation rec { + pname = "generic"; + version = "0.1"; + + src = fetchFromGitHub { + repo = "Generic"; + owner = "effectfully"; + rev = "v${version}"; + sha256 = "121121rg3daaqp91845fbyws6g28hyj1ywmh12n54r3nicb35g5q"; + }; + + buildInputs = [ + standard-library + ]; + + preBuild = '' + echo "module Everything where" > Everything.agda + find src -name '*.agda' | sed -e 's/src\///;s/\//./g;s/\.agda$//;s/^/import /' >> Everything.agda + ''; + + meta = with lib; { + description = + "A library for doing generic programming in Agda"; + homepage = src.meta.homepage; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ alexarice turion ]; + }; +} diff --git a/pkgs/top-level/agda-packages.nix b/pkgs/top-level/agda-packages.nix index 5b5b2d19181..3209aff9496 100644 --- a/pkgs/top-level/agda-packages.nix +++ b/pkgs/top-level/agda-packages.nix @@ -24,5 +24,7 @@ let agda-categories = callPackage ../development/libraries/agda/agda-categories { }; cubical = callPackage ../development/libraries/agda/cubical { }; + + generic = callPackage ../development/libraries/agda/generic { }; }; in mkAgdaPackages Agda From c2d1888e89cf707d9e9e5adfcdce5594af8a246f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Aug 2020 03:57:07 +0000 Subject: [PATCH 022/124] irqbalance: 1.6.0 -> 1.7.0 --- pkgs/os-specific/linux/irqbalance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix index 4c4e1ff025d..d61d02b5598 100644 --- a/pkgs/os-specific/linux/irqbalance/default.nix +++ b/pkgs/os-specific/linux/irqbalance/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "irqbalance"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "irqbalance"; repo = "irqbalance"; rev = "v${version}"; - sha256 = "01r9s63yxaijg8jqcbkwqlyqq2z673szb0vzd7qb2y3gk5jlif2y"; + sha256 = "1677ap6z4hvwga0vb8hrvpc0qggyarg9mlg11pxywz7mq94vdx19"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 2325e4851dd48a70b61bd111e1c7201399417b09 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Aug 2020 04:06:43 +0000 Subject: [PATCH 023/124] istioctl: 1.6.6 -> 1.6.7 --- pkgs/applications/networking/cluster/istioctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index e04d799248e..5d5a1a0d213 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "istioctl"; - version = "1.6.6"; + version = "1.6.7"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "0njchcb58lxk0cixk2rz4qj7b0zpp6zf3i5dda43j4hfsb37mifj"; + sha256 = "0zqp78ilr39j4pyqyk8a0rc0dlmkgzdd2ksfjd7vyjns5mrrjfj7"; }; vendorSha256 = "0cc0lmjsxrn3f78k95wklf3yn5k7h8slwnwmssy1i1h0bkcg1bai"; From 2097c213d12911fffd421a7c1e2fdde028d95189 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Aug 2020 05:35:07 +0000 Subject: [PATCH 024/124] libmaxminddb: 1.4.2 -> 1.4.3 --- pkgs/development/libraries/libmaxminddb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix index 493f1b5ce61..94a4b9ec57c 100644 --- a/pkgs/development/libraries/libmaxminddb/default.nix +++ b/pkgs/development/libraries/libmaxminddb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmaxminddb"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "0mnimbaxnnarlw7g1rh8lpxsyf7xnmzwcczcc3lxw8xyf6ljln6x"; + sha256 = "0fd4a4sxiiwzbd5h74wl1ijnb7xybjyybb7q41vdq3w8nk3zdzd5"; }; meta = with stdenv.lib; { From d0ef3538cf60057a69504647b1d0c2b9fcaa96eb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Aug 2020 06:10:54 +0000 Subject: [PATCH 025/124] limesuite: 20.07.1 -> 20.07.2 --- pkgs/applications/radio/limesuite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index d4a7d8372e8..013b4978b56 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "limesuite"; - version = "20.07.1"; + version = "20.07.2"; src = fetchFromGitHub { owner = "myriadrf"; repo = "LimeSuite"; rev = "v${version}"; - sha256 = "14mxqc350j3rk1202n0ax1rfx49sy40965zj90d4pnakbgz5xr7g"; + sha256 = "0v0w0f5ff1gwpfy13x1q1jsx9xfg4s3ccg05ikpnkzj4yg6sjps1"; }; nativeBuildInputs = [ cmake ]; From 161ae4902084dc0364234d0dc834a1daee2fca0b Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Tue, 11 Aug 2020 02:29:38 -0400 Subject: [PATCH 026/124] kopia: 0.5.2 -> 0.6.0 --- pkgs/tools/backup/kopia/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index 7343de63eca..1973c119486 100644 --- a/pkgs/tools/backup/kopia/default.nix +++ b/pkgs/tools/backup/kopia/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kopia"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1s74wa2r6nzrbp1f1bcbypwggishwwvpnwnqzs8gncz7dsa44zj4"; + sha256 = "0jxl2zq3s3czz52ndq7zbj8liij0519745pbcqaj42x851c1p6mj"; }; - vendorSha256 = "11az7zgwzbcx4dknwqiwmdbrbkdzhpwzqnyk8vw9mkbda0xaif3k"; + vendorSha256 = "1npxr7gp59xv38zdx1diilfxij6lb0cmvsnzvjx6n8g0326gf2ii"; doCheck = false; From e434584ae418ecbbd46611a7868d038f316c8694 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Aug 2020 06:40:27 +0000 Subject: [PATCH 027/124] mgba: 0.8.2 -> 0.8.3 --- pkgs/misc/emulators/mgba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index e67549b208b..73845581b1b 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "mgba"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; rev = version; - sha256 = "0dlwhn3hrpaqnl5hjs53y8j2i16idxrg3gy688gcwrc9z1a6bkn2"; + sha256 = "0rwlfjdr0rzbq4kaplvwsgyb8xq6nrzxss2c8xrgw9hqw3ymx4s3"; }; enableParallelBuilding = true; From 1126ae66eb148d77b25ba2001675153edaa16f27 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Aug 2020 07:27:59 +0000 Subject: [PATCH 028/124] miller: 5.7.0 -> 5.8.0 --- pkgs/tools/text/miller/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix index 3b8fbdb6429..ead501763e7 100644 --- a/pkgs/tools/text/miller/default.nix +++ b/pkgs/tools/text/miller/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "miller"; - version = "5.7.0"; + version = "5.8.0"; src = fetchFromGitHub { owner = "johnkerl"; repo = "miller"; rev = "v${version}"; - sha256 = "1lmin69rf9lp3b64ga7li4sz7mm0gqapsbk1nb29l4fqjxk16ddh"; + sha256 = "06y1l730xps196jbnxahmd5alc9ba5m8hakm9sc8hx1q5b9ylfih"; }; nativeBuildInputs = [ autoreconfHook flex libtool ]; From de127352c43d6a947a0b500ecb60c3e1705626dd Mon Sep 17 00:00:00 2001 From: Yan Su Date: Tue, 11 Aug 2020 16:57:40 +0900 Subject: [PATCH 029/124] zulu8: 8.28.0.1 -> 8.48.0.53 --- pkgs/development/compilers/zulu/8.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index e48fee0a6a5..cb8eb0b8f26 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -4,11 +4,11 @@ , swingSupport ? true }: let - version = "8.28.0.1"; - openjdk = "8.0.163"; + version = "8.48.0.53"; + openjdk = "8.0.265"; - sha256_linux = "1z8s3a948nvv92wybnhkyr27ipibcy45k0zv5h5gp37ynd91df45"; - sha256_darwin = "0i0prjijsgg0yyycplpp9rlfl428126rqz7bb31pchrhi6jhk699"; + sha256_linux = "ed32513524b32a83b3b388831c69d1884df5675bd5069c6d1485fd1a060be209"; + sha256_darwin = "36f189bfbd0255195848835819377474ba9c1c868e3c204633c451c96e21f30a"; platform = if stdenv.isDarwin then "macosx" else "linux"; hash = if stdenv.isDarwin then sha256_darwin else sha256_linux; @@ -29,7 +29,7 @@ in stdenv.mkDerivation { pname = "zulu"; src = fetchurl { - url = "https://cdn.azul.com/zulu/bin/zulu${version}-jdk${openjdk}-${platform}_x64.${extension}"; + url = "https://cdn.azul.com/zulu/bin/zulu${version}-ca-jdk${openjdk}-${platform}_x64.${extension}"; sha256 = hash; }; From d7d22f544330b233316b756c5033d104318e4498 Mon Sep 17 00:00:00 2001 From: Yan Su Date: Tue, 11 Aug 2020 16:57:55 +0900 Subject: [PATCH 030/124] zulu: 10.1+11 -> 11.41.23 --- pkgs/development/compilers/zulu/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index bfaa4c777b3..d91581f5b10 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -4,11 +4,11 @@ , swingSupport ? true }: let - version = "10.1+11"; - openjdk = "10"; + version = "11.41.23"; + openjdk = "11.0.8"; - sha256_linux = "0g51n2zc7inal29n5ly3mrrfj15c7vl87zb6b2r1q67n4mnbrgm8"; - sha256_darwin = "1c5ib136nv6gz7ij31mg15nhzrl6zr7kp8spm17zwm1ib82bc73y"; + sha256_linux = "f8aee4ab30ca11ab3c8f401477df0e455a9d6b06f2710b2d1b1ddcf06067bc79"; + sha256_darwin = "643c6648cc4374f39e830e4fcb3d68f8667893d487c07eb7091df65937025cc3"; platform = if stdenv.isDarwin then "macosx" else "linux"; hash = if stdenv.isDarwin then sha256_darwin else sha256_linux; @@ -29,7 +29,7 @@ in stdenv.mkDerivation { pname = "zulu"; src = fetchurl { - url = "https://cdn.azul.com/zulu/bin/zulu${version}-jdk${openjdk}-${platform}_x64.${extension}"; + url = "https://cdn.azul.com/zulu/bin/zulu${version}-ca-jdk${openjdk}-${platform}_x64.${extension}"; sha256 = hash; }; From ec33716f1cb9fea0be86da05ea6e46b9b463f9ed Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Aug 2020 09:56:31 +0000 Subject: [PATCH 031/124] oxipng: 3.0.0 -> 3.0.1 --- pkgs/tools/graphics/oxipng/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index 4135eb966a3..00a18cbbac4 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - version = "3.0.0"; + version = "3.0.1"; pname = "oxipng"; src = fetchFromGitHub { owner = "shssoichiro"; repo = pname; rev = "v${version}"; - sha256 = "1k6q5xdfbw4vv4mvms32fhih7k1gpjj98nzrd171ig1vv3gpwwpg"; + sha256 = "11lncwxksm7aqczy9ay1qnba2wmgfsirhgrl6vv1jlgj41b7mzi5"; }; - cargoSha256 = "19h3fwc5s2yblah5lnsm0f4m618p2bkdz2qz47kfi6jdvk89j8z7"; + cargoSha256 = "0lalb981qzlnmqfg170mh6lnc0qlzb94wc39mf859g2jvxk3pkrl"; # https://crates.io/crates/cloudflare-zlib#arm-vs-nightly-rust cargoBuildFlags = [ "--features=cloudflare-zlib/arm-always" ]; From 66c94fc335c8fce2a1ce917b8ecfa607ff47c835 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Aug 2020 10:17:28 +0000 Subject: [PATCH 032/124] pdf2djvu: 0.9.17 -> 0.9.17.1 --- pkgs/tools/typesetting/pdf2djvu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index cbd4fa569d1..c3ddb219ab8 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -15,14 +15,14 @@ }: stdenv.mkDerivation rec { - version = "0.9.17"; + version = "0.9.17.1"; pname = "pdf2djvu"; src = fetchFromGitHub { owner = "jwilk"; repo = "pdf2djvu"; rev = version; - sha256 = "1iff5ha5ls9hni9ivj05r1vzbnjrb326ivjb8d05q2sfng3gfp3z"; + sha256 = "1igabfy3fd7qndihmkfk9incc15pjxpxh2cn5pfw5fxfwrpjrarn"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 7ff3f222b655ad9fe7a8ad8301310bdcad6b21cb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Aug 2020 10:42:32 +0000 Subject: [PATCH 033/124] playerctl: 2.1.1 -> 2.2.1 --- pkgs/tools/audio/playerctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix index 6d7d92808c1..c1cddf12b65 100644 --- a/pkgs/tools/audio/playerctl/default.nix +++ b/pkgs/tools/audio/playerctl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "playerctl"; - version = "2.1.1"; + version = "2.2.1"; src = fetchFromGitHub { owner = "acrisci"; repo = "playerctl"; rev = "v${version}"; - sha256 = "03f3645ssqf8dpkyzj9rlglrzh0840sflalskx9s4i03bgq3v4r9"; + sha256 = "17hi33sw3663qz5v54bqqil31sgkrlxkb2l5bgqk87pac6x2wnbz"; }; nativeBuildInputs = [ meson ninja pkgconfig gtk-doc docbook_xsl gobject-introspection ]; From 6d8cd1e3edbc428eddcbac4cc4e0a1d5be6f2ad5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Aug 2020 13:31:36 +0000 Subject: [PATCH 034/124] seasocks: 1.4.3 -> 1.4.4 --- pkgs/development/libraries/seasocks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/seasocks/default.nix b/pkgs/development/libraries/seasocks/default.nix index 144eb56c955..241046b09fe 100644 --- a/pkgs/development/libraries/seasocks/default.nix +++ b/pkgs/development/libraries/seasocks/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "seasocks"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "mattgodbolt"; repo = pname; rev = "v${version}"; - sha256 = "1c2gc0k9wgbgn7y7wmq2ylp0gvdbmagc1x8c4jwbsncl1gy6x4g2"; + sha256 = "1f9a3mx3yjmr5qry4rc1c7mrx3348iifxm7d8sj8yd41kqnzmfv4"; }; nativeBuildInputs = [ cmake ]; From d646ad6b7d57c8dea281afe78df7869caef4288c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Aug 2020 13:50:25 +0000 Subject: [PATCH 035/124] sensu-go-agent: 5.21.0 -> 5.21.1 --- pkgs/servers/monitoring/sensu-go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index 159f059c7b6..6a4e835a7cb 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -4,7 +4,7 @@ let generic = { subPackages, pname, postInstall ? "" }: buildGoModule rec { inherit pname; - version = "5.21.0"; + version = "5.21.1"; shortRev = "3a1ac58"; # for internal version info goPackagePath = "github.com/sensu/sensu-go"; @@ -13,7 +13,7 @@ let owner = "sensu"; repo = "sensu-go"; rev = "v${version}"; - sha256 = "0zkwhr2z8yy8k2lal026i565hxxh51jrgplq83bbisc24xpcfg9s"; + sha256 = "1vgb25d546dh5sassclym077vmvvl1wj4ndd2084ngvify7dp1a9"; }; inherit subPackages postInstall; From 4e89f3fd56e91eb21c7e5b14baba30da32092145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Tue, 11 Aug 2020 15:52:55 +0200 Subject: [PATCH 036/124] maintainers: add samuelgrf --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index da4065bd95c..acc9f6e054a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7218,6 +7218,16 @@ githubId = 132835; name = "Samuel Dionne-Riel"; }; + samuelgrf = { + email = "git@samuelgrf.com"; + github = "samuelgrf"; + githubId = 67663538; + name = "Samuel Gräfenstein"; + keys = [{ + longkeyid = "rsa4096/0xEF76A063F15C63C8"; + fingerprint = "FF24 5832 8FAF 4660 18C6 186E EF76 A063 F15C 63C8"; + }]; + }; samuelrivas = { email = "samuelrivas@gmail.com"; github = "samuelrivas"; From 92c96865175abaf859253068ef178607e3d216d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Tue, 11 Aug 2020 15:55:23 +0200 Subject: [PATCH 037/124] rtl8821ce: add samuelgrf to maintainers --- pkgs/os-specific/linux/rtl8821ce/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index 795671c256c..ae6586262a5 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tomaspinho/rtl8821ce"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.hhm ]; + maintainers = with maintainers; [ hhm samuelgrf ]; }; } From 1340179083065caf67b2ffbc6e6bb25429aa8ad3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Aug 2020 14:07:45 +0000 Subject: [PATCH 038/124] simplenote: 1.20.0 -> 1.21.0 --- pkgs/applications/misc/simplenote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 52aa215987b..6c66987ddb5 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -16,10 +16,10 @@ let pname = "simplenote"; - version = "1.20.0"; + version = "1.21.0"; sha256 = { - x86_64-linux = "0fzv8nbac5bnxvm2p7p4jsjvfrzk3h9j57zjmwvsi2dq6l80d2n7"; + x86_64-linux = "073dg4agqgimsgs3ia7g0pjv4vxkh24bj7vpmssiysdxhm4li1j1"; }.${system} or throwSystem; meta = with stdenv.lib; { From cf0c098e35a96dbee00da09194489126ec9db4fa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Aug 2020 14:29:58 +0000 Subject: [PATCH 039/124] spdx-license-list-data: 3.9 -> 3.10 --- pkgs/data/misc/spdx-license-list-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/spdx-license-list-data/default.nix b/pkgs/data/misc/spdx-license-list-data/default.nix index 20931c8ad24..6d2c58afdb2 100644 --- a/pkgs/data/misc/spdx-license-list-data/default.nix +++ b/pkgs/data/misc/spdx-license-list-data/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spdx-license-list-data"; - version = "3.9"; + version = "3.10"; src = fetchFromGitHub { owner = "spdx"; repo = "license-list-data"; rev = "v${version}"; - sha256 = "0qf0g7a3jby8sngdjdic30xrb6ch56d6gzpphs8lkm6giir142rj"; + sha256 = "1zza0jrs82112dcjqgkyck2b7hv4kg9s10pmlripi6c1rs37av14"; }; phases = [ "unpackPhase" "installPhase" ]; From 3d14fe86b909eeef771c05c46feb10cc95df3f31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 11 Aug 2020 16:40:56 +0200 Subject: [PATCH 040/124] broot: add danieldk as maintainer, remove magnetophon Suggested by @magnetophon in https://github.com/NixOS/nixpkgs/pull/95029#issuecomment-671440980 --- pkgs/tools/misc/broot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 46b8a754ea3..bafe507a37c 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "An interactive tree view, a fuzzy search, a balanced BFS descent and customizable commands"; homepage = "https://dystroy.org/broot/"; - maintainers = with maintainers; [ magnetophon ]; + maintainers = with maintainers; [ danieldk ]; license = with licenses; [ mit ]; platforms = platforms.all; }; From 998d0764f9d9e10513e55dbc16408c9dfd81eb1b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Aug 2020 15:00:13 +0000 Subject: [PATCH 041/124] tailscale: 1.0.0 -> 1.0.3 --- pkgs/servers/tailscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index db43977e3a2..e256fe7f5a6 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.0.0"; + version = "1.0.3"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "0lxffm4z4qx6psfcxjanlxsrf6iqmkbn19b1pm5ikphqr33y8qqh"; + sha256 = "1m3cfq4qyg2l0hpk8s7nr8cw2j7akiga7x8bwyhdjifnkwsyz6x7"; }; nativeBuildInputs = [ makeWrapper ]; From 343fee2ee254409fedd049082000fd2e964b0c56 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Aug 2020 15:11:29 +0000 Subject: [PATCH 042/124] telegraf: 1.15.1 -> 1.15.2 --- pkgs/servers/monitoring/telegraf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 8a37daa9e88..35002362757 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.15.1"; + version = "1.15.2"; goPackagePath = "github.com/influxdata/telegraf"; @@ -14,7 +14,7 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "0chi1ip7h7vplsyjvsfm9zbxjfdmgk17r16j70i9492dwln9frhj"; + sha256 = "045wjpq29dr0s48ns3a4p8pw1j0ssfcw6m91iim4pkrppj7bm2di"; }; runVend = true; From 13c788cd0be355c06cb2da72f1dcc10d726c4c19 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Aug 2020 15:31:57 +0000 Subject: [PATCH 043/124] tiled: 1.4.1 -> 1.4.2 --- pkgs/applications/editors/tiled/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 20e1427ddef..4b032d48ebf 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "tiled"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "bjorn"; repo = pname; rev = "v${version}"; - sha256 = "1x8jymmc56di1c1wxalsp6qhcban2hahn70ndd097b8mx52gckjr"; + sha256 = "0b3xjcc86vs9lfxr7xann9d43dz3v3x1g7j1mcn31sy2n68a1wx3"; }; nativeBuildInputs = [ pkgconfig qmake ]; From 4c3810f705dbe151faf8864bfd5334682b6c8c0e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Aug 2020 15:50:36 +0000 Subject: [PATCH 044/124] topgrade: 5.3.0 -> 5.4.0 --- pkgs/tools/misc/topgrade/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index e527194148e..04cfd4ebb1f 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "5.3.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "1rksd6bbnxaq8rfr5kabcl6xr6paqs0zg57xvn3vzpnnf41g1m3v"; + sha256 = "1v57dqkrh67cmj1ish650z8yk737hm1qynqr5yv0vlna86gwhrhs"; }; - cargoSha256 = "190sbp8j265iyxvl3rqs5q4wp6wk5c82f2yb46yhdmlm410zck47"; + cargoSha256 = "00vxrv8lbdwwbdbaqb4rq0w3bc8n9qwk9zgb1j656lyswib7g1d3"; buildInputs = lib.optional stdenv.isDarwin Foundation; From adb03222bf3c9eebc061f8918f7c3245cd7806ae Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 11 Aug 2020 18:24:05 +0200 Subject: [PATCH 045/124] openttd: 1.10.2 -> 1.10.3 --- pkgs/games/openttd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 223f0a6ae8c..bab4e510e7d 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { pname = "openttd"; - version = "1.10.2"; + version = "1.10.3"; src = fetchurl { url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; - sha256 = "1xdn9rr858nq22a13cpbhcw74bwygf7lw95kvx3wn4zvb795b74k"; + sha256 = "0fxmfz1mm95a2x0rnzfff9wb8q57w0cvsdd0z7agdcbyakph25n1"; }; nativeBuildInputs = [ pkgconfig which makeWrapper ]; From 9d9f4343ee38874cc8179aa791bc77a608935d00 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 11 Aug 2020 12:44:34 -0400 Subject: [PATCH 046/124] linux: 4.19.138 -> 4.19.139 --- 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 c05b621ff9f..ff3699a5cba 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.138"; + version = "4.19.139"; # 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 = "00jy3lxzx95smgc0mq7741byaj17jxrcqc2vnxlp4lkcbz82fp6i"; + sha256 = "01anspwh3vskmcqf4xclx0jx6h0h33zfgmmvrzxq17wlzqhvyklw"; }; } // (args.argsOverride or {})) From ead39a3c710e9430b80295a5ef703fc0aaa518a1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 11 Aug 2020 12:44:45 -0400 Subject: [PATCH 047/124] linux: 5.4.57 -> 5.4.58 --- 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 0ad7f8eeafd..c6fec5fcdbd 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.57"; + version = "5.4.58"; # 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 = "1fhprnkc7066iz6zxhskqarjmvwcan2jpfp00hd1q7rw2sw1n398"; + sha256 = "0iqnn98hj3lq1avlrbjv9qdyfwffv01vd0a465xkhxck26py4bvh"; }; } // (args.argsOverride or {})) From a0e116f84125538f3a1fdaf13ea5ef04c25e3e5a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 11 Aug 2020 12:46:13 -0400 Subject: [PATCH 048/124] linux: 5.7.14 -> 5.7.15 --- pkgs/os-specific/linux/kernel/linux-5.7.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.7.nix b/pkgs/os-specific/linux/kernel/linux-5.7.nix index 9b14c0a6bc4..db137f0dc45 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.7.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.7.14"; + version = "5.7.15"; # 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 = "0irgfw50fvlbgvn33as75chn2qilmpalbmhi9k8a9ckh6rwdz6hq"; + sha256 = "04jj7vmwd1fjpfnwrhnc92qnskj7i150dyxvilfmkg3ki521gsqf"; }; } // (args.argsOverride or {})) From 669f0d3f369653b02eef608a311e7e7f19d15f5e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 11 Aug 2020 11:51:24 -0500 Subject: [PATCH 049/124] emacs-macport: 26.3-7.7 -> 27.1-8.0 --- pkgs/applications/editors/emacs/macport.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index 1624e62026a..3a573504c41 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -5,20 +5,20 @@ stdenv.mkDerivation rec { pname = "emacs"; - version = "26.3"; + version = "27.1"; emacsName = "emacs-${version}"; - macportVersion = "7.7"; + macportVersion = "8.0"; name = "emacs-mac-${version}-${macportVersion}"; src = fetchurl { url = "mirror://gnu/emacs/${emacsName}.tar.xz"; - sha256 = "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d"; + sha256 = "0h9f2wpmp6rb5rfwvqwv1ia1nw86h74p7hnz3vb3gjazj67i4k2a"; }; macportSrc = fetchurl { url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz"; - sha256 = "18jadknm47ymbl7skrgc7y8xsdldcbgnlfl7qpgzm1ym8d92as6j"; + sha256 = "0rjk82k9qp1g701pfd4f0q2myzvsnp9q8xzphlxwi5yzwbs91kjq"; }; hiresSrc = fetchurl { @@ -76,7 +76,16 @@ stdenv.mkDerivation rec { cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el ''; - doCheck = true; + # fails with: + + # Ran 3870 tests, 3759 results as expected, 6 unexpected, 105 skipped + # 5 files contained unexpected results: + # lisp/url/url-handlers-test.log + # lisp/simple-tests.log + # lisp/files-x-tests.log + # lisp/cedet/srecode-utest-template.log + # lisp/net/tramp-tests.log + doCheck = false; meta = with stdenv.lib; { description = "The extensible, customizable text editor"; From a75097d2c1477a33c7058d603836fbc2bb99fa9b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 11 Aug 2020 17:50:47 +0200 Subject: [PATCH 050/124] ansible_2_9: 2.9.11 -> 2.9.12 --- pkgs/tools/admin/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 2faecef69cf..4783e98204d 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -7,11 +7,11 @@ rec { ansible_2_8 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { pname = "ansible"; - version = "2.8.13"; + version = "2.8.14"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "09a0wa5l2vyy8n2hwvq9ikc77a9xm9k19rnkvcnnkbqwv1fl36zb"; + sha256 = "19ga0c9qs2b216qjg5k2yknz8ksjn8qskicqspg2d4b8x2nr1294"; }; })); From 9e6ee275975d1a8169f7bf6c2e3a46608c033d78 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 11 Aug 2020 17:51:22 +0200 Subject: [PATCH 051/124] ansible_2_8: 2.8.13 -> 2.8.14 --- pkgs/development/python-modules/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 79723c866d8..245375c26be 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.9.11"; + version = "2.9.12"; src = fetchFromGitHub { owner = "ansible"; repo = "ansible"; rev = "v${version}"; - sha256 = "0a9wgd1ri1av6rcwld36sa48v42003pdf1fx9hhkmhz4icyij0kx"; + sha256 = "0c794k0cyl54807sh9in0l942ah6g6wlz5kf3qvy5lhd581zlgyb"; }; prePatch = '' From 2a4e97910edc8b57270a10d04bcd957f93eab4c6 Mon Sep 17 00:00:00 2001 From: Rodrigo Castro Date: Tue, 11 Aug 2020 14:37:17 -0300 Subject: [PATCH 052/124] gitkraken: 7.1.0 -> 7.2.0 --- pkgs/applications/version-management/gitkraken/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 8fe04735657..6457ac3af0d 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "7.1.0"; + version = "7.2.0"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "1g7i7sq705x5jkp76z4car9na3qvklpi3a766yiv4h79kc5via48"; + sha256 = "0nrrcwikx6dx1j1s0b80gh1s932zvxmijpddqp6a1vh3ddc5v1mp"; }; dontBuild = true; From c7dc946de1623a09a949f69e7be75baa95902ad4 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 11 Aug 2020 14:18:18 -0400 Subject: [PATCH 053/124] olifant: 0.2.1-beta5 -> 0.2.1-beta6 https://github.com/cleac/olifant/releases/tag/0.2.1-beta6 --- pkgs/applications/misc/olifant/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/olifant/default.nix b/pkgs/applications/misc/olifant/default.nix index 4358de03b5b..21091b2583a 100644 --- a/pkgs/applications/misc/olifant/default.nix +++ b/pkgs/applications/misc/olifant/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "olifant"; - version = "0.2.1-beta5"; + version = "0.2.1-beta6"; src = fetchFromGitHub { owner = "cleac"; repo = pname; rev = version; - sha256 = "1fpyg3nii75vmsdhp8x4yvhi3npvp3xnbqmd0qcidn05mbsam68r"; + sha256 = "sha256-3hnEa4Q1dH0R8Jp+Ew0+dH1PEm3F+56jYwqhJ+vll4M="; }; nativeBuildInputs = [ From 2a1febbf782a76335683ef4415ce2da5f6ed5a19 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 11 Aug 2020 20:41:05 +0200 Subject: [PATCH 054/124] python: pytzdata: 2019.3 -> 2020.1 --- pkgs/development/python-modules/pytzdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytzdata/default.nix b/pkgs/development/python-modules/pytzdata/default.nix index a4df0bd71e6..5adcbd0d236 100644 --- a/pkgs/development/python-modules/pytzdata/default.nix +++ b/pkgs/development/python-modules/pytzdata/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytzdata"; - version = "2019.3"; + version = "2020.1"; src = fetchPypi { inherit pname version; - sha256 = "fac06f7cdfa903188dc4848c655e4adaee67ee0f2fe08e7daf815cf2a761ee5e"; + sha256 = "3efa13b335a00a8de1d345ae41ec78dd11c9f8807f522d39850f2dd828681540"; }; # No tests From 9c50cabc652d14fd3f0234e2ab44fd558acdade7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 11 Aug 2020 20:41:35 +0200 Subject: [PATCH 055/124] python.pkgs.poetry-core: init at 1.0.0a9 --- .../python-modules/poetry-core/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/poetry-core/default.nix diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix new file mode 100644 index 00000000000..3507d2cfb79 --- /dev/null +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -0,0 +1,22 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "poetry-core"; + version = "1.0.0a9"; + + src = fetchPypi { + inherit pname version; + sha256 = "f08e9829fd06609ca5615faa91739b589eb71e025a6aaf7ddffb698676eb7c8c"; + }; + + doCheck = false; # No tests in sdist. + + meta = { + description = "Core utilities for Poetry"; + homepage = "https://github.com/python-poetry/core"; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dc4f1b96882..08ef76a0246 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1142,6 +1142,8 @@ in { poetry = callPackage ../development/python-modules/poetry { }; + poetry-core = callPackage ../development/python-modules/poetry-core { }; + polyline = callPackage ../development/python-modules/polyline { }; postorius = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/postorius.nix { }); From d58b4c9a14b97312defa629187cc8791c8d73c46 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 11 Aug 2020 20:41:52 +0200 Subject: [PATCH 056/124] python.pkgs.pendulum: fix build --- pkgs/development/python-modules/pendulum/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix index c658928b431..0b57205d6ac 100644 --- a/pkgs/development/python-modules/pendulum/default.nix +++ b/pkgs/development/python-modules/pendulum/default.nix @@ -1,10 +1,18 @@ { lib, fetchPypi, buildPythonPackage, pythonOlder -, dateutil, pytzdata, typing }: +, dateutil, pytzdata, typing +, poetry-core +}: buildPythonPackage rec { pname = "pendulum"; version = "2.1.2"; + format = "pyproject"; + + nativeBuildInputs = [ + poetry-core + ]; + src = fetchPypi { inherit pname version; sha256 = "b06a0ca1bfe41c990bbf0c029f0b6501a7f2ec4e38bfec730712015e8860f207"; From 20d25c3a8e6909a43a614f7b8733e574c8dd7b4d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 11 Aug 2020 12:00:24 -0700 Subject: [PATCH 057/124] python3Packages.poetry-core: build from source --- .../python-modules/poetry-core/default.nix | 63 +++++++++++++++---- 1 file changed, 52 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index 3507d2cfb79..fb4ff8b2d8a 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -1,22 +1,63 @@ -{ lib -, buildPythonPackage -, fetchPypi +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 +, importlib-metadata +, intreehooks +, isort +, pathlib2 +, pep517 +, pytest-mock +, pytestCheckHook +, tomlkit +, typing +, virtualenv }: buildPythonPackage rec { pname = "poetry-core"; version = "1.0.0a9"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "f08e9829fd06609ca5615faa91739b589eb71e025a6aaf7ddffb698676eb7c8c"; + src = fetchFromGitHub { + owner = "python-poetry"; + repo = pname; + rev = version; + sha256 = "1ln47x1bc1yvhdfwfnkqx4d2j7988a59v8vmcriw14whfgzfki75"; }; - doCheck = false; # No tests in sdist. + # avoid mass-rebuild of python packages + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "^1.7.0" "^1.6.0" + ''; - meta = { + nativeBuildInputs = [ + intreehooks + ]; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ] ++ lib.optionals isPy27 [ + pathlib2 + typing + ]; + + checkInputs = [ + isort + pep517 + pytest-mock + pytestCheckHook + tomlkit + virtualenv + ]; + + # requires git history to work correctly + disabledTests = [ "default_with_excluded_data" ]; + + pythonImportsCheck = [ "poetry.core" ]; + + meta = with lib; { description = "Core utilities for Poetry"; - homepage = "https://github.com/python-poetry/core"; - license = lib.licenses.mit; + homepage = "https://github.com/python-poetry/poetry-core/"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; }; -} \ No newline at end of file +} From fe8f927a6a36c40861c15ec2f08c5788b63ca508 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 11 Aug 2020 12:13:58 -0700 Subject: [PATCH 058/124] python37Packages.pendulum: fix build add tests --- .../python-modules/pendulum/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix index 0b57205d6ac..5688090b095 100644 --- a/pkgs/development/python-modules/pendulum/default.nix +++ b/pkgs/development/python-modules/pendulum/default.nix @@ -1,24 +1,30 @@ { lib, fetchPypi, buildPythonPackage, pythonOlder -, dateutil, pytzdata, typing +, dateutil +, importlib-metadata +, poetry , poetry-core +, pytzdata +, typing }: buildPythonPackage rec { pname = "pendulum"; version = "2.1.2"; - format = "pyproject"; - nativeBuildInputs = [ - poetry-core - ]; - src = fetchPypi { inherit pname version; sha256 = "b06a0ca1bfe41c990bbf0c029f0b6501a7f2ec4e38bfec730712015e8860f207"; }; - propagatedBuildInputs = [ dateutil pytzdata ] ++ lib.optional (pythonOlder "3.5") typing; + preBuild = '' + export HOME=$TMPDIR + ''; + + nativeBuildInputs = [ poetry-core ]; + propagatedBuildInputs = [ dateutil pytzdata ] + ++ lib.optional (pythonOlder "3.5") typing + ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; # No tests doCheck = false; From 25c5de7a31be40e5a3cb8e28e38a71d1e5b1c00a Mon Sep 17 00:00:00 2001 From: ZerataX Date: Tue, 11 Aug 2020 21:43:13 +0200 Subject: [PATCH 059/124] maintainers: add zeratax --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index acc9f6e054a..4660b7a1cad 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9113,6 +9113,16 @@ email = "zef@zef.me"; name = "Zef Hemel"; }; + zeratax = { + email = "mail@zera.tax"; + github = "ZerataX"; + githubId = 5024958; + name = "Jona Abdinghoff"; + keys = [{ + longkeyid = "rsa4096/0x8333735E784DF9D4"; + fingerprint = "44F7 B797 9D3A 27B1 89E0 841E 8333 735E 784D F9D4"; + }]; + }; zfnmxt = { name = "zfnmxt"; email = "zfnmxt@zfnmxt.com"; From ec01cdc0bd5e8a3ab6ab2b7ac50ff0f5352bf8c4 Mon Sep 17 00:00:00 2001 From: ZerataX Date: Tue, 11 Aug 2020 21:43:46 +0200 Subject: [PATCH 060/124] vscode-extensions.xaver.clang-format init at 1.9.0 --- pkgs/misc/vscode-extensions/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index cb145ade054..430fe0852fb 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -190,6 +190,19 @@ in }; }; + xaver.clang-format = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "clang-format"; + publisher = "xaver"; + version = "1.9.0"; + sha256 = "abd0ef9176eff864f278c548c944032b8f4d8ec97d9ac6e7383d60c92e258c2f"; + }; + meta = with stdenv.lib; { + license = licenses.mit; + maintainers = [ maintainers.zeratax ]; + }; + }; + llvm-org.lldb-vscode = llvmPackages_8.lldb; WakaTime.vscode-wakatime = callPackage ./wakatime {}; From 6b188c1f08a3d970ed77040549ba242cf6aa8a92 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 11 Aug 2020 22:37:24 +0200 Subject: [PATCH 061/124] wlroots: Fix the build by not copying the library to $examples Copying libwlroots isn't required anymore since the library runpath of the example binaries now correctly references $out/lib anyway. Fix #95205. --- pkgs/development/libraries/wlroots/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 46a1fc45d81..67faad8cd74 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -28,12 +28,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dlogind-provider=systemd" ]; - postInstall = '' - # Copy the library to $examples - mkdir -p $examples/lib - cp -P libwlroots* $examples/lib/ - ''; - postFixup = '' # Install ALL example programs to $examples: # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle From de96815a2e527ac9767a5524afa50da5e3fe4224 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 11 Aug 2020 22:49:10 +0200 Subject: [PATCH 062/124] evcxr: 0.5.2 -> 0.5.3 https://github.com/google/evcxr/blob/v0.5.3/RELEASE_NOTES.md --- pkgs/development/interpreters/evcxr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 5e67103b1bd..8eae3421562 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; rev = "v${version}"; - sha256 = "09xziv2vmjd30yy095l3n33v9vdkbbkyjdcc5azyd76m2fk9vi42"; + sha256 = "144xqi19d2nj9qgmhpx6d1kfhx9vfkmk7rnq6nzybpx4mbbl3ki2"; }; - cargoSha256 = "1cdj5qh3z4bnz2267s83chw6n1kg9zl1hrawkis5rr9vq7llrb24"; + cargoSha256 = "07lzxh0wh6azrlzfaacg29zmkn8jdnkdqbwgd5ajy79y8nii3c7z"; nativeBuildInputs = [ pkgconfig makeWrapper cmake ]; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; From 4c3b64adf417859edfbce599eee15d335167b2a8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 11 Aug 2020 22:53:35 +0200 Subject: [PATCH 063/124] python3Packages.pytesseract: 0.3.4 -> 0.3.5 https://github.com/madmaze/pytesseract/releases/tag/v0.3.5 --- pkgs/development/python-modules/pytesseract/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index 0111695ca73..efb20ac2973 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytesseract"; - version = "0.3.4"; + version = "0.3.5"; src = fetchPypi { inherit pname version; - sha256 = "16l9b9f5v0a9j5jfgpd8irk9yhc9byzirrzv1rlkapdbz36sbn5g"; + sha256 = "1xb5ydwgcfcxzs1k7g6frmhxf1mmivi9ay48qdmf5w4ascirm22l"; }; patches = [ From 1e3d56ec16180bec4cac355bb25aaba56af3a9e1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 29 Jun 2020 16:13:55 +0000 Subject: [PATCH 064/124] qemu-utils: install man pages --- pkgs/applications/virtualization/qemu/utils.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/qemu/utils.nix b/pkgs/applications/virtualization/qemu/utils.nix index 436716e0a8c..90783039a1a 100644 --- a/pkgs/applications/virtualization/qemu/utils.nix +++ b/pkgs/applications/virtualization/qemu/utils.nix @@ -1,9 +1,10 @@ -{ stdenv, qemu }: +{ stdenv, installShellFiles, qemu }: stdenv.mkDerivation rec { name = "qemu-utils-${version}"; version = qemu.version; + nativeBuildInputs = [ installShellFiles ]; buildInputs = [ qemu ]; unpackPhase = "true"; @@ -12,6 +13,9 @@ stdenv.mkDerivation rec { cp "${qemu}/bin/qemu-img" "$out/bin/qemu-img" cp "${qemu}/bin/qemu-io" "$out/bin/qemu-io" cp "${qemu}/bin/qemu-nbd" "$out/bin/qemu-nbd" + + installManPage ${qemu}/share/man/man1/qemu-img.1.gz + installManPage ${qemu}/share/man/man8/qemu-nbd.8.gz ''; inherit (qemu) meta; From ba7c0893d4fcbe2b8fd449064a7bf7ec36553385 Mon Sep 17 00:00:00 2001 From: Timothy Stott Date: Tue, 11 Aug 2020 22:04:55 +0100 Subject: [PATCH 065/124] treewide: remove obsolete attribute goPackagePath in buildGoModule derivations (#95092) The buildGoModule infrastructure does not make use of goPackagePath it is a residue from buildGoPackage. --- .../networking/cluster/kube3d/default.nix | 1 - .../instant-messengers/gomuks/default.nix | 2 -- .../git-and-tools/git-bug/default.nix | 7 +++---- .../version-management/sourcehut/builds.nix | 5 ++--- .../version-management/sourcehut/git.nix | 20 ++++++++----------- .../drone-cli/default.nix | 1 - .../continuous-integration/drone/default.nix | 1 - pkgs/development/tools/godef/default.nix | 1 - .../tools/gomodifytags/default.nix | 2 -- pkgs/development/tools/gopkgs/default.nix | 2 -- pkgs/development/tools/gosec/default.nix | 2 -- pkgs/development/tools/hcloud/default.nix | 2 -- pkgs/development/tools/kind/default.nix | 1 - pkgs/development/tools/kubeprompt/default.nix | 3 +-- .../development/tools/misc/mkcert/default.nix | 4 +--- .../tools/misc/nix-build-uncached/default.nix | 1 - pkgs/development/tools/reftools/default.nix | 1 - pkgs/servers/caddy/default.nix | 2 -- pkgs/servers/dns/coredns/default.nix | 2 -- pkgs/servers/hasura/cli.nix | 1 - pkgs/servers/kapow/default.nix | 2 -- pkgs/servers/matterbridge/default.nix | 1 - pkgs/servers/monitoring/sensu-go/default.nix | 2 -- pkgs/servers/monitoring/telegraf/default.nix | 2 -- pkgs/servers/tailscale/default.nix | 1 - pkgs/shells/zsh/zsh-history/default.nix | 2 -- pkgs/tools/admin/iamy/default.nix | 2 -- pkgs/tools/networking/clash/default.nix | 3 +-- pkgs/tools/networking/oneshot/default.nix | 1 - pkgs/tools/networking/shadowfox/default.nix | 2 -- pkgs/tools/security/age/default.nix | 1 - 31 files changed, 16 insertions(+), 64 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index 5688dcdcd95..decbdbd1fbc 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -5,7 +5,6 @@ buildGoModule rec { version = "3.0.0"; k3sVersion = "1.18.6-k3s1"; - goPackagePath = "github.com/rancher/k3d"; excludedPackages = ''tools''; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 7eab32f6506..8df4e4b3ea3 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -4,8 +4,6 @@ buildGoModule rec { pname = "gomuks"; version = "0.1.2"; - goPackagePath = "maunium.net/go/gomuks"; - src = fetchFromGitHub { owner = "tulir"; repo = pname; diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index fa4c3b2d851..74acf0139d5 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -4,7 +4,6 @@ buildGoModule rec { pname = "git-bug"; version = "0.7.1"; # the `rev` below pins the version of the source to get rev = "2d64b85db71a17ff3277bbbf7ac9d8e81f8e416c"; - goPackagePath = "github.com/MichaelMure/git-bug"; src = fetchFromGitHub { inherit rev; @@ -19,9 +18,9 @@ buildGoModule rec { buildFlagsArray = '' -ldflags= - -X ${goPackagePath}/commands.GitCommit=${rev} - -X ${goPackagePath}/commands.GitLastTag=${version} - -X ${goPackagePath}/commands.GitExactTag=${version} + -X github.com/MichaelMure/git-bug/commands.GitCommit=${rev} + -X github.com/MichaelMure/git-bug/commands.GitLastTag=${version} + -X github.com/MichaelMure/git-bug/commands.GitExactTag=${version} ''; postInstall = '' diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index beec22c41b9..d5a72a70ec6 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -9,11 +9,10 @@ let buildWorker = src: buildGoModule { inherit src version; pname = "builds-sr-ht-worker"; - goPackagePath = "git.sr.ht/~sircmpwn/builds.sr.ht/worker"; - vendorSha256 = "0prdlihcy5yz760llwyby747yy2981dn3gy401a48df7ndlfj6lp"; + vendorSha256 = "0prdlihcy5yz760llwyby747yy2981dn3gy401a48df7ndlfj6lp"; - doCheck = false; + doCheck = false; }; in buildPythonPackage rec { inherit version; diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index cee13448b24..d71568b94fd 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -9,41 +9,37 @@ let buildShell = src: buildGoModule { inherit src version; pname = "gitsrht-shell"; - goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-shell"; - vendorSha256 = "1zvbqn4r940mibn4h1cqz94gbr476scm281ps361n0rfqlimw8g5"; + vendorSha256 = "1zvbqn4r940mibn4h1cqz94gbr476scm281ps361n0rfqlimw8g5"; - doCheck = false; + doCheck = false; }; buildDispatcher = src: buildGoModule { inherit src version; pname = "gitsrht-dispatcher"; - goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-dispatch"; - vendorSha256 = "1lzkf13m54pq0gnn3bcxc80nfg76hgck4l8q8jpaicrsiwgcyrd9"; + vendorSha256 = "1lzkf13m54pq0gnn3bcxc80nfg76hgck4l8q8jpaicrsiwgcyrd9"; - doCheck = false; + doCheck = false; }; buildKeys = src: buildGoModule { inherit src version; pname = "gitsrht-keys"; - goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-keys"; - vendorSha256 = "16j7kpar318s4766pln8xn6d51xqblwig5n1jywhj0sl80qjl5cv"; + vendorSha256 = "16j7kpar318s4766pln8xn6d51xqblwig5n1jywhj0sl80qjl5cv"; - doCheck = false; + doCheck = false; }; buildUpdateHook = src: buildGoModule { inherit src version; pname = "gitsrht-update-hook"; - goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-update-hook"; - vendorSha256 = "1rmv3p60g6w4h4v9wx99jkyx0q02snslyjrjy9n1flardjs01b63"; + vendorSha256 = "1rmv3p60g6w4h4v9wx99jkyx0q02snslyjrjy9n1flardjs01b63"; - doCheck = false; + doCheck = false; }; in buildPythonPackage rec { inherit version; diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix index dc107a04a38..3df406eb560 100644 --- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -5,7 +5,6 @@ in buildGoModule rec { inherit version; pname = "drone-cli"; revision = "v${version}"; - goPackagePath = "github.com/drone/drone-cli"; vendorSha256 = "1ryh94cj37j8x6qwxr5ydyw6cnjppakg1w84sipm11d0vvv98bhi"; diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index c451bc8ecfa..307dda4f993 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -3,7 +3,6 @@ buildGoModule rec { name = "drone.io-${version}"; version = "1.9.0"; - goPackagePath = "github.com/drone/drone"; vendorSha256 = "0idf11sr417lxcjryplgb87affr6lgzxazzlyvk0y40hp8zbhwsx"; diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix index 19dd09b2248..c8149ecc82d 100644 --- a/pkgs/development/tools/godef/default.nix +++ b/pkgs/development/tools/godef/default.nix @@ -5,7 +5,6 @@ buildGoModule rec { version = "1.1.2"; rev = "v${version}"; - goPackagePath = "github.com/rogpeppe/godef"; subPackages = [ "." ]; vendorSha256 = null; diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix index 9bedc0432fd..cf2c5a5b9a6 100644 --- a/pkgs/development/tools/gomodifytags/default.nix +++ b/pkgs/development/tools/gomodifytags/default.nix @@ -8,8 +8,6 @@ buildGoModule rec { doCheck = false; - goPackagePath = "github.com/fatih/gomodifytags"; - src = fetchFromGitHub { owner = "fatih"; repo = "gomodifytags"; diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix index b31111e44eb..d112654ab43 100644 --- a/pkgs/development/tools/gopkgs/default.nix +++ b/pkgs/development/tools/gopkgs/default.nix @@ -4,8 +4,6 @@ buildGoModule rec { pname = "gopkgs"; version = "2.1.2"; - goPackagePath = "github.com/uudashr/gopkgs"; - subPackages = [ "cmd/gopkgs" ]; src = fetchFromGitHub { diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index e7df3f694ce..ffbd98a4577 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -4,8 +4,6 @@ buildGoModule rec { pname = "gosec"; version = "2.4.0"; - goPackagePath = "github.com/securego/gosec"; - subPackages = [ "cmd/gosec" ]; src = fetchFromGitHub { diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index 4fc8a35f6b6..52a407b3878 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -4,8 +4,6 @@ buildGoModule rec { pname = "hcloud"; version = "1.17.0"; - goPackagePath = "github.com/hetznercloud/cli"; - src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index c78dc3faeab..6ea2c87f888 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/pkgs/development/tools/kind/default.nix @@ -17,7 +17,6 @@ buildGoModule rec { doCheck = false; - goPackagePath = "sigs.k8s.io/kind"; subPackages = [ "." ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/kubeprompt/default.nix b/pkgs/development/tools/kubeprompt/default.nix index 34e8fc45d35..f91d95ce508 100644 --- a/pkgs/development/tools/kubeprompt/default.nix +++ b/pkgs/development/tools/kubeprompt/default.nix @@ -15,10 +15,9 @@ buildGoModule rec { export buildFlagsArray+=( "-ldflags= -w -s - -X ${goPackagePath}/pkg/version.Version=${version}") + -X github.com/jlesquembre/kubeprompt/pkg/version.Version=${version}") ''; - goPackagePath = "github.com/jlesquembre/kubeprompt"; vendorSha256 = "089lfkvyf00f05kkmr935jbrddf2c0v7m2356whqnz7ad6a2whsi"; doCheck = false; diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/pkgs/development/tools/misc/mkcert/default.nix index 5319e4608fa..ec4042a2a27 100644 --- a/pkgs/development/tools/misc/mkcert/default.nix +++ b/pkgs/development/tools/misc/mkcert/default.nix @@ -15,10 +15,8 @@ buildGoModule rec { doCheck = false; - goPackagePath = "github.com/FiloSottile/mkcert"; buildFlagsArray = '' - -ldflags= - -X ${goPackagePath}/main.Version=${version} + -ldflags=-X main.Version=v${version} ''; meta = with lib; { diff --git a/pkgs/development/tools/misc/nix-build-uncached/default.nix b/pkgs/development/tools/misc/nix-build-uncached/default.nix index ad46affcd2e..9bff7acc81d 100644 --- a/pkgs/development/tools/misc/nix-build-uncached/default.nix +++ b/pkgs/development/tools/misc/nix-build-uncached/default.nix @@ -11,7 +11,6 @@ buildGoModule rec { sha256 = "106k4234gpi8mr0n0rfsgwk4z7v0b2gim0r5bhjvg2v566j67g02"; }; - goPackagePath = "github.com/Mic92/nix-build-uncached"; vendorSha256 = null; doCheck = false; diff --git a/pkgs/development/tools/reftools/default.nix b/pkgs/development/tools/reftools/default.nix index 74a843c93bc..440d2f96133 100644 --- a/pkgs/development/tools/reftools/default.nix +++ b/pkgs/development/tools/reftools/default.nix @@ -12,7 +12,6 @@ buildGoModule rec { doCheck = false; - goPackagePath = "github.com/davidrjenni/reftools"; excludedPackages = "\\(cmd/fillswitch/test-fixtures\\)"; src = fetchFromGitHub { diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 8c8d49b6659..05b69c30e6c 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -4,8 +4,6 @@ buildGoModule rec { pname = "caddy"; version = "1.0.5"; - goPackagePath = "github.com/caddyserver/caddy"; - subPackages = [ "caddy" ]; src = fetchFromGitHub { diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index f42433caaf7..981056b53c1 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -4,8 +4,6 @@ buildGoModule rec { pname = "coredns"; version = "1.7.0"; - goPackagePath = "github.com/coredns/coredns"; - src = fetchFromGitHub { owner = "coredns"; repo = "coredns"; diff --git a/pkgs/servers/hasura/cli.nix b/pkgs/servers/hasura/cli.nix index d55121d7ede..88b6b418dd9 100644 --- a/pkgs/servers/hasura/cli.nix +++ b/pkgs/servers/hasura/cli.nix @@ -7,7 +7,6 @@ buildGoModule rec { src = hasura-graphql-engine.src; modRoot = "./cli"; - goPackagePath = "github.com/hasura/graphql-engine/cli"; subPackages = [ "cmd/hasura" ]; vendorSha256 = "0a3mlkl00r680v8x3hy24ykggq5qm7k3101krlyfrb5y4karp75a"; diff --git a/pkgs/servers/kapow/default.nix b/pkgs/servers/kapow/default.nix index bba34e5fa9f..520af62576e 100644 --- a/pkgs/servers/kapow/default.nix +++ b/pkgs/servers/kapow/default.nix @@ -4,8 +4,6 @@ buildGoModule rec { pname = "kapow"; version = "0.5.4"; - goPackagePath = "github.com/BBVA/kapow"; - subPackages = [ "." ]; src = fetchFromGitHub { diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index b3ede414918..6bdbe38ff3d 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -4,7 +4,6 @@ buildGoModule rec { pname = "matterbridge"; version = "1.17.5"; - goPackagePath = "github.com/42wim/matterbridge"; vendorSha256 = null; doCheck = false; diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index 159f059c7b6..8660e0b19c1 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -7,8 +7,6 @@ let version = "5.21.0"; shortRev = "3a1ac58"; # for internal version info - goPackagePath = "github.com/sensu/sensu-go"; - src = fetchFromGitHub { owner = "sensu"; repo = "sensu-go"; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 35002362757..722e06ab072 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -4,8 +4,6 @@ buildGoModule rec { pname = "telegraf"; version = "1.15.2"; - goPackagePath = "github.com/influxdata/telegraf"; - excludedPackages = "test"; subPackages = [ "cmd/telegraf" ]; diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index db43977e3a2..a5aa77cd040 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -15,7 +15,6 @@ buildGoModule rec { CGO_ENABLED = 0; - goPackagePath = "tailscale.com"; vendorSha256 = "0l9lzwwvshg9a2kmmq1cvvlaxncbas78a9hjhvjjar89rjr2k2sv"; doCheck = false; diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/shells/zsh/zsh-history/default.nix index 90d70885b7e..3d48467a246 100644 --- a/pkgs/shells/zsh/zsh-history/default.nix +++ b/pkgs/shells/zsh/zsh-history/default.nix @@ -17,8 +17,6 @@ buildGoModule rec { doCheck = false; - goPackagePath = "github.com/b4b4r07/history"; - postInstall = '' install -d $out/share cp -r "$NIX_BUILD_TOP/source/misc/"* "$out/share" diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix index 6b9cf50a269..1a668777e2e 100644 --- a/pkgs/tools/admin/iamy/default.nix +++ b/pkgs/tools/admin/iamy/default.nix @@ -4,8 +4,6 @@ buildGoModule rec { pname = "iamy"; version = "2.3.2"; - goPackagePath = "github.com/99designs/iamy"; - src = fetchFromGitHub { owner = "99designs"; repo = "iamy"; diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index c3647bd4432..a0b10df6e56 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -11,14 +11,13 @@ buildGoModule rec { sha256 = "0qyfv6h6m86m5bwayj0s1pjldnbagy63zc2ygzpnicihmd58khny"; }; - goPackagePath = "github.com/Dreamacro/clash"; vendorSha256 = "0ap6wsx23s4q730s6d5cgc4ginh8zj5sd32k0za49fh50v8k8zbh"; doCheck = false; buildFlagsArray = [ "-ldflags=" - "-X ${goPackagePath}/constant.Version=${version}" + "-X github.com/Dreamacro/clash/constant.Version=${version}" ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/oneshot/default.nix b/pkgs/tools/networking/oneshot/default.nix index 223a3fbdf55..4ce866e9040 100644 --- a/pkgs/tools/networking/oneshot/default.nix +++ b/pkgs/tools/networking/oneshot/default.nix @@ -11,7 +11,6 @@ buildGoModule rec { sha256 = "14s5cl1g0rgqj7fj699xgz2kmkzym1zpckhv3h33ypsn4dq7gjh2"; }; - goPackagePath = "github.com/raphaelreyna/oneshot"; vendorSha256 = "0v53dsj0w959pmvk6v1i7rwlfd2y0vrghxlwkgidw0sf775qpgvy"; doCheck = false; diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index 5a9377579e9..0e1e6b9b42e 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -11,8 +11,6 @@ buildGoModule rec { sha256 = "125mw70jidbp436arhv77201jdp6mpgqa2dzmrpmk55f9bf29sg6"; }; - goPackagePath = "github.com/SrKomodo/shadowfox-updater"; - vendorSha256 = "06ar9ivry9b01609izjbl6hqgg0cy7aqd8n2cqpyq0g7my0l0lbj"; doCheck = false; diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix index 8436972ebc5..8a6d008551e 100644 --- a/pkgs/tools/security/age/default.nix +++ b/pkgs/tools/security/age/default.nix @@ -3,7 +3,6 @@ buildGoModule rec { pname = "age"; version = "1.0.0-beta4"; - goPackagePath = "github.com/FiloSottile/age"; vendorSha256 = "0km7a2826j3fk2nrkmgc990chrkcfz006wfw14yilsa4p2hmfl7m"; doCheck = false; From e4fc19e66e2e9fdcde758750c95e885c714bf16e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 11 Aug 2020 23:20:18 +0200 Subject: [PATCH 066/124] gthree: 0.2.0 -> 0.9.0 --- pkgs/development/libraries/gthree/default.nix | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/gthree/default.nix b/pkgs/development/libraries/gthree/default.nix index 04d7c8d8f4d..2da9847f3cb 100644 --- a/pkgs/development/libraries/gthree/default.nix +++ b/pkgs/development/libraries/gthree/default.nix @@ -3,10 +3,10 @@ , fetchpatch , ninja , meson -, pkgconfig +, pkg-config , gobject-introspection , gtk-doc -, docbook_xsl +, docbook-xsl-nons , docbook_xml_dtd_43 , glib , gtk3 @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "gthree"; - version = "0.2.0"; + version = "0.9.0"; outputs = [ "out" "dev" "devdoc" ]; @@ -25,32 +25,42 @@ stdenv.mkDerivation rec { owner = "alexlarsson"; repo = "gthree"; rev = version; - sha256 = "16ap1ampnzsyhrs84b168d6889lh8sjr2j5sqv9mdbnnhy72p5cd"; + sha256 = "09fcnjc3j21lh5fjf067wm35sb4qni4vgzing61kixnn2shy79iy"; }; + patches = [ + # Add option for disabling examples + (fetchpatch { + url = "https://github.com/alexlarsson/gthree/commit/75f05c40aba9d5f603d8a3c490c3406c1fe06776.patch"; + sha256 = "PBwLz4DLhC+7BtypVTFMFiF3hKAJeskU3XBKFHa3a84="; + }) + ]; + nativeBuildInputs = [ ninja meson - pkgconfig + pkg-config gtk-doc - docbook_xsl + docbook-xsl-nons docbook_xml_dtd_43 gobject-introspection ]; buildInputs = [ epoxy + json-glib ]; propagatedBuildInputs = [ glib gtk3 graphene - json-glib ]; mesonFlags = [ "-Dgtk_doc=${if stdenv.isDarwin then "false" else "true"}" + # Data for examples is useless when the example programs are not installed. + "-Dexamples=false" ]; meta = with stdenv.lib; { From 01ce25515e7f2b49788c31eb8fa5bc5b30a695c9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 11 Aug 2020 23:20:28 +0200 Subject: [PATCH 067/124] =?UTF-8?q?gnome-hexgl:=200.2.0=20=E2=86=92=20unst?= =?UTF-8?q?able-2020-07-24?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 0.2.0 does not build against gthree 0.9.0 --- pkgs/games/gnome-hexgl/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/games/gnome-hexgl/default.nix b/pkgs/games/gnome-hexgl/default.nix index 6212c1bbec1..cfa9a0b81d0 100644 --- a/pkgs/games/gnome-hexgl/default.nix +++ b/pkgs/games/gnome-hexgl/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , ninja , meson -, pkgconfig +, pkg-config , gthree , gsound , epoxy @@ -11,19 +11,19 @@ stdenv.mkDerivation rec { pname = "gnome-hexgl"; - version = "0.2.0"; + version = "unstable-2020-07-24"; src = fetchFromGitHub { owner = "alexlarsson"; repo = "gnome-hexgl"; - rev = version; - sha256 = "08iy2iciscd2wbhh6v4cpghx8r94v1ffbgla9yb3bcsdhlag0iw4"; + rev = "f47a351055a235730795341dcd6b2397cc4bfa0c"; + sha256 = "yZWGymaSUfnCP8VAEdDH64w0muSnRK/XPi1/IqTrE4k="; }; nativeBuildInputs = [ ninja meson - pkgconfig + pkg-config ]; buildInputs = [ From 7e5cea223ca609c1b2d73eac170f7d49844b4b26 Mon Sep 17 00:00:00 2001 From: afreakk Date: Tue, 11 Aug 2020 23:49:24 +0200 Subject: [PATCH 068/124] fpp: bugfix --- pkgs/tools/misc/fpp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/fpp/default.nix b/pkgs/tools/misc/fpp/default.nix index 7f68a14c5aa..b00f2198dbc 100644 --- a/pkgs/tools/misc/fpp/default.nix +++ b/pkgs/tools/misc/fpp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; postPatch = '' - substituteInPlace fpp --replace 'PYTHONCMD="python"' 'PYTHONCMD="${python3.interpreter}"' + substituteInPlace fpp --replace 'PYTHONCMD="python3"' 'PYTHONCMD="${python3.interpreter}"' ''; installPhase = '' From 70d68f04787d0e168723000946368ad110db6476 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 11 Aug 2020 17:46:39 -0400 Subject: [PATCH 069/124] nixos/systemd: Add support for `listenDatagrams` This works exactly analogously to the existing `listenStreams`. --- nixos/modules/system/boot/systemd-unit-options.nix | 10 ++++++++++ nixos/modules/system/boot/systemd.nix | 1 + 2 files changed, 11 insertions(+) diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index c6dbb96951a..ac6fed440a2 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -379,6 +379,16 @@ in rec { ''; }; + listenDatagrams = mkOption { + default = []; + type = types.listOf types.str; + example = [ "0.0.0.0:993" "/run/my-socket" ]; + description = '' + For each item in this list, a ListenDatagram + option in the [Socket] section will be created. + ''; + }; + socketConfig = mkOption { default = {}; example = { ListenStream = "/run/my-socket"; }; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index a5f368c869a..d95f001a225 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -354,6 +354,7 @@ let [Socket] ${attrsToSection def.socketConfig} ${concatStringsSep "\n" (map (s: "ListenStream=${s}") def.listenStreams)} + ${concatStringsSep "\n" (map (s: "ListenDatagram=${s}") def.listenDatagrams)} ''; }; From e6fe9abd8b1b80c9911bc1469eef9cfb0b3f0003 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 11 Aug 2020 17:46:39 -0400 Subject: [PATCH 070/124] nixos/ipfs: Allow QUIC connections to socket activate too Well, via the underlying UDP. QUIC-level socket activation we'll get someday. --- .../services/network-filesystems/ipfs.nix | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 5c096d26d82..f298f831fa7 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -25,6 +25,15 @@ let then "/${lib.concatStringsSep "/" (lib.tail addr)}" else null; # not valid for listen stream, skip + multiaddrToListenDatagram = addrRaw: let + addr = splitMulitaddr addrRaw; + s = builtins.elemAt addr; + in if s 0 == "ip4" && s 2 == "udp" + then "${s 1}:${s 3}" + else if s 0 == "ip6" && s 2 == "udp" + then "[${s 1}]:${s 3}" + else null; # not valid for listen datagram, skip + in { ###### interface @@ -268,9 +277,14 @@ in { systemd.sockets.ipfs-gateway = { wantedBy = [ "sockets.target" ]; - socketConfig.ListenStream = let - fromCfg = multiaddrToListenStream cfg.gatewayAddress; - in [ "" ] ++ lib.optional (fromCfg != null) fromCfg; + socketConfig = { + ListenStream = let + fromCfg = multiaddrToListenStream cfg.gatewayAddress; + in [ "" ] ++ lib.optional (fromCfg != null) fromCfg; + ListenDatagram = let + fromCfg = multiaddrToListenDatagram cfg.gatewayAddress; + in [ "" ] ++ lib.optional (fromCfg != null) fromCfg; + }; }; systemd.sockets.ipfs-api = { From 33f07600fdfc5f35bfea34a2987ad384eef57cde Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 11 Aug 2020 20:20:20 -0500 Subject: [PATCH 071/124] syncthing: 1.7.1 -> 1.8.0 https://github.com/syncthing/syncthing/releases/tag/v1.8.0 --- pkgs/applications/networking/syncthing/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 72a799a8f6c..aec44c1bfd8 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,17 +3,17 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.7.1"; + version = "1.8.0"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "1kb324diaq48z1vf36zlcsy9zckr0c3mrd3bmcdn28z2ivqnsc4a"; + sha256 = "047y2sy9zif19dlh098ihaski9f3b971q3mmqg97qgfzpa8z8fpr"; }; - vendorSha256 = "1gmdv0g0gymq6khrwvplw6yfp146kg5ar8vqdp5dlp0myxfzi22b"; + vendorSha256 = "0l08d96226l135cqbv1qqw0136f5nzw7likc0nmhcm6ynzv83kj2"; doCheck = false; @@ -43,7 +43,7 @@ let }; meta = with lib; { - homepage = "https://www.syncthing.net/"; + homepage = "https://syncthing.net/"; description = "Open Source Continuous File Synchronization"; license = licenses.mpl20; maintainers = with maintainers; [ pshendry joko peterhoeg andrew-d ]; From 00eedc07f346649f5cdfb76944e7c97e5de8c615 Mon Sep 17 00:00:00 2001 From: uosis Date: Tue, 11 Aug 2020 19:32:31 -0600 Subject: [PATCH 072/124] ammonite: 2.0.4 -> 2.2.0 --- pkgs/development/tools/ammonite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 271869bd7c4..8e420f5f462 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -8,7 +8,7 @@ let common = { scalaVersion, sha256 }: stdenv.mkDerivation rec { pname = "ammonite"; - version = "2.0.4"; + version = "2.2.0"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { }; }; in { - ammonite_2_12 = common { scalaVersion = "2.12"; sha256 = "068lcdi1y3zcspr0qmppflad7a4kls9gi321rp8dc5qc6f9nnk04"; }; - ammonite_2_13 = common { scalaVersion = "2.13"; sha256 = "0fa0q9nk00crr2ws2mmw6pp4vf0xy53bqqhnws524ywwg6zwrl9s"; }; + ammonite_2_12 = common { scalaVersion = "2.12"; sha256 = "0nclfqwy3jfn1680z1hd0zzmc0b79wpvx6gn1jnm19aq7qcvh5zp"; }; + ammonite_2_13 = common { scalaVersion = "2.13"; sha256 = "104bnahn382sb6vwjvchsg0jrnkkwjn08rfh0g5ra7lwhgcj2719"; }; } From c5e5ac1cf74b1422c32f502e7c6ab268e64bf533 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 12 Aug 2020 04:20:00 +0000 Subject: [PATCH 073/124] nodejs-14_x: 14.7.0 -> 14.8.0 https://github.com/nodejs/node/releases/tag/v14.8.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 612f95b2e0f..b3daab5000c 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.7.0"; - sha256 = "0vwf523ahw0145wp17zkaflwm5823v1vz1kkglj25gzjydiiqbya"; + version = "14.8.0"; + sha256 = "0vghz7g7mih7idgknwzdc2zfw82qqq497m727ydhkas1wvj6i7lv"; } From b24b63847b873e26b81a8928492d39bb9b872535 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Wed, 12 Aug 2020 07:08:37 +0200 Subject: [PATCH 074/124] notmuch: 0.30 -> 0.30.1c80020 This update is required because recent update of Emacs (to 27.1) broke notmuch build. --- .../networking/mailreaders/notmuch/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 57849b46fcb..87053780073 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv +{ fetchurl, fetchgit, stdenv , pkgconfig, gnupg , xapian, gmime, talloc, zlib , doxygen, perl, texinfo @@ -12,17 +12,18 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.30"; + version = "0.30.1c80020"; pname = "notmuch"; passthru = { - pythonSourceRoot = "${pname}-${version}/bindings/python"; + pythonSourceRoot = "${src.name}/bindings/python"; inherit version; }; - src = fetchurl { - url = "https://notmuchmail.org/releases/${pname}-${version}.tar.xz"; - sha256 = "1ylnj12f7xr18v3ckb1nwc2aw2rj3ghqnj5f4rzccr8xw5pslfsy"; + src = fetchgit { + url = "https://git.notmuchmail.org/git/notmuch"; + sha256 = "0xj944c4ayps1bg21pksjih3y9v6lb34dd582df14i14q0yzji51"; + rev = "1c80020e701c7323de137c0616fc8864443d7bd3"; }; nativeBuildInputs = [ @@ -75,6 +76,7 @@ stdenv.mkDerivation rec { sha256 = "1lk91s00y4qy4pjh8638b5lfkgwyl282g1m27srsf7qfn58y16a2"; }; in '' + mkdir -p test/test-databases ln -s ${test-database} test/test-databases/database-v1.tar.xz ''; doCheck = !stdenv.hostPlatform.isDarwin && (versionAtLeast gmime.version "3.0.3"); From 76de83ab87ebb364c696b92b3ee3742c9eee440d Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 12 Aug 2020 07:45:59 +0100 Subject: [PATCH 075/124] darktable: 3.0.2 -> 3.2.1 Release information: https://www.darktable.org/2020/08/darktable-3-2/ --- pkgs/applications/graphics/darktable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 6327548dc14..71c2de08a56 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "3.0.2"; + version = "3.2.1"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "1yrnkw8c47kmy2x6m1xp69hwyk02xyc8pd9kvcmyj54lzrhzdfka"; + sha256 = "035rvqmw386hm0jpi14lf4dnpr5rjkalzjkyprqh42nwi3m86dkf"; }; nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ]; From 863425d1380cf644dc6ab5d915ae29607e4b01bc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Aug 2020 07:22:56 +0000 Subject: [PATCH 076/124] cpp-utilities: 5.5.0 -> 5.6.0 --- pkgs/development/libraries/cpp-utilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 88d2f59f563..cbe628aaf4e 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.5.0"; + version = "5.6.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "1kzwclf8l89dbw10ya0grhdj7dspmj7rg7rkaa8b7n5lgla968jr"; + sha256 = "0998pyrxicpalm2w1wmv7qrfhzgr45kl6xh9gv0zxhx2a4xjqq5v"; }; nativeBuildInputs = [ cmake ]; From 15e5bbdedfcabdb66e45341f78960b002e659b71 Mon Sep 17 00:00:00 2001 From: afreakk Date: Wed, 12 Aug 2020 11:05:43 +0200 Subject: [PATCH 077/124] tmuxPlugins.fingers: fix rtpFilePath --- pkgs/misc/tmux-plugins/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 74bbe189182..dd05bb4aa3b 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -111,6 +111,7 @@ in rec { fingers = mkDerivation rec { pluginName = "fingers"; + rtpFilePath = "tmux-fingers.tmux"; version = "1.0.1"; src = fetchFromGitHub { owner = "Morantron"; From 7a34bf1aae9985ab2598354e0f46e1ff86afe394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Tue, 11 Aug 2020 21:25:09 +0200 Subject: [PATCH 078/124] flashplayer: 32.0.0.403 -> 32.0.0.414 --- .../networking/browsers/chromium/plugins.nix | 4 ++-- .../browsers/mozilla-plugins/flashplayer/default.nix | 10 +++++----- .../mozilla-plugins/flashplayer/standalone.nix | 6 +++--- .../networking/browsers/ungoogled-chromium/plugins.nix | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 54da49b9e30..239a6282a67 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -44,11 +44,11 @@ let flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; - version = "32.0.0.403"; + version = "32.0.0.414"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "1xirngiqypylgm8f3ddvny2ghqxgj8i98bm1carcj2vryw53wwal"; + sha256 = "0wzf5i6qf5wgjm905kd3qh97rj47fybl9g7z72vasilbx8q5wfwk"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 76b4884aae5..bec18edea37 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -74,7 +74,7 @@ let in stdenv.mkDerivation rec { pname = "flashplayer"; - version = "32.0.0.403"; + version = "32.0.0.414"; src = fetchurl { url = @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "0nx0fxa6l438hvzgsxa561nrin8lx7l9ccqscjn9mdg42yw36k63" + "184qy9zxk9ynp6avz1j0ca5mxqqqlhrc0m7d1cjxv39jfdiyz51i" else - "0vbg4ijsbmn71kq5mynx0hfhazy10ghcxsxwbwaxdl11ilxikrli" + "1m8fay452zps5yw1qpsc6irxxdvqjhkwxg066ckxkjf68gln7cmn" else if arch == "x86_64" then - "1paz9y3pcisw5ck3v6a740sr7plmsbg6bjqrj2yfqdixf95fk2pl" + "0ng04yig7msq4mv01ngfsh7mkxia18j3k9clnp0y0sbpr60z8s83" else - "1b2r20yc94ibsw0vpr6xl1x1vbjgjw6qzxzr374ppck8famikyj2"; + "0fndnhznqz28wfmm32fafx30pi517vvkxy1isp4krsfvyl7fmzhn"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 5c4f85ee717..7a5c676ccb0 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { pname = "flashplayer-standalone"; - version = "32.0.0.403"; + version = "32.0.0.414"; src = fetchurl { url = @@ -60,9 +60,9 @@ stdenv.mkDerivation { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "164cah1h78vs068y19v0c40243sy2ip1n4jc6qvzv9acawy12ckw" + "1sfvxi0ngk1ny912hw1zp0l3v6md6qqpvnyab3h45562m2fm6vqz" else - "0508jzaji3z52dyp49xx2m7impz1fdpp20af0h8dwdph1q3mxn32"; + "0pxb3fhwvajvb28w11iylx5rp0h1f4s2aiii53gz28sq082w9br4"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix index 54da49b9e30..239a6282a67 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix @@ -44,11 +44,11 @@ let flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; - version = "32.0.0.403"; + version = "32.0.0.414"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "1xirngiqypylgm8f3ddvny2ghqxgj8i98bm1carcj2vryw53wwal"; + sha256 = "0wzf5i6qf5wgjm905kd3qh97rj47fybl9g7z72vasilbx8q5wfwk"; stripRoot = false; }; From bbf9d7d416392331206e1dcadf97cc85d82c3803 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Aug 2020 09:24:38 +0000 Subject: [PATCH 079/124] fluent-bit: 1.5.2 -> 1.5.3 --- pkgs/tools/misc/fluent-bit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 9150e04fc14..28c005b7abb 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "1q413rslsba8pqxlrypx4kpk1a4sp66p0swv3lrnd7k7bf55j3jk"; + sha256 = "153c7hafmzwxa24h923irfhzaqqd8wbr2aaab6l3hjhgx5q8s5bf"; }; nativeBuildInputs = [ cmake flex bison ]; From ffc53f66dcccea28af848c44e515cce5dacbd712 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 12 Aug 2020 20:16:21 +1000 Subject: [PATCH 080/124] kustomize: remove deleteVendor, enable checks --- pkgs/development/tools/kustomize/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index 9acd3cd0f50..63a3c774668 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -23,11 +23,8 @@ buildGoModule rec { # avoid finding test and development commands sourceRoot = "source/kustomize"; - deleteVendor = true; vendorSha256 = "01ff3w4hwp4ynqhg8cplv0i2ixs811d2x2j6xbh1lslyyh3z3wc5"; - doCheck = false; - meta = with lib; { description = "Customization of kubernetes YAML configurations"; longDescription = '' From 2e10c7a3f7ccbeea00c21632c25a13831defda46 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 12 Aug 2020 20:16:21 +1000 Subject: [PATCH 081/124] gobetween: remove deleteVendor, enable checks --- pkgs/servers/gobetween/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/servers/gobetween/default.nix b/pkgs/servers/gobetween/default.nix index 97015f24191..9f28a89f51e 100644 --- a/pkgs/servers/gobetween/default.nix +++ b/pkgs/servers/gobetween/default.nix @@ -11,8 +11,6 @@ buildGoModule rec { sha256 = "0bxf89l53sqan9qq23rwawjkcanv9p61sw56zjqhyx78f0bh0zbc"; }; - deleteVendor = true; - patches = [ ./gomod.patch ]; @@ -23,8 +21,6 @@ buildGoModule rec { vendorSha256 = "1nkni9ikpc0wngh5v0qmlpn5s9v85lb2ih22f3h3lih7nc29yv87"; - doCheck = false; - installPhase = '' mkdir -p $out/bin cp bin/gobetween $out/bin From 74ea2b2123672e43a41d3142070ac50eab46b60f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 11 Aug 2020 15:30:39 +0200 Subject: [PATCH 082/124] meson: Fix rpath clearing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Meson allows projects to set `build_rpath` property, containing paths that will be added during build but will be removed when installing. When Meson removes build_rpath from `DT_RUNPATH` entry, it just writes the shorter ␀-terminated new rpath over the old one to reduce the risk of potentially breaking the ELF files (when the linker does string de-duplication or something). But this can cause much bigger problem for Nix, as it can produce cut-in-half-by-␀ store path references. For example, in systemd’s libudev, it was removing three `$ORIGIN`-relative paths from $ORIGIN/../libsystemd:$ORIGIN/../basic:$ORIGIN/../shared:…␀ resulting in the following `DT_RUNPATH` entry: …␀store/v589pqjhvxrj73g3r0xb41yr84z5pwb7-gcc-9.3.0-lib/lib␀ We previously handled this in `fix-rpath.patch` but the method we prevent Meson from removing paths added to rpath through `NIX_LDFLAGS` was changed during 0.55.0 update and I forgot about this second purpose of the patch. Let’s re-add this clearing code, as it worked without issues for a long time. --- .../meson/clear-old-rpath.patch | 20 +++++++++++++++++++ .../tools/build-managers/meson/default.nix | 8 ++++++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/build-managers/meson/clear-old-rpath.patch diff --git a/pkgs/development/tools/build-managers/meson/clear-old-rpath.patch b/pkgs/development/tools/build-managers/meson/clear-old-rpath.patch new file mode 100644 index 00000000000..0a52fe60e9d --- /dev/null +++ b/pkgs/development/tools/build-managers/meson/clear-old-rpath.patch @@ -0,0 +1,20 @@ +diff --git a/mesonbuild/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py +index 77ac03d66..d12f77592 100644 +--- a/mesonbuild/scripts/depfixer.py ++++ b/mesonbuild/scripts/depfixer.py +@@ -337,6 +337,15 @@ class Elf(DataSizes): + if not new_rpath: + self.remove_rpath_entry(entrynum) + else: ++ # Clear old rpath to avoid stale references, ++ # not heeding the warning above about de-duplication ++ # since it does not seem to cause issues for us ++ # and not doing so trips up Nix’s reference checker. ++ # See https://github.com/NixOS/nixpkgs/pull/46020 ++ # and https://github.com/NixOS/nixpkgs/issues/95163 ++ self.bf.seek(rp_off) ++ self.bf.write(b'\0'*len(old_rpath)) ++ + self.bf.seek(rp_off) + self.bf.write(new_rpath) + self.bf.write(b'\0') diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index dad1dfa360c..c32635d80e1 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -43,6 +43,14 @@ python3.pkgs.buildPythonApplication rec { src = ./fix-rpath.patch; inherit (builtins) storeDir; }) + + # When Meson removes build_rpath from DT_RUNPATH entry, it just writes + # the shorter NUL-terminated new rpath over the old one to reduce + # the risk of potentially breaking the ELF files. + # But this can cause much bigger problem for Nix as it can produce + # cut-in-half-by-\0 store path references. + # Let’s just clear the whole rpath and hope for the best. + ./clear-old-rpath.patch ]; setupHook = ./setup-hook.sh; From e23ed2c42838f2ee8b631c392b78131b950e0639 Mon Sep 17 00:00:00 2001 From: Jordan Doyle Date: Fri, 7 Aug 2020 00:02:48 +0100 Subject: [PATCH 083/124] tilt: 0.11.3 -> 0.17.0, move to buildGoModule --- .../networking/cluster/tilt/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 13f2c3d9bd9..c2ffb816aa9 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -1,24 +1,23 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "tilt"; /* Do not use "dev" as a version. If you do, Tilt will consider itself - running in development environment and try to serve assets from the - source tree, which is not there once build completes. */ - version = "0.11.3"; + running in development environment and try to serve assets from the + source tree, which is not there once build completes. */ + version = "0.17.0"; src = fetchFromGitHub { - owner = "windmilleng"; + owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "035czgr0rn6gcv24vnlr35n9yvy0fwq4spdzsc76gfxckcbcmzz0"; + sha256 = "0bd01fmrf17njzf8ri4bw4qi7bxcvd3dx7yyf42qfvnp7hrfzipk"; }; - - goPackagePath = "github.com/windmilleng/tilt"; + vendorSha256 = null; subPackages = [ "cmd/tilt" ]; - buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2020-01-25"); + buildFlagsArray = [ "-ldflags=-X main.version=${version}" ]; meta = with stdenv.lib; { description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production"; From f527651a675deb387fcdaac8f1cdfba216869fe0 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 21 Jul 2020 01:08:58 +0200 Subject: [PATCH 084/124] nixos/fontconfig: stop generating fontconfig_210 config and cache This fontconfig version isn't used anywhere inside nixpkgs anymore. --- nixos/modules/config/fonts/fontconfig.nix | 88 +++++++---------------- 1 file changed, 27 insertions(+), 61 deletions(-) diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 52d284f739b..12a40fbb5a2 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -1,11 +1,6 @@ /* -NixOS support 2 fontconfig versions, "support" and "latest". - -- "latest" refers to default fontconfig package (pkgs.fontconfig). - configuration files are linked to /etc/fonts/VERSION/conf.d/ -- "support" refers to supportPkg (pkgs."fontconfig_${supportVersion}"). - configuration files are linked to /etc/fonts/conf.d/ +Configuration files are linked to /etc/fonts/${pkgs.fontconfig.configVersion}/conf.d/ This module generates a package containing configuration files and link it in /etc/fonts. @@ -22,40 +17,21 @@ let cfg = config.fonts.fontconfig; fcBool = x: "" + (boolToString x) + ""; - - # back-supported fontconfig version and package - # version is used for font cache generation - supportVersion = "210"; - supportPkg = pkgs."fontconfig_${supportVersion}"; - - # latest fontconfig version and package - # version is used for configuration folder name, /etc/fonts/VERSION/ - # note: format differs from supportVersion and can not be used with makeCacheConf - latestVersion = pkgs.fontconfig.configVersion; - latestPkg = pkgs.fontconfig; - - # supported version fonts.conf - supportFontsConf = pkgs.makeFontsConf { fontconfig = supportPkg; fontDirectories = config.fonts.fonts; }; + pkg = pkgs.fontconfig; # configuration file to read fontconfig cache - # version dependent # priority 0 - cacheConfSupport = makeCacheConf { version = supportVersion; }; - cacheConfLatest = makeCacheConf {}; + cacheConf = makeCacheConf {}; - # generate the font cache setting file for a fontconfig version - # use latest when no version is passed + # generate the font cache setting file # When cross-compiling, we can’t generate the cache, so we skip the # part. fontconfig still works but is a little slower in # looking things up. - makeCacheConf = { version ? null }: + makeCacheConf = { }: let - fcPackage = if version == null - then "fontconfig" - else "fontconfig_${version}"; makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; }; - cache = makeCache pkgs.${fcPackage}; - cache32 = makeCache pkgs.pkgsi686Linux.${fcPackage}; + cache = makeCache pkgs.fontconfig; + cache32 = makeCache pkgs.pkgsi686Linux.fontconfig; in pkgs.writeText "fc-00-nixos-cache.conf" '' @@ -200,59 +176,49 @@ let confPkg = pkgs.runCommand "fontconfig-conf" { preferLocalBuild = true; } '' - support_folder=$out/etc/fonts/conf.d - latest_folder=$out/etc/fonts/${latestVersion}/conf.d - - mkdir -p $support_folder - mkdir -p $latest_folder + dst=$out/etc/fonts/${pkg.configVersion}/conf.d + mkdir -p $dst # fonts.conf - ln -s ${supportFontsConf} $support_folder/../fonts.conf - ln -s ${latestPkg.out}/etc/fonts/fonts.conf \ - $latest_folder/../fonts.conf + ln -s ${pkg.out}/etc/fonts/fonts.conf \ + $dst/../fonts.conf # fontconfig default config files - ln -s ${supportPkg.out}/etc/fonts/conf.d/*.conf \ - $support_folder/ - # Latest fontconfig is configured to look for the upstream defaults inside the package. + ln -s ${pkg.out}/etc/fonts/conf.d/*.conf \ + $dst/ + + # update 51-local.conf path to look at local.conf + rm $dst/51-local.conf + + substitute ${pkg.out}/etc/fonts/conf.d/51-local.conf \ + $dst/51-local.conf \ + --replace local.conf /etc/fonts/${pkg.configVersion}/local.conf # 00-nixos-cache.conf - ln -s ${cacheConfSupport} \ - $support_folder/00-nixos-cache.conf - ln -s ${cacheConfLatest} $latest_folder/00-nixos-cache.conf + ln -s ${cacheConf} $dst/00-nixos-cache.conf # 10-nixos-rendering.conf - ln -s ${renderConf} $support_folder/10-nixos-rendering.conf - ln -s ${renderConf} $latest_folder/10-nixos-rendering.conf + ln -s ${renderConf} $dst/10-nixos-rendering.conf # 50-user.conf ${optionalString (!cfg.includeUserConf) '' - rm $support_folder/50-user.conf - ''} - # Since latest fontconfig looks for default files inside the package, - # we had to move this one elsewhere to be able to exclude it here. - ${optionalString cfg.includeUserConf '' - ln -s ${latestPkg.out}/etc/fonts/conf.d.bak/50-user.conf $latest_folder/50-user.conf + rm $dst/50-user.conf ''} # local.conf (indirect priority 51) ${optionalString (cfg.localConf != "") '' - ln -s ${localConf} $support_folder/../local.conf - ln -s ${localConf} $latest_folder/../local.conf + ln -s ${localConf} $dst/../local.conf ''} # 52-nixos-default-fonts.conf - ln -s ${defaultFontsConf} $support_folder/52-nixos-default-fonts.conf - ln -s ${defaultFontsConf} $latest_folder/52-nixos-default-fonts.conf + ln -s ${defaultFontsConf} $dst/52-nixos-default-fonts.conf # 53-no-bitmaps.conf - ln -s ${rejectBitmaps} $support_folder/53-no-bitmaps.conf - ln -s ${rejectBitmaps} $latest_folder/53-no-bitmaps.conf + ln -s ${rejectBitmaps} $dst/53-no-bitmaps.conf ${optionalString (!cfg.allowType1) '' # 53-nixos-reject-type1.conf - ln -s ${rejectType1} $support_folder/53-nixos-reject-type1.conf - ln -s ${rejectType1} $latest_folder/53-nixos-reject-type1.conf + ln -s ${rejectType1} $dst/53-nixos-reject-type1.conf ''} ''; From b761543f16bf761e6ae9bd4596600a26f35b60f5 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 21 Jul 2020 01:10:05 +0200 Subject: [PATCH 085/124] fontconfig_210: remove This isn't used anymore anywhere, and vulnerable to CVE-2016-5384. --- .../development/libraries/fontconfig/2.10.nix | 47 ------------------- pkgs/top-level/aliases.nix | 5 ++ pkgs/top-level/all-packages.nix | 2 - 3 files changed, 5 insertions(+), 49 deletions(-) delete mode 100644 pkgs/development/libraries/fontconfig/2.10.nix diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/pkgs/development/libraries/fontconfig/2.10.nix deleted file mode 100644 index f4cc2989245..00000000000 --- a/pkgs/development/libraries/fontconfig/2.10.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, freetype, expat -}: - -stdenv.mkDerivation rec { - name = "fontconfig-2.10.2"; - - src = fetchurl { - url = "http://fontconfig.org/release/${name}.tar.bz2"; - sha256 = "0llraqw86jmw4vzv7inskp3xxm2gc64my08iwq5mzncgfdbfza4f"; - }; - - outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config - - propagatedBuildInputs = [ freetype ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ expat ]; - - configureFlags = [ - "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" - "--sysconfdir=/etc" - "--with-cache-dir=/var/cache/fontconfig" - "--disable-docs" - "--with-default-fonts=" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" - ]; - - enableParallelBuilding = true; - - doCheck = true; - - # Don't try to write to /var/cache/fontconfig at install time. - installFlags = [ "sysconfdir=$(out)/etc" "fc_cachedir=$(TMPDIR)/dummy" "RUN_FC_CACHE_TEST=false" ]; - - passthru = { - # Empty for backward compatibility, there was no versioning before 2.11 - configVersion = ""; - }; - - meta = with stdenv.lib; { - description = "A library for font customization and configuration"; - homepage = "http://fontconfig.org/"; - license = licenses.bsd2; # custom but very bsd-like - platforms = platforms.all; - maintainers = [ maintainers.vcunat ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3d2c21cc358..3df944635c1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -138,6 +138,11 @@ mapAliases ({ fontconfig-ultimate has been removed. The repository has been archived upstream and activity has ceased for several years. https://github.com/bohoomil/fontconfig-ultimate/issues/171. ''; + # 2020-07-21 + fontconfig_210 = throw '' + fontconfig 2.10.x hasn't had a release in years, is vulnerable to CVE-2016-5384 + and has only been used for old fontconfig caches. + ''; font-droid = throw "font-droid has been deprecated by noto-fonts"; # 2019-04-12 foomatic_filters = foomatic-filters; # 2016-08 fuse_exfat = exfat; # 2015-09-11 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 933a7544fb7..878615936ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12066,8 +12066,6 @@ in cfitsio = callPackage ../development/libraries/cfitsio { }; - fontconfig_210 = callPackage ../development/libraries/fontconfig/2.10.nix { }; - fontconfig = callPackage ../development/libraries/fontconfig { }; fontconfig-penultimate = callPackage ../data/fonts/fontconfig-penultimate {}; From bab13cc0dfde09f0551824fd9ea91b2d2eb23bf3 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 21 Jul 2020 01:10:58 +0200 Subject: [PATCH 086/124] nixos/doc/manual/release-notes: document fontconfig 2.10.x config and cache removal --- nixos/doc/manual/release-notes/rl-2009.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 831f2387a42..ae9d6064f32 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -849,6 +849,12 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0"; There are no functional changes, however this may require updating some configurations to use correct types for all attributes. + + + The fontconfig module stopped generating fontconfig 2.10.x config and cache. + Fontconfig 2.10.x was removed from Nixpkgs - it hasn't been used in any nixpkgs package anymore. + + From 15d2b2136e377aafb7ade5ed29d840480dabfbc2 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Fri, 17 Jul 2020 16:00:52 +0200 Subject: [PATCH 087/124] spacetime_lib: fix missing module necessary for the upcoming prof_spacetime --- pkgs/development/ocaml-modules/spacetime_lib/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/ocaml-modules/spacetime_lib/default.nix b/pkgs/development/ocaml-modules/spacetime_lib/default.nix index 6b1b45cb2fb..db6d184655c 100644 --- a/pkgs/development/ocaml-modules/spacetime_lib/default.nix +++ b/pkgs/development/ocaml-modules/spacetime_lib/default.nix @@ -13,6 +13,10 @@ buildDunePackage rec { propagatedBuildInputs = [ owee ]; + preConfigure = '' + bash ./configure.sh + ''; + meta = { description = "An OCaml library providing some simple operations for handling OCaml “spacetime” profiles"; inherit (src.meta) homepage; From 300307fde6fba5521e8d579628ce7703b5d1196d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Aug 2020 13:16:57 +0200 Subject: [PATCH 088/124] homeassistant: 0.113.3 -> 0.114.0 --- .../home-assistant/component-packages.nix | 21 +++++++----- pkgs/servers/home-assistant/default.nix | 5 ++- ...x-flapping-chained-task-logging-test.patch | 33 ------------------- pkgs/servers/home-assistant/frontend.nix | 4 +-- .../home-assistant/relax-dependencies.patch | 14 ++------ 5 files changed, 19 insertions(+), 58 deletions(-) delete mode 100644 pkgs/servers/home-assistant/fix-flapping-chained-task-logging-test.patch diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 0a1178f0c9f..5797889df21 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,9 +2,10 @@ # Do not edit! { - version = "0.113.3"; + version = "0.114.0"; components = { "abode" = ps: with ps; [ ]; # missing inputs: abodepy + "accuweather" = ps: with ps; [ ]; # missing inputs: accuweather "acer_projector" = ps: with ps; [ pyserial]; "acmeda" = ps: with ps; [ ]; # missing inputs: aiopulse "actiontec" = ps: with ps; [ ]; @@ -64,6 +65,7 @@ "awair" = ps: with ps; [ ]; # missing inputs: python_awair "aws" = ps: with ps; [ ]; # missing inputs: aiobotocore "axis" = ps: with ps; [ aiohttp-cors paho-mqtt]; # missing inputs: axis + "azure_devops" = ps: with ps; [ ]; # missing inputs: aioazuredevops "azure_event_hub" = ps: with ps; [ ]; # missing inputs: azure-eventhub "azure_service_bus" = ps: with ps; [ azure-servicebus]; "baidu" = ps: with ps; [ ]; # missing inputs: baidu-aip @@ -90,7 +92,7 @@ "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-home + "bond" = ps: with ps; [ ]; # missing inputs: bond-api "braviatv" = ps: with ps; [ bravia-tv]; "broadlink" = ps: with ps; [ broadlink]; "brother" = ps: with ps; [ brother]; @@ -130,6 +132,7 @@ "concord232" = ps: with ps; [ ]; # missing inputs: concord232 "config" = ps: with ps; [ aiohttp-cors]; "configurator" = ps: with ps; [ ]; + "control4" = ps: with ps; [ ]; # missing inputs: pyControl4 "conversation" = ps: with ps; [ aiohttp-cors]; "coolmaster" = ps: with ps; [ ]; # missing inputs: pycoolmasternet "coronavirus" = ps: with ps; [ ]; # missing inputs: coronavirus @@ -246,6 +249,7 @@ "filesize" = ps: with ps; [ ]; "filter" = ps: with ps; [ aiohttp-cors sqlalchemy]; "fints" = ps: with ps; [ fints]; + "firmata" = ps: with ps; [ ]; # missing inputs: pymata-express "fitbit" = ps: with ps; [ aiohttp-cors fitbit]; "fixer" = ps: with ps; [ ]; # missing inputs: fixerio "fleetgo" = ps: with ps; [ ]; # missing inputs: ritassist @@ -427,7 +431,6 @@ "lightwave" = ps: with ps; [ ]; # missing inputs: lightwave "limitlessled" = ps: with ps; [ limitlessled]; "linksys_smart" = ps: with ps; [ ]; - "linky" = ps: with ps; [ ]; # missing inputs: pylinky "linode" = ps: with ps; [ linode-api]; "linux_battery" = ps: with ps; [ batinfo]; "lirc" = ps: with ps; [ ]; # missing inputs: python-lirc @@ -471,7 +474,7 @@ "meraki" = ps: with ps; [ aiohttp-cors]; "message_bird" = ps: with ps; [ ]; # missing inputs: messagebird "met" = ps: with ps; [ pymetno]; - "meteo_france" = ps: with ps; [ ]; # missing inputs: meteofrance vigilancemeteo + "meteo_france" = ps: with ps; [ ]; # missing inputs: meteofrance-api "meteoalarm" = ps: with ps; [ ]; # missing inputs: meteoalertapi "metoffice" = ps: with ps; [ ]; # missing inputs: datapoint "mfi" = ps: with ps; [ ]; # missing inputs: mficlient @@ -581,6 +584,7 @@ "orvibo" = ps: with ps; [ ]; # missing inputs: orvibo "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify "otp" = ps: with ps; [ pyotp]; + "ovo_energy" = ps: with ps; [ ]; # missing inputs: ovoenergy "owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa paho-mqtt]; "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt]; # missing inputs: python-openzwave-mqtt "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta @@ -712,7 +716,7 @@ "simulated" = ps: with ps; [ ]; "sinch" = ps: with ps; [ ]; # missing inputs: clx-sdk-xms "sisyphus" = ps: with ps; [ ]; # missing inputs: sisyphus-control - "sky_hub" = ps: with ps; [ ]; + "sky_hub" = ps: with ps; [ ]; # missing inputs: pyskyqhub "skybeacon" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL] "skybell" = ps: with ps; [ ]; # missing inputs: skybellpy "slack" = ps: with ps; [ ]; # missing inputs: slackclient @@ -801,7 +805,7 @@ "telnet" = ps: with ps; [ ]; "temper" = ps: with ps; [ ]; # missing inputs: temperusb "template" = ps: with ps; [ ]; - "tensorflow" = ps: with ps; [ numpy pillow protobuf]; # missing inputs: tensorflow + "tensorflow" = ps: with ps; [ numpy pillow protobuf]; # missing inputs: pycocotools tensorflow tf-models-official tf-slim "tesla" = ps: with ps; [ ]; # missing inputs: teslajsonpy "tfiac" = ps: with ps; [ ]; # missing inputs: pytfiac "thermoworks_smoke" = ps: with ps; [ stringcase]; # missing inputs: thermoworks_smoke @@ -882,7 +886,7 @@ "vlc_telnet" = ps: with ps; [ ]; # missing inputs: python-telnet-vlc "voicerss" = ps: with ps; [ ]; "volkszaehler" = ps: with ps; [ ]; # missing inputs: volkszaehler - "volumio" = ps: with ps; [ ]; + "volumio" = ps: with ps; [ ]; # missing inputs: pyvolumio "volvooncall" = ps: with ps; [ ]; # missing inputs: volvooncall "vultr" = ps: with ps; [ vultr]; "w800rf32" = ps: with ps; [ ]; # missing inputs: pyW800rf32 @@ -904,6 +908,7 @@ "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy "withings" = ps: with ps; [ aiohttp-cors]; # missing inputs: withings-api "wled" = ps: with ps; [ ]; # missing inputs: wled + "wolflink" = ps: with ps; [ ]; # missing inputs: wolf_smartset "workday" = ps: with ps; [ holidays]; "worldclock" = ps: with ps; [ ]; "worldtidesinfo" = ps: with ps; [ ]; @@ -924,7 +929,7 @@ "yale_smart_alarm" = ps: with ps; [ ]; # missing inputs: yalesmartalarmclient "yamaha" = ps: with ps; [ rxv]; "yamaha_musiccast" = ps: with ps; [ ]; # missing inputs: pymusiccast - "yandex_transport" = ps: with ps; [ ]; # missing inputs: ya_ma + "yandex_transport" = ps: with ps; [ ]; # missing inputs: aioymaps "yandextts" = ps: with ps; [ ]; "yeelight" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: yeelight "yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 957d61e8ad7..6eaf1bc45d1 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -72,7 +72,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.113.3"; + hassVersion = "0.114.0"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -82,7 +82,6 @@ in with py.pkgs; buildPythonApplication rec { patches = [ ./relax-dependencies.patch - ./fix-flapping-chained-task-logging-test.patch ]; inherit availableComponents; @@ -92,7 +91,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1lrllhafjawrghdp81lz1ffdqcj2q0x9ndp11nhi8s9fd8bb4c8j"; + sha256 = "0g7jwhdvdcam7gvrj72aknrsvdwm5i5hs93nngqm26m1g4sng0ma"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/fix-flapping-chained-task-logging-test.patch b/pkgs/servers/home-assistant/fix-flapping-chained-task-logging-test.patch deleted file mode 100644 index 1549046fc40..00000000000 --- a/pkgs/servers/home-assistant/fix-flapping-chained-task-logging-test.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 1d54dafad9968465d995d195f683d8032a5194d1 Mon Sep 17 00:00:00 2001 -From: "J. Nick Koston" -Date: Sun, 2 Aug 2020 23:05:53 +0000 -Subject: [PATCH] Fix flapping chained task logging test - -Creating 20 tasks was taking less than 0.0001 seconds which caused -the tests to fail. Increase the number of test tasks by two orders -of magnitude. ---- - tests/test_core.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/test_core.py b/tests/test_core.py -index 12ed00fde2c9..167eda3f6cb4 100644 ---- a/tests/test_core.py -+++ b/tests/test_core.py -@@ -1436,14 +1436,14 @@ async def test_chained_logging_hits_log_timeout(hass, caplog): - async def _task_chain_1(): - nonlocal created - created += 1 -- if created > 10: -+ if created > 1000: - return - hass.async_create_task(_task_chain_2()) - - async def _task_chain_2(): - nonlocal created - created += 1 -- if created > 10: -+ if created > 1000: - return - hass.async_create_task(_task_chain_1()) - diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 9f03633d62a..5c7227dc4e0 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 = "20200716.0"; + version = "20200811.0"; src = fetchPypi { inherit pname version; - sha256 = "07h8llin0rx06c5v2skkij5756gqdq079ysxzmrm6xnzk9mcvfsk"; + sha256 = "0nrvfr4mw7h9py27hkak201jsfrvyxlgswfnda1l7k9ns9y4lpj8"; }; # no Python tests implemented diff --git a/pkgs/servers/home-assistant/relax-dependencies.patch b/pkgs/servers/home-assistant/relax-dependencies.patch index 03b488627d6..d06a37352f6 100644 --- a/pkgs/servers/home-assistant/relax-dependencies.patch +++ b/pkgs/servers/home-assistant/relax-dependencies.patch @@ -1,16 +1,7 @@ diff --git a/setup.py b/setup.py -index 7cf06942f3..b3dd1b3e1b 100755 +index 81f8727ed6..12200e0b9f 100755 --- a/setup.py +++ b/setup.py -@@ -32,7 +32,7 @@ PROJECT_URLS = { - PACKAGES = find_packages(exclude=["tests", "tests.*"]) - - REQUIRES = [ -- "aiohttp==3.6.1", -+ "aiohttp>=3.6.1", - "astral==1.10.1", - "async_timeout==3.0.1", - "attrs==19.3.0", @@ -43,13 +43,13 @@ REQUIRES = [ "jinja2>=2.11.1", "PyJWT==1.7.1", @@ -18,8 +9,7 @@ index 7cf06942f3..b3dd1b3e1b 100755 - "cryptography==2.9.2", + "cryptography>=2.9.2", "pip>=8.0.3", -- "python-slugify==4.0.0", -+ "python-slugify>=4.0.0", + "python-slugify==4.0.1", "pytz>=2020.1", "pyyaml==5.3.1", - "requests==2.24.0", From 5810d6681fa4327db6b37252f72eb6ae175575ee Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Fri, 17 Jul 2020 16:01:52 +0200 Subject: [PATCH 089/124] ocamlPackages.prof_spacetime: init at 0.3.0 --- .../ocaml-modules/prof_spacetime/default.nix | 43 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/ocaml-modules/prof_spacetime/default.nix diff --git a/pkgs/development/ocaml-modules/prof_spacetime/default.nix b/pkgs/development/ocaml-modules/prof_spacetime/default.nix new file mode 100644 index 00000000000..91e30e155db --- /dev/null +++ b/pkgs/development/ocaml-modules/prof_spacetime/default.nix @@ -0,0 +1,43 @@ +{ buildDunePackage +, lib +, fetchFromGitHub +, cmdliner +, spacetime_lib +, yojson +, cohttp +, ocaml_lwt +, cohttp-lwt-unix +, lambdaTerm +, stdlib-shims +}: + +buildDunePackage rec { + pname = "prof_spacetime"; + version = "0.3.0"; + useDune2 = true; + + src = fetchFromGitHub { + owner = "lpw25"; + repo = pname; + rev = version; + sha256 = "1s88gf6x5almmyi58zx4q23w89mvahfjwhvyfg29ya5s1pjbc9hi"; + }; + + buildInputs = [ + cmdliner + spacetime_lib + yojson + cohttp + ocaml_lwt + cohttp-lwt-unix + lambdaTerm + stdlib-shims + ]; + + meta = { + description = "A viewer for OCaml spacetime profiles"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.symphorien ]; + inherit (src.meta) homepage; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 63d4ec79a94..7f2e2e1a4bd 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -848,6 +848,8 @@ let process = callPackage ../development/ocaml-modules/process { }; + prof_spacetime = callPackage ../development/ocaml-modules/prof_spacetime { }; + ptmap = callPackage ../development/ocaml-modules/ptmap { }; pycaml = callPackage ../development/ocaml-modules/pycaml { }; From b3c794d610b974f1b20d8f243a7f4ea9a92d73bf Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Wed, 1 Jul 2020 15:15:20 +0200 Subject: [PATCH 090/124] openafs: 1.6.23 -> 1.6.24, mark broken due to EOL Last old stable release. Enforce switch to openafs_1_8 by marking broken while leaving a reasonable short-term alternative. Ref #90927 --- nixos/doc/manual/release-notes/rl-2009.xml | 40 ++++++++++++++++++++++ pkgs/servers/openafs/1.6/default.nix | 2 ++ pkgs/servers/openafs/1.6/module.nix | 4 +-- pkgs/servers/openafs/1.6/srcs.nix | 6 ++-- 4 files changed, 47 insertions(+), 5 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index a0a0b2cb40e..8043bbe36df 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -493,6 +493,46 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; In the resilio module, has been changed to listen to [::1] instead of 0.0.0.0. + + + + + Users of OpenAFS 1.6 must + upgrade their services to OpenAFS 1.8! In this release, the OpenAFS package + version 1.6.24 is marked broken but can be used during transition to + OpenAFS 1.8.x. Use the options + , + and + to select a different + OpenAFS package. OpenAFS 1.6 will be removed in the next release. The + package openafs and the service options will then + silently point to the OpenAFS 1.8 release. + + + See also the OpenAFS Administrator + Guide for instructions. Beware of the following when updating + servers: + + + + The storage format of the server key has changed and the key must be converted before running the new release. + + + + + When updating multiple database servers, turn off the database servers + from the highest IP down to the lowest with resting periods in + between. Start up in reverse order. Do not concurrently run database + servers working with different OpenAFS releases! + + + + + Update servers first, then clients. + + + diff --git a/pkgs/servers/openafs/1.6/default.nix b/pkgs/servers/openafs/1.6/default.nix index 4dcc7b5e05d..8835024c1df 100644 --- a/pkgs/servers/openafs/1.6/default.nix +++ b/pkgs/servers/openafs/1.6/default.nix @@ -85,5 +85,7 @@ stdenv.mkDerivation { license = licenses.ipl10; platforms = platforms.linux; maintainers = [ maintainers.maggesi maintainers.spacefrogg ]; + # Package will be removed in 21.03 + broken = true; }; } diff --git a/pkgs/servers/openafs/1.6/module.nix b/pkgs/servers/openafs/1.6/module.nix index f1acdfcce5a..3354d8508ef 100644 --- a/pkgs/servers/openafs/1.6/module.nix +++ b/pkgs/servers/openafs/1.6/module.nix @@ -70,8 +70,8 @@ in stdenv.mkDerivation { license = licenses.ipl10; platforms = platforms.linux; maintainers = [ maintainers.maggesi maintainers.spacefrogg ]; - broken = versionOlder kernel.version "3.18" || builtins.compareVersions kernel.version "5.0" >= 0 - || stdenv.targetPlatform.isAarch64; + # Package will be removed in 21.03 + broken = true; }; } diff --git a/pkgs/servers/openafs/1.6/srcs.nix b/pkgs/servers/openafs/1.6/srcs.nix index 17048b68024..888cef2f1ea 100644 --- a/pkgs/servers/openafs/1.6/srcs.nix +++ b/pkgs/servers/openafs/1.6/srcs.nix @@ -1,14 +1,14 @@ { fetchurl }: rec { - version = "1.6.23"; + version = "1.6.24"; src = fetchurl { url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "1gy7a0jhagxif8av540xb1aa6cl7id08nsgjbgady54bnmb0viga"; + sha256 = "1dxzc1y5mmx3ap0m94sx80vfs3qxkckid3wc1xm0wr5i6fh7zn1h"; }; srcs = [ src (fetchurl { url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; - sha256 = "18my71s9mddy0k835852ksjzkza7xs73kyxavmdqflh5vkywb6y0"; + sha256 = "0aq9ipqpr2ksmk30h2dc4mlrkrqs16xnmspwfb6xj3rgr1pwszlx"; })]; } From a7e63f2eee45dbd92a2ddbc5dd579ee9c07b087e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Aug 2020 14:06:51 +0000 Subject: [PATCH 091/124] mdbook: 0.4.1 -> 0.4.2 --- 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 a36881f36b5..9dc0a7d443c 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.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "mdBook"; rev = "v${version}"; - sha256 = "0rfcvcz3cawyzhdxqyasd9dwrb8c2j6annpl9jx2n6y3ysl345ry"; + sha256 = "0rkl5k7a9a0vx06jqvbgki2bwag0ar2pcbg3qi88xnjnnmphzpzj"; }; - cargoSha256 = "02vfdr1zlagjya5i9wf6ag9k01cf20jlm4yqvgrpjg9zrwv4xr4s"; + cargoSha256 = "1zhlb6wnjnayq833h62nm3ndlhiz1qajw8w5ccc88b8q8m4ipd7c"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; From 89f51ae94910dacdc4588c9a72239b6ab08a85d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 11 Aug 2020 16:59:07 +0200 Subject: [PATCH 092/124] python.pkgs.construct: 2.9.45 -> 2.10.56 --- .../python-modules/construct/default.nix | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index 59b3eb38afd..1f685360566 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -1,27 +1,24 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub -, six, pytest, arrow +{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder +, six, pytestCheckHook, pytest-benchmark, numpy, arrow, ruamel_yaml }: buildPythonPackage rec { pname = "construct"; - version = "2.9.45"; + version = "2.10.56"; + disabled = pythonOlder "3.6"; + + # no tests in PyPI tarball src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0ig66xrzswpkhhmw123p2nvr15a9lxz54a1fmycfdh09327c1d3y"; + sha256 = "1j4mqwyxkbdcsnnk5bbdcljv855w4fglaqc94q1xdzm8kgjxk4mr"; }; - propagatedBuildInputs = [ six ]; + checkInputs = [ pytestCheckHook pytest-benchmark numpy arrow ruamel_yaml ]; - checkInputs = [ pytest arrow ]; - - # TODO: figure out missing dependencies - doCheck = false; - checkPhase = '' - py.test -k 'not test_numpy and not test_gallery' tests - ''; + pytestFlagsArray = [ "--benchmark-disable" ]; meta = with stdenv.lib; { description = "Powerful declarative parser (and builder) for binary data"; From 57dcbeca980c86894a2a3800fd2627dc0d5a65f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 11 Aug 2020 17:16:25 +0200 Subject: [PATCH 093/124] python.pkgs.pykeepass: fix dependencies --- pkgs/development/python-modules/pykeepass/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix index 93f015e3a57..584c98f6cb0 100644 --- a/pkgs/development/python-modules/pykeepass/default.nix +++ b/pkgs/development/python-modules/pykeepass/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage -, lxml, pycryptodome, construct +, lxml, pycryptodomex, construct , argon2_cffi, dateutil, future }: @@ -12,8 +12,12 @@ buildPythonPackage rec { sha256 = "b3e07eb2dd3aeb1dfa1a2d2d17be77066ee560c1e770f1c72d7ea5608117d284"; }; + postPatch = '' + substituteInPlace setup.py --replace "==" ">=" + ''; + propagatedBuildInputs = [ - lxml pycryptodome construct + lxml pycryptodomex construct argon2_cffi dateutil future ]; From e11d5112226f2f2da5dca8f10a80599095ba222d Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Wed, 29 Jul 2020 16:28:50 +0200 Subject: [PATCH 094/124] python3Packages.scikit-build: 0.10.0 -> 0.11.1 Signed-off-by: Sirio Balmelli --- .../python-modules/scikit-build/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 745723a01bc..6694c3abe4d 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -26,11 +26,11 @@ buildPythonPackage rec { pname = "scikit-build"; - version = "0.10.0"; + version = "0.11.1"; src = fetchPypi { inherit pname version; - sha256 = "7342017cc82dd6178e3b19377389b8a8d1f8b429d9cdb315cfb1094e34a0f526"; + sha256 = "0p4smkl2rbpl00m5va5qa8hp2hqb3284p2cs6k8zlmi4kgbdyh6s"; }; propagatedBuildInputs = [ @@ -59,15 +59,6 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - # scikit-build PR #458. Remove in version > 0.10.0 - patches = [ - (fetchpatch { - name = "python38-platform_linux_distribution-fix-458"; - url = "https://github.com/scikit-build/scikit-build/commit/faa7284e5bc4c72bc8744987acdf3297b5d2e7e4.patch"; - sha256 = "1hgl3cnkf266zaw534b64c88waxfz9721wha0m6j3hsnxk76ayjv"; - }) - ]; - disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) ([ "test_hello_develop" # tries setuptools develop install "test_source_distribution" # pip has no way to install missing dependencies @@ -75,6 +66,7 @@ buildPythonPackage rec { "test_fortran_compiler" # passes if gfortran is available "test_install_command" # tries to alter out path "test_test_command" # tries to alter out path + "test_setup" # tries to install using distutils ]); checkPhase = '' From 300049ca51522a8d74ae5125871e7f85a9eb114e Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 18:09:02 +0200 Subject: [PATCH 095/124] nixos/nginx: move configuration testing script into reload command nginx -t not only verifies configuration, but also creates (and chowns) files. When the `nginx-config-reload` service is used, this can cause directories to be chowned to `root`, causing nginx to fail. This moves the nginx -t command into a second ExecReload command, which runs as nginx's user. While fixing above issue, this will also cause the configuration to be verified when running `systemctl reload nginx`, not only when restarting the dummy `nginx-config-reload` unit. The latter is mostly a workaround for missing features in our activation script anyways. --- nixos/modules/services/web-servers/nginx/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 4c4b7f39e6b..461888c4cc4 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -704,7 +704,10 @@ in ''; serviceConfig = { ExecStart = execCommand; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + ExecReload = [ + "${execCommand} -t" + "${pkgs.coreutils}/bin/kill -HUP $MAINPID" + ]; Restart = "always"; RestartSec = "10s"; StartLimitInterval = "1min"; @@ -761,8 +764,7 @@ in serviceConfig.TimeoutSec = 60; script = '' if /run/current-system/systemd/bin/systemctl -q is-active nginx.service ; then - ${execCommand} -t && \ - /run/current-system/systemd/bin/systemctl reload nginx.service + /run/current-system/systemd/bin/systemctl reload nginx.service fi ''; serviceConfig.RemainAfterExit = true; From 6410d00025dfade9f35ed3bb40d2acc42d66a10a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 11 Aug 2020 13:43:34 -0700 Subject: [PATCH 096/124] python3Packages.cheroot: fix tests --- pkgs/development/python-modules/cheroot/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index d900190a363..6ea7c8dd8ca 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -8,6 +8,7 @@ , pytest-mock , pytest-testmon , requests +, requests-toolbelt , requests-unixsocket , setuptools_scm , setuptools-scm-git-archive @@ -39,10 +40,15 @@ buildPythonPackage rec { pytest-mock pytest-testmon requests + requests-toolbelt requests-unixsocket trustme ]; + # avoid attempting to use 3 packages not available on nixpkgs + # (jaraco.apt, jaraco.context, yg.lockfile) + pytestFlagsArray = [ "--ignore=cheroot/test/test_wsgi.py" ]; + # Disable doctest plugin because times out # Disable xdist (-n arg) because it's incompatible with testmon # Deselect test_bind_addr_unix on darwin because times out From 756e75b25708340c64f59ede7ac93e6ee777d609 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 11 Aug 2020 13:08:16 -0700 Subject: [PATCH 097/124] python3Packages.bids-validator: fix tests --- pkgs/development/python-modules/bids-validator/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index 913ebeee326..bcf45aff832 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -12,7 +12,10 @@ buildPythonPackage rec { sha256 = "b8292f4efb3617532f93c60acfec242150406bfd9e298d7f01187d67c311aa91"; }; - propagatedBuildInputs = [ ]; + # needs packages which are not available in nixpkgs + doCheck = false; + + pythonImportsCheck = [ "bids_validator" ]; meta = with lib; { description = "Validator for the Brain Imaging Data Structure"; From 5880dc0d10d396caf4cc64d4dbaccae26d45ad71 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 11 Aug 2020 13:17:24 -0700 Subject: [PATCH 098/124] python3Packages.pybids: 0.10.2 -> 0.12.0 --- pkgs/development/python-modules/pybids/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index 01c0368662c..92c34c7bd4e 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -15,12 +15,12 @@ }: buildPythonPackage rec { - version = "0.10.2"; + version = "0.12.0"; pname = "pybids"; src = fetchPypi { inherit pname version; - sha256 = "6571ef82e03a958e56aa61cf5b15392f0b2d5dbca92f872061d81524e8da8525"; + sha256 = "0flvrb61hfyjjgdz07dlm8m9pqwb8qrx027zfrwa9d5nw1az7g28"; }; propagatedBuildInputs = [ From fddeb7cb73096786de8e59a8502cf3ae523bd694 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 12 Aug 2020 17:20:56 +0200 Subject: [PATCH 099/124] Revert "nextcloud: use mkDefault for whole nginx config" This breaks the Nextcloud vhost declaration when adding e.g. another vhost as the `services.nginx.virtualHosts` option has `{ nextcloud = ...; }` as *default* value which will be replaced by another `virtualHosts`-declaration with a higher (e.g. the default) priority. The following cases are now supported & covered by the module: * `nginx` is enabled with `nextcloud` enabled and other vhosts can be added / other options can be declared without having to care about the declaration's priority. * Settings in the `nextcloud`-vhost in `nginx` have to be altered using `mkForce` as this is the only way how we officially support `nginx` for `nextcloud` and customizations have to be done explicitly using `mkForce`. * `nginx` will be completely omitted if a user enables nextcloud and disables nginx using `services.nginx.enable = false;`. (because nginx will be enabled by this module using `mkDefault`). This reverts commit 128dbb31cca3ba479396c6b65946e2e6503c0f8d. Closes #95259 --- nixos/modules/services/web-apps/nextcloud.nix | 176 +++++++++--------- 1 file changed, 87 insertions(+), 89 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 0579e58d1d6..d9660852528 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -531,81 +531,65 @@ in { environment.systemPackages = [ occ ]; - services.nginx = mkDefault { - enable = true; - virtualHosts.${cfg.hostName} = { - root = cfg.package; - locations = { - "= /robots.txt" = { - priority = 100; - extraConfig = '' - allow all; - log_not_found off; - access_log off; - ''; - }; - "/" = { - priority = 200; - extraConfig = "rewrite ^ /index.php;"; - }; - "~ ^/store-apps" = { - priority = 201; - extraConfig = "root ${cfg.home};"; - }; - "= /.well-known/carddav" = { - priority = 210; - extraConfig = "return 301 $scheme://$host/remote.php/dav;"; - }; - "= /.well-known/caldav" = { - priority = 210; - extraConfig = "return 301 $scheme://$host/remote.php/dav;"; - }; - "~ ^\\/(?:build|tests|config|lib|3rdparty|templates|data)\\/" = { - priority = 300; - extraConfig = "deny all;"; - }; - "~ ^\\/(?:\\.|autotest|occ|issue|indie|db_|console)" = { - priority = 300; - extraConfig = "deny all;"; - }; - "~ ^\\/(?:index|remote|public|cron|core/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|ocs-provider\\/.+|ocm-provider\\/.+)\\.php(?:$|\\/)" = { - priority = 500; - extraConfig = '' - include ${config.services.nginx.package}/conf/fastcgi.conf; - fastcgi_split_path_info ^(.+\.php)(\\/.*)$; - try_files $fastcgi_script_name =404; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param HTTPS ${if cfg.https then "on" else "off"}; - fastcgi_param modHeadersAvailable true; - fastcgi_param front_controller_active true; - fastcgi_pass unix:${fpm.socket}; - fastcgi_intercept_errors on; - fastcgi_request_buffering off; - fastcgi_read_timeout 120s; - ''; - }; - "~ ^\\/(?:updater|ocs-provider|ocm-provider)(?:$|\\/)".extraConfig = '' - try_files $uri/ =404; - index index.php; - ''; - "~ \\.(?:css|js|woff2?|svg|gif)$".extraConfig = '' - try_files $uri /index.php$request_uri; - add_header Cache-Control "public, max-age=15778463"; - add_header X-Content-Type-Options nosniff; - add_header X-XSS-Protection "1; mode=block"; - add_header X-Robots-Tag none; - add_header X-Download-Options noopen; - add_header X-Permitted-Cross-Domain-Policies none; - add_header X-Frame-Options sameorigin; - add_header Referrer-Policy no-referrer; - access_log off; - ''; - "~ \\.(?:png|html|ttf|ico|jpg|jpeg|bcmap|mp4|webm)$".extraConfig = '' - try_files $uri /index.php$request_uri; + services.nginx.enable = mkDefault true; + services.nginx.virtualHosts.${cfg.hostName} = { + root = cfg.package; + locations = { + "= /robots.txt" = { + priority = 100; + extraConfig = '' + allow all; + log_not_found off; access_log off; ''; }; - extraConfig = '' + "/" = { + priority = 200; + extraConfig = "rewrite ^ /index.php;"; + }; + "~ ^/store-apps" = { + priority = 201; + extraConfig = "root ${cfg.home};"; + }; + "= /.well-known/carddav" = { + priority = 210; + extraConfig = "return 301 $scheme://$host/remote.php/dav;"; + }; + "= /.well-known/caldav" = { + priority = 210; + extraConfig = "return 301 $scheme://$host/remote.php/dav;"; + }; + "~ ^\\/(?:build|tests|config|lib|3rdparty|templates|data)\\/" = { + priority = 300; + extraConfig = "deny all;"; + }; + "~ ^\\/(?:\\.|autotest|occ|issue|indie|db_|console)" = { + priority = 300; + extraConfig = "deny all;"; + }; + "~ ^\\/(?:index|remote|public|cron|core/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|ocs-provider\\/.+|ocm-provider\\/.+)\\.php(?:$|\\/)" = { + priority = 500; + extraConfig = '' + include ${config.services.nginx.package}/conf/fastcgi.conf; + fastcgi_split_path_info ^(.+\.php)(\\/.*)$; + try_files $fastcgi_script_name =404; + fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param HTTPS ${if cfg.https then "on" else "off"}; + fastcgi_param modHeadersAvailable true; + fastcgi_param front_controller_active true; + fastcgi_pass unix:${fpm.socket}; + fastcgi_intercept_errors on; + fastcgi_request_buffering off; + fastcgi_read_timeout 120s; + ''; + }; + "~ ^\\/(?:updater|ocs-provider|ocm-provider)(?:$|\\/)".extraConfig = '' + try_files $uri/ =404; + index index.php; + ''; + "~ \\.(?:css|js|woff2?|svg|gif)$".extraConfig = '' + try_files $uri /index.php$request_uri; + add_header Cache-Control "public, max-age=15778463"; add_header X-Content-Type-Options nosniff; add_header X-XSS-Protection "1; mode=block"; add_header X-Robots-Tag none; @@ -613,25 +597,39 @@ in { add_header X-Permitted-Cross-Domain-Policies none; add_header X-Frame-Options sameorigin; add_header Referrer-Policy no-referrer; - add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always; - error_page 403 /core/templates/403.php; - error_page 404 /core/templates/404.php; - client_max_body_size ${cfg.maxUploadSize}; - fastcgi_buffers 64 4K; - fastcgi_hide_header X-Powered-By; - gzip on; - gzip_vary on; - gzip_comp_level 4; - gzip_min_length 256; - gzip_proxied expired no-cache no-store private no_last_modified no_etag auth; - gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy; - - ${optionalString cfg.webfinger '' - rewrite ^/.well-known/host-meta /public.php?service=host-meta last; - rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; - ''} + access_log off; + ''; + "~ \\.(?:png|html|ttf|ico|jpg|jpeg|bcmap|mp4|webm)$".extraConfig = '' + try_files $uri /index.php$request_uri; + access_log off; ''; }; + extraConfig = '' + add_header X-Content-Type-Options nosniff; + add_header X-XSS-Protection "1; mode=block"; + add_header X-Robots-Tag none; + add_header X-Download-Options noopen; + add_header X-Permitted-Cross-Domain-Policies none; + add_header X-Frame-Options sameorigin; + add_header Referrer-Policy no-referrer; + add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always; + error_page 403 /core/templates/403.php; + error_page 404 /core/templates/404.php; + client_max_body_size ${cfg.maxUploadSize}; + fastcgi_buffers 64 4K; + fastcgi_hide_header X-Powered-By; + gzip on; + gzip_vary on; + gzip_comp_level 4; + gzip_min_length 256; + gzip_proxied expired no-cache no-store private no_last_modified no_etag auth; + gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy; + + ${optionalString cfg.webfinger '' + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + ''} + ''; }; } ]); From 6bb6593adf75bda9e98c3abe1619f0478635c644 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 12 Aug 2020 13:06:34 -0400 Subject: [PATCH 100/124] linux/hardened/patches/4.14: 4.14.190.a -> 4.14.193.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index f6070e77d4c..453e160446a 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,8 +1,8 @@ { "4.14": { - "name": "linux-hardened-4.14.190.a.patch", - "sha256": "0lk0y2nlld4av8xjcsrqla30bflvvkzjz007s47y9hwbdrbn23pp", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.190.a/linux-hardened-4.14.190.a.patch" + "name": "linux-hardened-4.14.193.a.patch", + "sha256": "0hxr4v6ph29p0916dh894aknna5qxszcpz5xrci81xla3i50vy9v", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.193.a/linux-hardened-4.14.193.a.patch" }, "4.19": { "name": "linux-hardened-4.19.135.a.patch", From 3acf7292853b0e41b3e3489261955b0849644e81 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 12 Aug 2020 13:06:39 -0400 Subject: [PATCH 101/124] linux/hardened/patches/4.19: 4.19.135.a -> 4.19.139.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 453e160446a..dd945dd415a 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -5,9 +5,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.193.a/linux-hardened-4.14.193.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.135.a.patch", - "sha256": "1x8fl5imcy7ws3pvispv4g3x88dddb3ah57kib78kk5pqi4w20y8", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.135.a/linux-hardened-4.19.135.a.patch" + "name": "linux-hardened-4.19.139.a.patch", + "sha256": "02kzzzk09kiwimwmq437079kqrh4n76jc7a6q5y33wpvgpacdmc9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.139.a/linux-hardened-4.19.139.a.patch" }, "5.4": { "name": "linux-hardened-5.4.54.a.patch", From 14bb0a744f4c2bb4a1d7be912b19967fcd23a89e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 12 Aug 2020 13:06:42 -0400 Subject: [PATCH 102/124] linux/hardened/patches/5.4: 5.4.54.a -> 5.4.58.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index dd945dd415a..32dfaed3be7 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -10,9 +10,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.139.a/linux-hardened-4.19.139.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.54.a.patch", - "sha256": "16h3iiqf6z8v6bbymxrp36w15qil5lfr6y48vwh99dx1yyrgdyzp", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.54.a/linux-hardened-5.4.54.a.patch" + "name": "linux-hardened-5.4.58.a.patch", + "sha256": "0f2ll67skk78jxz7h8mxppq11giy2y0h2xw3pcp01dmnsci67vzj", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.58.a/linux-hardened-5.4.58.a.patch" }, "5.7": { "name": "linux-hardened-5.7.11.a.patch", From 612c48592d7f6665ee771043910b2592f0215919 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 12 Aug 2020 13:06:45 -0400 Subject: [PATCH 103/124] linux/hardened/patches/5.7: 5.7.11.a -> 5.7.15.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 32dfaed3be7..ac8ab628680 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -15,8 +15,8 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.58.a/linux-hardened-5.4.58.a.patch" }, "5.7": { - "name": "linux-hardened-5.7.11.a.patch", - "sha256": "0vamaqrcs8nq8pjgq86lrxq0cdkr5kp4vydp8z2sr27q7ninnrla", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.11.a/linux-hardened-5.7.11.a.patch" + "name": "linux-hardened-5.7.15.a.patch", + "sha256": "052zwbgx2jbby7cqab45hvbnqr6mbkz0i17hncj94jsy15ghp6ir", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.15.a/linux-hardened-5.7.15.a.patch" } } From 957da625c5e268083ca5d41d0042e76f23857e00 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 12 Aug 2020 19:16:05 +0200 Subject: [PATCH 104/124] nixos/gollum: replace toFile with writeText --- nixos/modules/services/misc/gollum.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix index f4a9c72b154..8842e1e4d90 100644 --- a/nixos/modules/services/misc/gollum.nix +++ b/nixos/modules/services/misc/gollum.nix @@ -98,7 +98,7 @@ in ${pkgs.gollum}/bin/gollum \ --port ${toString cfg.port} \ --host ${cfg.address} \ - --config ${builtins.toFile "gollum-config.rb" cfg.extraConfig} \ + --config ${pkgs.writeText "gollum-config.rb" cfg.extraConfig} \ --ref ${cfg.branch} \ ${optionalString cfg.mathjax "--mathjax"} \ ${optionalString cfg.emoji "--emoji"} \ From f61a2ea8ff71de8a99f85da42e5aee7ccc77bf01 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Aug 2020 17:17:39 +0000 Subject: [PATCH 105/124] procs: 0.10.3 -> 0.10.4 --- pkgs/tools/admin/procs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index 5bfbb6d8c64..54bdf238e3f 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "0lg4v32jx0fxcjz6cj6cxxlg7rhj75k4p75izpkk4l11xpxqhgjm"; + sha256 = "1a28kkxcrdfmrq2mmsfkdxfp3msklwga5nbfhjb7a7s64xh8jmjv"; }; - cargoSha256 = "05qqy6l28ihn7hykkkh1x7z3q58cdrwv76fc22xjcg20985ac2nx"; + cargoSha256 = "1xlxjr0pkwlzm7f5xlrsf76in28r9jj41n6gn44vxqbh4x161gs1"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; From 866eedcb69fbdd3c4fe278210deb008a027bce1f Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Wed, 12 Aug 2020 10:47:01 -0700 Subject: [PATCH 106/124] bazel_3: use less resources when building Bazel (#95214) Limit the resources Bazel is allowed to use during the build to 1/2 the available RAM and 3/4 the available CPU cores. This should help avoid overwhelming the build machine. --- .../tools/build-managers/bazel/bazel_3/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix index 60c1662f9ff..845469e1c7d 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix @@ -419,6 +419,12 @@ stdenv.mkDerivation rec { # add nix environment vars to .bazelrc cat >> .bazelrc < Date: Wed, 12 Aug 2020 17:50:50 +0000 Subject: [PATCH 107/124] pure-prompt: 1.12.0 -> 1.13.0 --- pkgs/shells/zsh/pure-prompt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/pure-prompt/default.nix b/pkgs/shells/zsh/pure-prompt/default.nix index 5696ed61b97..bfcd3be5e9c 100644 --- a/pkgs/shells/zsh/pure-prompt/default.nix +++ b/pkgs/shells/zsh/pure-prompt/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "pure-prompt"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "sindresorhus"; repo = "pure"; rev = "v${version}"; - sha256 = "1h04z7rxmca75sxdfjgmiyf1b5z2byfn6k4srls211l0wnva2r5y"; + sha256 = "16q9v4c8lagp4vxm7qhagilqnwf1g4pbds56x5wfj4cwc0x2gclw"; }; installPhase = '' @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Pretty, minimal and fast ZSH prompt"; - homepage = https://github.com/sindresorhus/pure; + homepage = "https://github.com/sindresorhus/pure"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ pacien pablovsky ]; From ebea92b8db53518291ed34934e99ac39faade0ac Mon Sep 17 00:00:00 2001 From: oxalica Date: Thu, 13 Aug 2020 02:02:14 +0800 Subject: [PATCH 108/124] rust-analyzer: 2020-08-03 -> 2020-08-10 --- pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 8302d0a111e..5424d8d2a33 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2020-08-03"; + rev = "2020-08-10"; version = "unstable-${rev}"; - sha256 = "07xd9gwzjqnjsb5rnxfa9vxc6dmh04mbd1dcwxsz9fv9dcnsx21l"; - cargoSha256 = "0sa8yd3a6y2505w0n9l7d1v03c7dl07zw78fx5r3f4p3lc65n8b4"; + sha256 = "0hf9gpvgq7whrc5gnfhc0wjqddp3xpi3azvdccb4yql2pcznz3rh"; + cargoSha256 = "1bwch08y2av7aj2l5pvhdxdq24c8favxppz5zcd88rx4brlwn2bq"; }; rust-analyzer = callPackage ./wrapper.nix {} { From d4762bf54b26332fc5f96ee7360808edda8f3f98 Mon Sep 17 00:00:00 2001 From: devhell Date: Mon, 10 Aug 2020 10:51:30 +0100 Subject: [PATCH 109/124] profanity: 0.8.1 -> 0.9.5 Changelog can be found here: https://github.com/profanity-im/profanity/blob/master/CHANGELOG --- .../instant-messengers/profanity/default.nix | 12 +++--- .../profanity/patches/undefined-macros.patch | 40 ------------------- 2 files changed, 7 insertions(+), 45 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 86e760d497c..52172bd8be7 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, openssl , glibcLocales, expect, ncurses, libotr, curl, readline, libuuid -, cmocka, libmicrohttpd, stabber, expat, libmesode +, cmocka, libmicrohttpd, expat, sqlite, libmesode , autoconf-archive , autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null @@ -22,16 +22,18 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "profanity"; - version = "0.8.1"; + version = "0.9.5"; src = fetchFromGitHub { owner = "profanity-im"; repo = "profanity"; rev = version; - sha256 = "0fg5xcdlvhsi7a40w4jcxyj7m7wl42jy1cvsa8fi2gb6g9y568k8"; + sha256 = "14vbblf639f90bb4npg2xv53cpvk9am9ic4pmc1vnv4m3zsndjg5"; }; - patches = [ ./patches/packages-osx.patch ./patches/undefined-macros.patch ]; + patches = [ + ./patches/packages-osx.patch + ]; enableParallelBuilding = true; @@ -41,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ expect readline libuuid glib openssl expat ncurses libotr - curl libmesode cmocka libmicrohttpd stabber + curl libmesode cmocka libmicrohttpd sqlite ] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ] ++ optionals notifySupport [ libnotify gdk-pixbuf ] ++ optionals traySupport [ gnome2.gtk ] diff --git a/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch b/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch deleted file mode 100644 index 9ef4e7bebe5..00000000000 --- a/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 1e55b1cc..0832a387 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -83,12 +81,12 @@ elif test "x$enable_python_plugins" != xno; then - AM_CONDITIONAL([BUILD_PYTHON_API], [true]) - AC_DEFINE([HAVE_PYTHON], [1], [Python support]) - else -- if test "x$enable_python_plugins" = xyes; then -- AC_MSG_ERROR([Python not found, cannot enable Python plugins.]) -- else -- AM_CONDITIONAL([BUILD_PYTHON_API], [false]) -- AC_MSG_NOTICE([Python development package not found, Python plugin support disabled.]) -- fi -+ AS_IF( -+ [test "x$enable_python_plugins" = xyes], -+ [], -+ [AM_CONDITIONAL([BUILD_PYTHON_API], [false]) -+ AC_MSG_NOTICE([Python development package not found, Python plugin support disabled.])] -+ ) - fi - AS_IF([test "x$PLATFORM" = xosx], [rm -f Python.framework]) - else -@@ -107,7 +105,7 @@ else - [AM_CONDITIONAL([BUILD_C_API], [true]) LIBS="$LIBS -ldl" AC_DEFINE([HAVE_C], [1], [C support])], - [AS_IF( - [test "x$enable_c_plugins" = xyes], -- [AC_MSG_ERROR([dl library needed to run C plugins])], -+ [], - [AM_CONDITIONAL([BUILD_C_API], [false])]) - ]) - else -@@ -116,7 +114,6 @@ else - fi - - # threading --ACX_PTHREAD([], [AC_MSG_ERROR([pthread is required])]) - LIBS="$PTHREAD_LIBS $LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - AS_IF([test "x$PTHREAD_CC" != x], [ CC="$PTHREAD_CC" ]) From f0ba8274d4bf00e59d1b06c97afdfb1c55a1fcd5 Mon Sep 17 00:00:00 2001 From: "Maxine E. Aubrey" Date: Wed, 12 Aug 2020 21:46:32 +0200 Subject: [PATCH 110/124] nomad: 0.11.3 -> 0.11.4, 0.12.2 adds multiversion support, defaults to 0.11 --- .../networking/cluster/nomad/default.nix | 22 +++++++++++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 990679a8668..1d3b8e32ba3 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -1,8 +1,23 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, majorVersion ? "0.11" }: + +let + versionMap = { + "0.11" = { + version = "0.11.4"; + sha256 = "1sykp9sji6f564s7bz0cvnr9w5x92n0l1r1djf1bl7jvv2mi1mcb"; + }; + "0.12" = { + version = "0.12.2"; + sha256 = "1gc286ag6plk5kxw7jzr32cp3n5rwydj1z7rds1rfd0fyq7an404"; + }; + }; +in + +with versionMap.${majorVersion}; buildGoPackage rec { pname = "nomad"; - version = "0.11.3"; + inherit version; rev = "v${version}"; goPackagePath = "github.com/hashicorp/nomad"; @@ -11,8 +26,7 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "hashicorp"; repo = pname; - inherit rev; - sha256 = "1p7g7x2gl77h1w7aip3xji3s530fj46gspargz4j3i6h4wkyvafb"; + inherit rev sha256; }; # ui: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 878615936ce..b58f7864b75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5608,7 +5608,9 @@ in noip = callPackage ../tools/networking/noip { }; - nomad = callPackage ../applications/networking/cluster/nomad { }; + nomad = nomad_0_11; + nomad_0_11 = callPackage ../applications/networking/cluster/nomad { majorVersion = "0.11"; }; + nomad_0_12 = callPackage ../applications/networking/cluster/nomad { majorVersion = "0.12"; }; notable = callPackage ../applications/misc/notable { }; From b02225db765095c677b9b9164ae3e0b1f41c1192 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Wed, 12 Aug 2020 13:27:20 -0700 Subject: [PATCH 111/124] cocoapods-beta: 1.10.0.beta.1 -> 1.10.0.beta.2 --- .../mobile/cocoapods/Gemfile-beta.lock | 11 +++++------ .../mobile/cocoapods/gemset-beta.nix | 18 +++++++++--------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index 927265ce98b..98963ba4128 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -14,11 +14,10 @@ GEM json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.10.0.beta.1) - activesupport (> 5) + cocoapods (1.10.0.beta.2) addressable (~> 2.6) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.10.0.beta.1) + cocoapods-core (= 1.10.0.beta.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -33,7 +32,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.17.0, < 2.0) - cocoapods-core (1.10.0.beta.1) + cocoapods-core (1.10.0.beta.2) activesupport (> 5.0, < 6) addressable (~> 2.6) algoliasearch (~> 1.0) @@ -53,7 +52,7 @@ GEM netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.6) + concurrent-ruby (1.1.7) escape (0.0.4) ethon (0.12.0) ffi (>= 1.3.0) @@ -77,7 +76,7 @@ GEM ethon (>= 0.9.0) tzinfo (1.2.7) thread_safe (~> 0.1) - xcodeproj (1.17.1) + xcodeproj (1.18.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix index 85df7053421..b456f728b4c 100644 --- a/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -63,15 +63,15 @@ version = "1.0.3"; }; cocoapods = { - dependencies = ["activesupport" "addressable" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; + dependencies = ["addressable" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mx6gzs1d9za7crgwmk37ybmn395055kzya88iamgcj3yzvv3sqg"; + sha256 = "0jf5q75h410b6gymy86j4zy9yhb6n28wa7hrk8p7y2dsafdzbric"; type = "gem"; }; - version = "1.10.0.beta.1"; + version = "1.10.0.beta.2"; }; cocoapods-core = { dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; @@ -79,10 +79,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ibc5sx2iqjwrgmd4y2cq6hyd6s37aqyh2w61vw71ap8khcjnwh4"; + sha256 = "0vrw6v5fp0m903ghvfwaw3mbxrr68x7hz9bj34rj4icirwp4ifyl"; type = "gem"; }; - version = "1.10.0.beta.1"; + version = "1.10.0.beta.2"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -161,10 +161,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; + sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; type = "gem"; }; - version = "1.1.6"; + version = "1.1.7"; }; escape = { groups = ["default"]; @@ -366,9 +366,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mv5rsbgwq4vzri31w2f1474arrsr5j69rdhklrci6jnjps8dmx9"; + sha256 = "18idiqfbvyrcyflccwy4qw125psckrnqy7ggci33m8f3zs8h7hnm"; type = "gem"; }; - version = "1.17.1"; + version = "1.18.0"; }; } \ No newline at end of file From 86e0c0872c0ee6a0d3549d4f80ac0612186f34c2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Aug 2020 20:53:26 +0000 Subject: [PATCH 112/124] taskell: 1.9.4 -> 1.10.0 --- pkgs/applications/misc/taskell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/taskell/default.nix b/pkgs/applications/misc/taskell/default.nix index 2a083f45731..c8974c5c275 100644 --- a/pkgs/applications/misc/taskell/default.nix +++ b/pkgs/applications/misc/taskell/default.nix @@ -1,8 +1,8 @@ { lib, haskellPackages, fetchFromGitHub }: let - version = "1.9.4"; - sha256 = "0k8s1f0c99fz6jmqi6jqscsfxrrijnnpyw4jcj8zxpdf0sc07gca"; + version = "1.10.0"; + sha256 = "102iwn6011rypdlx07fzbdll3r5cd204qf96lzwkadvjb7h8clil"; in (haskellPackages.mkDerivation { pname = "taskell"; From f9a5d8539d6210d273783686dca6314ddab57d12 Mon Sep 17 00:00:00 2001 From: Konstantin Alekseev Date: Wed, 12 Aug 2020 15:37:20 +0300 Subject: [PATCH 113/124] neovim: fix node neovim binary link --- pkgs/applications/editors/neovim/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 0ac90a8b345..e3c03c92e58 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -138,7 +138,7 @@ let ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby '' + optionalString withNodeJs '' - ln -s ${nodePackages.neovim}/bin/neovim-node $out/bin/nvim-node + ln -s ${nodePackages.neovim}/bin/neovim-node-host $out/bin/nvim-node '' + optionalString vimAlias '' ln -s $out/bin/nvim $out/bin/vim From 044b15424ca60ee308c38e76ab65163d3d7ce090 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Aug 2020 21:26:22 +0000 Subject: [PATCH 114/124] terraform-ls: 0.5.4 -> 0.6.0 --- pkgs/development/tools/misc/terraform-ls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index 2a8f9ef40bd..fe928bd3933 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "terraform-ls"; - version = "0.5.4"; + version = "0.6.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "05cij0qh1czxnms4zjyycidx84brsmlqw1c6fpk5yv58g3v8d3v7"; + sha256 = "0bb6bpdjp9yzbxvc6mz22lawn41ay0frdpgbd7zrm8nkvspc0rl7"; }; goPackagePath = "github.com/hashicorp/terraform-ls"; From b286ef9ff48f0020110ac6086c70aca3e9364379 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Aug 2020 21:32:57 +0000 Subject: [PATCH 115/124] tfsec: 0.24.1 -> 0.25.0 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 72815750f21..61ed0e07af5 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.24.1"; + version = "0.25.0"; src = fetchFromGitHub { owner = "liamg"; repo = pname; rev = "v${version}"; - sha256 = "10sl3gpjvgjigkb0v35w96xm414widh0ygb6pnzgyz1ph8ilm86p"; + sha256 = "06sr20zrbhyj35cyw64bk6sjj9q9lh52kc8wg1ryaimr3dc6lrn1"; }; goPackagePath = "github.com/liamg/tfsec"; From 3fa125ba769be3e071a5b30c83c0999dcf698793 Mon Sep 17 00:00:00 2001 From: "Maxine E. Aubrey" Date: Wed, 12 Aug 2020 23:58:18 +0200 Subject: [PATCH 116/124] nomad: restructure to use multiple files as per request in PR comments, used generic.nix with version files --- .../networking/cluster/nomad/0.11.nix | 6 ++++++ .../networking/cluster/nomad/0.12.nix | 6 ++++++ .../cluster/nomad/{default.nix => generic.nix} | 17 +---------------- pkgs/top-level/all-packages.nix | 4 ++-- 4 files changed, 15 insertions(+), 18 deletions(-) create mode 100644 pkgs/applications/networking/cluster/nomad/0.11.nix create mode 100644 pkgs/applications/networking/cluster/nomad/0.12.nix rename pkgs/applications/networking/cluster/nomad/{default.nix => generic.nix} (74%) diff --git a/pkgs/applications/networking/cluster/nomad/0.11.nix b/pkgs/applications/networking/cluster/nomad/0.11.nix new file mode 100644 index 00000000000..9d0f2248ddc --- /dev/null +++ b/pkgs/applications/networking/cluster/nomad/0.11.nix @@ -0,0 +1,6 @@ +{ callPackage }: + +callPackage ./generic.nix { + version = "0.11.4"; + sha256 = "1sykp9sji6f564s7bz0cvnr9w5x92n0l1r1djf1bl7jvv2mi1mcb"; +} diff --git a/pkgs/applications/networking/cluster/nomad/0.12.nix b/pkgs/applications/networking/cluster/nomad/0.12.nix new file mode 100644 index 00000000000..ae131702df6 --- /dev/null +++ b/pkgs/applications/networking/cluster/nomad/0.12.nix @@ -0,0 +1,6 @@ +{ callPackage }: + +callPackage ./generic.nix { + version = "0.12.2"; + sha256 = "1gc286ag6plk5kxw7jzr32cp3n5rwydj1z7rds1rfd0fyq7an404"; +} diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/generic.nix similarity index 74% rename from pkgs/applications/networking/cluster/nomad/default.nix rename to pkgs/applications/networking/cluster/nomad/generic.nix index 1d3b8e32ba3..0bfdb0b27f6 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/generic.nix @@ -1,19 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, majorVersion ? "0.11" }: - -let - versionMap = { - "0.11" = { - version = "0.11.4"; - sha256 = "1sykp9sji6f564s7bz0cvnr9w5x92n0l1r1djf1bl7jvv2mi1mcb"; - }; - "0.12" = { - version = "0.12.2"; - sha256 = "1gc286ag6plk5kxw7jzr32cp3n5rwydj1z7rds1rfd0fyq7an404"; - }; - }; -in - -with versionMap.${majorVersion}; +{ stdenv, buildGoPackage, fetchFromGitHub, version, sha256 }: buildGoPackage rec { pname = "nomad"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b58f7864b75..854aca3a622 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5609,8 +5609,8 @@ in noip = callPackage ../tools/networking/noip { }; nomad = nomad_0_11; - nomad_0_11 = callPackage ../applications/networking/cluster/nomad { majorVersion = "0.11"; }; - nomad_0_12 = callPackage ../applications/networking/cluster/nomad { majorVersion = "0.12"; }; + nomad_0_11 = callPackage ../applications/networking/cluster/nomad/0.11.nix { }; + nomad_0_12 = callPackage ../applications/networking/cluster/nomad/0.12.nix { }; notable = callPackage ../applications/misc/notable { }; From d89dc0ac2cdae85d2c340a818dbe1b77e70ce5ea Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Aug 2020 22:13:07 +0000 Subject: [PATCH 117/124] ugrep: 2.5.0 -> 2.5.1 --- pkgs/tools/text/ugrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 95399006dbb..3f3cbd8efcd 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "0aps4srdss71p6riixcdk50f2484bmq6p2kg95gcb8wbcv3ad3c9"; + sha256 = "0z62rqcvcz8iy6ig7y05gn90m0pn99jc0ll9b82kdbr257kz91r1"; }; buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ]; From 7dad46555c3e57391f9916b6c097ae93d14a488e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Aug 2020 22:30:16 +0000 Subject: [PATCH 118/124] vips: 8.9.2 -> 8.10.0 --- pkgs/tools/graphics/vips/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 1bfb2f88020..334cb00f3c1 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.9.2"; + version = "8.10.0"; outputs = [ "bin" "out" "man" "dev" ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "0pgvcp5yjk96izh7kjfprjd9kddx7zqrwwhm8dyalhrwbmj6c2q5"; + sha256 = "1v5kfmv1vmzyvz1198jm1kl763s2i3mgnsn69vh6dslasbh769di"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' From b24c7c5306dd27cc183e2682105b6402bf646933 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 8 Aug 2020 13:12:13 -0400 Subject: [PATCH 119/124] geos: fix build on 32-bit ARM --- pkgs/development/libraries/geos/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 4e7ce1d5ac8..60fc4067c0c 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ python ]; + # https://trac.osgeo.org/geos/ticket/993 + configureFlags = stdenv.lib.optional stdenv.isAarch32 "--disable-inline"; + meta = with stdenv.lib; { description = "C++ port of the Java Topology Suite (JTS)"; homepage = "https://trac.osgeo.org/geos"; From a45f1453eb44968ca7c3f2a316951e6947187ee2 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Fri, 24 Jul 2020 14:03:23 -0400 Subject: [PATCH 120/124] postfix: add useDane config option --- nixos/modules/services/mail/postfix.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index ad10ba1d909..fd4d16cdc37 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -25,6 +25,8 @@ let clientRestrictions = concatStringsSep ", " (clientAccess ++ dnsBl); + smtpTlsSecurityLevel = if cfg.useDane then "dane" else "may"; + mainCf = let escape = replaceStrings ["$"] ["$$"]; mkList = items: "\n " + concatStringsSep ",\n " items; @@ -508,6 +510,14 @@ in ''; }; + useDane = mkOption { + type = types.bool; + default = false; + description = '' + Sets smtp_tls_security_level to "dane" rather than "may". See postconf(5) for details. + ''; + }; + sslCert = mkOption { type = types.str; default = ""; @@ -809,13 +819,13 @@ in // optionalAttrs cfg.enableHeaderChecks { header_checks = [ "regexp:/etc/postfix/header_checks" ]; } // optionalAttrs (cfg.tlsTrustedAuthorities != "") { smtp_tls_CAfile = cfg.tlsTrustedAuthorities; - smtp_tls_security_level = "may"; + smtp_tls_security_level = smtpTlsSecurityLevel; } // optionalAttrs (cfg.sslCert != "") { smtp_tls_cert_file = cfg.sslCert; smtp_tls_key_file = cfg.sslKey; - smtp_tls_security_level = "may"; + smtp_tls_security_level = smtpTlsSecurityLevel; smtpd_tls_cert_file = cfg.sslCert; smtpd_tls_key_file = cfg.sslKey; From 0402ad70cf277fc43f47940980af82cf6c902b61 Mon Sep 17 00:00:00 2001 From: Atemu Date: Thu, 13 Aug 2020 01:19:36 +0200 Subject: [PATCH 121/124] jc: 1.13.1 -> 1.13.4 --- pkgs/development/python-modules/jc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index ae1cc51eab1..e37f5bc7e62 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.13.1"; + version = "1.13.4"; disabled = isPy27; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = "jc"; rev = "v${version}"; - sha256 = "1q5s81izfvxlifa0kzj2qih03d4d0gf7jxkilrcv40rsag5jfb16"; + sha256 = "0rwvyyrdnw43pixp8h51rncq2inc9pbbj1j2191y5si00pjw34zr"; }; propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; From 06cc849acb36255f032f7f84df9427e73c046d5d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 13 Aug 2020 03:47:30 +0000 Subject: [PATCH 122/124] bitwarden: 1.19.0 -> 1.20.1 --- 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 ff55ad6691d..4e087ee631e 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -16,11 +16,11 @@ let pname = "bitwarden"; version = { - x86_64-linux = "1.19.0"; + x86_64-linux = "1.20.1"; }.${system} or ""; sha256 = { - x86_64-linux = "16qlgnqyi0jwzlz8wg2628jhh83xsk46bl6p4dnwi0ay07lhab9w"; + x86_64-linux = "1lywslkpgg9rxwz7kwfknkgdi0r47j14i420r5yxgkaizb7ww27z"; }.${system} or ""; meta = with stdenv.lib; { From b427aa0344f4e7cc8f7e205344e10146a2709290 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 13 Aug 2020 05:18:10 +0000 Subject: [PATCH 123/124] twitterBootstrap: 4.5.0 -> 4.5.2 --- pkgs/development/web/twitter-bootstrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix index 87a25ef0bf9..336e5af5a4b 100644 --- a/pkgs/development/web/twitter-bootstrap/default.nix +++ b/pkgs/development/web/twitter-bootstrap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bootstrap"; - version = "4.5.0"; + version = "4.5.2"; src = fetchurl { url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip"; - sha256 = "0wnz7112qfar5qaadxbsp2qpcjaqn0mmzi4j0v4z6rx6lyvar5mb"; + sha256 = "03brvh7fir9ylfr0c5b6kvf79bkjny0wxw4r5q8x8h2niycrkazg"; }; buildInputs = [ unzip ]; From 01cf3b41aa975111db09fb54dab0a8e57b95502a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 13 Aug 2020 08:12:43 +0200 Subject: [PATCH 124/124] knot-dns: add libmaxminddb dependency It's really small and some people might find it useful. (If needed, its output could be split to make it even smaller.) --- pkgs/servers/dns/knot-dns/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 3dc6fd3e2c7..6a602883b35 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring -, systemd, nettle, libedit, zlib, libiconv, libintl +, systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb , autoreconfHook }: @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { gnutls liburcu libidn2 libunistring nettle libedit libiconv lmdb libintl + libmaxminddb # optional for geoip module (it's tiny) # without sphinx &al. for developer documentation ] ++ optionals stdenv.isLinux [ libcap_ng systemd ]