From 2e78828824700941d17cce00a41f605a7913b0cd Mon Sep 17 00:00:00 2001 From: Thomas Friese Date: Fri, 17 Jul 2020 11:58:37 +0200 Subject: [PATCH 01/29] bitwig-studio3: 3.2.2 -> 3.2.4 --- pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 0ca556a16ef..e93ecd0c530 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -2,11 +2,11 @@ bitwig-studio1.overrideAttrs (oldAttrs: rec { name = "bitwig-studio-${version}"; - version = "3.2.2"; + version = "3.2.4"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "10zb78n75nbriyjah0m3syv3rv7qwbmj590z24hss7lifa3rs784"; + sha256 = "11ilcsah79p8v9bpz2r6mk3c6glrwm3idx8n2k4cwvldsg2yvifl"; }; buildInputs = oldAttrs.buildInputs ++ [ xorg.libXtst ]; From 55c5c222c2e92bd6e40f0e31288844b7d45028db Mon Sep 17 00:00:00 2001 From: Thomas Friese Date: Sat, 18 Jul 2020 22:13:42 +0200 Subject: [PATCH 02/29] bitwig-studio3: 3.2.2 -> 3.2.6 --- pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index e93ecd0c530..ee060602c82 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -2,11 +2,11 @@ bitwig-studio1.overrideAttrs (oldAttrs: rec { name = "bitwig-studio-${version}"; - version = "3.2.4"; + version = "3.2.6"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "11ilcsah79p8v9bpz2r6mk3c6glrwm3idx8n2k4cwvldsg2yvifl"; + sha256 = "00hrbgnjns3s8lbjbabwwqvbwz4dlrg33cs3d1qlpzgi3y72h3nn"; }; buildInputs = oldAttrs.buildInputs ++ [ xorg.libXtst ]; From 930f197e537659e3f537f61aaeffb5cff15b07fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 8 Aug 2020 12:17:38 +0200 Subject: [PATCH 03/29] amdvlk: 2020.Q3.2 -> 2020.Q3.3 Changelog: https://github.com/GPUOpen-Drivers/AMDVLK/releases/tag/v-2020.Q3.3 --- pkgs/development/libraries/amdvlk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 506e3e2535f..a8059c61e34 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2020.Q3.2"; + version = "2020.Q3.3"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "1mki4lxy981g1rz9d6w18dv1hf3ldch5gld2vb7injn5ipp6z2y3"; + sha256 = "0s5a294gzcz438gmafirk3czrjcahv3imsg41k3vk83x4dbdlhxv"; }; buildInputs = [ From 506cb9592bddbdc6422d868ac500bc7bf0b44005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 8 Aug 2020 12:18:21 +0200 Subject: [PATCH 04/29] amdvlk: add meta.changelog --- pkgs/development/libraries/amdvlk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index a8059c61e34..6388cc0564b 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -78,6 +78,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "AMD Open Source Driver For Vulkan"; homepage = "https://github.com/GPUOpen-Drivers/AMDVLK"; + changelog = "https://github.com/GPUOpen-Drivers/AMDVLK/releases/tag/v-${version}"; license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ Flakebi ]; From 40f8b2d2eef3229a24ae56d7a17a97a679bc9efd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 8 Aug 2020 12:44:58 +0200 Subject: [PATCH 05/29] amdvlk: add danieldk as a maintainer --- pkgs/development/libraries/amdvlk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 6388cc0564b..d4a717e384b 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -81,6 +81,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/GPUOpen-Drivers/AMDVLK/releases/tag/v-${version}"; license = licenses.mit; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ Flakebi ]; + maintainers = with maintainers; [ danieldk Flakebi ]; }; } From ffd18cc1b19fbf08d0a72341061b63a33ba51eaf Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Thu, 23 Jul 2020 18:12:58 +0200 Subject: [PATCH 06/29] nixos/usbguard: rework Use StateDirectory to create necessary directories and hardcode some paths. Also drop file based audit logs, they can be found in the journal. And add module option deprecation messages. --- nixos/doc/manual/release-notes/rl-2009.xml | 5 + nixos/modules/services/security/usbguard.nix | 120 ++++++++----------- 2 files changed, 54 insertions(+), 71 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index d97e810b94c..3a411808953 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -629,6 +629,11 @@ services.postgresql.dataDir = "/var/db/postgresql"; + + + The USBGuard module now removes options and instead hardcodes values for IPCAccessControlFiles, ruleFiles, and auditFilePath. Audit logs can be found in the journal. + + diff --git a/nixos/modules/services/security/usbguard.nix b/nixos/modules/services/security/usbguard.nix index f4118eb87fc..16a90da5231 100644 --- a/nixos/modules/services/security/usbguard.nix +++ b/nixos/modules/services/security/usbguard.nix @@ -1,37 +1,39 @@ -{config, lib, pkgs, ... }: +{ config, lib, pkgs, ... }: with lib; - let - cfg = config.services.usbguard; # valid policy options policy = (types.enum [ "allow" "block" "reject" "keep" "apply-policy" ]); + defaultRuleFile = "/var/lib/usbguard/rules.conf"; + # decide what file to use for rules - ruleFile = if cfg.rules != null then pkgs.writeText "usbguard-rules" cfg.rules else cfg.ruleFile; + ruleFile = if cfg.rules != null then pkgs.writeText "usbguard-rules" cfg.rules else defaultRuleFile; daemonConf = '' - # generated by nixos/modules/services/security/usbguard.nix - RuleFile=${ruleFile} - ImplicitPolicyTarget=${cfg.implictPolicyTarget} - PresentDevicePolicy=${cfg.presentDevicePolicy} - PresentControllerPolicy=${cfg.presentControllerPolicy} - InsertedDevicePolicy=${cfg.insertedDevicePolicy} - RestoreControllerDeviceState=${if cfg.restoreControllerDeviceState then "true" else "false"} - # this does not seem useful for endusers to change - DeviceManagerBackend=uevent - IPCAllowedUsers=${concatStringsSep " " cfg.IPCAllowedUsers} - IPCAllowedGroups=${concatStringsSep " " cfg.IPCAllowedGroups} - IPCAccessControlFiles=${cfg.IPCAccessControlFiles} - DeviceRulesWithPort=${if cfg.deviceRulesWithPort then "true" else "false"} - AuditFilePath=${cfg.auditFilePath} - ''; + # generated by nixos/modules/services/security/usbguard.nix + RuleFile=${ruleFile} + ImplicitPolicyTarget=${cfg.implictPolicyTarget} + PresentDevicePolicy=${cfg.presentDevicePolicy} + PresentControllerPolicy=${cfg.presentControllerPolicy} + InsertedDevicePolicy=${cfg.insertedDevicePolicy} + RestoreControllerDeviceState=${if cfg.restoreControllerDeviceState then "true" else "false"} + # this does not seem useful for endusers to change + DeviceManagerBackend=uevent + IPCAllowedUsers=${concatStringsSep " " cfg.IPCAllowedUsers} + IPCAllowedGroups=${concatStringsSep " " cfg.IPCAllowedGroups} + IPCAccessControlFiles=/var/lib/usbguard/IPCAccessControl.d/ + DeviceRulesWithPort=${if cfg.deviceRulesWithPort then "true" else "false"} + # HACK: that way audit logs still land in the journal + AuditFilePath=/dev/null + ''; - daemonConfFile = pkgs.writeText "usbguard-daemon-conf" daemonConf; + daemonConfFile = pkgs.writeText "usbguard-daemon-conf" daemonConf; -in { +in +{ ###### interface @@ -49,22 +51,6 @@ in { ''; }; - ruleFile = mkOption { - type = types.path; - default = "/var/lib/usbguard/rules.conf"; - description = '' - The USBGuard daemon will use this file to load the policy rule set - from it and to write new rules received via the IPC interface. - - Running the command usbguard generate-policy as - root will generate a config for your currently plugged in devices. - For a in depth guide consult the official documentation. - - Setting the rules option will ignore the - ruleFile option. - ''; - }; - rules = mkOption { type = types.nullOr types.lines; default = null; @@ -72,16 +58,20 @@ in { allow with-interface equals { 08:*:* } ''; description = '' - The USBGuard daemon will load this policy rule set. Modifying it via - the IPC interface won't work if you use this option, since the - contents of this option will be written into the nix-store it will be - read-only. + The USBGuard daemon will load this as the policy rule set. + As these rules are NixOS managed they are immutable and can't + be changed by the IPC interface. - You can still use usbguard generate-policy to - generate rules, but you would have to insert them here. + If you do not set this option, the USBGuard daemon will load + it's policy rule set from ${defaultRuleFile}. + This file can be changed manually or via the IPC interface. - Setting the rules option will ignore the - ruleFile option. + Running usbguard generate-policy as root will + generate a config for your currently plugged in devices. + + For more details see + usbguard-rules.conf + 5. ''; }; @@ -155,17 +145,6 @@ in { ''; }; - IPCAccessControlFiles = mkOption { - type = types.path; - default = "/var/lib/usbguard/IPCAccessControl.d/"; - description = '' - The files at this location will be interpreted by the daemon as IPC - access control definition files. See the IPC ACCESS CONTROL section - in usbguard-daemon.conf - 5 for more details. - ''; - }; - deviceRulesWithPort = mkOption { type = types.bool; default = false; @@ -173,14 +152,6 @@ in { Generate device specific rules including the "via-port" attribute. ''; }; - - auditFilePath = mkOption { - type = types.path; - default = "/var/log/usbguard/usbguard-audit.log"; - description = '' - USBGuard audit events log file path. - ''; - }; }; }; @@ -197,17 +168,19 @@ in { wantedBy = [ "basic.target" ]; wants = [ "systemd-udevd.service" ]; - # make sure an empty rule file and required directories exist - preStart = '' - mkdir -p $(dirname "${cfg.ruleFile}") $(dirname "${cfg.auditFilePath}") "${cfg.IPCAccessControlFiles}" \ - && ([ -f "${cfg.ruleFile}" ] || touch ${cfg.ruleFile}) - ''; + # make sure an empty rule file exists + preStart = ''[ -f "${ruleFile}" ] || touch ${ruleFile}''; serviceConfig = { Type = "simple"; ExecStart = ''${cfg.package}/bin/usbguard-daemon -P -k -c ${daemonConfFile}''; Restart = "on-failure"; + StateDirectory = [ + "usbguard" + "usbguard/IPCAccessControl.d" + ]; + AmbientCapabilities = ""; CapabilityBoundingSet = "CAP_CHOWN CAP_FOWNER"; DeviceAllow = "/dev/null rw"; @@ -223,8 +196,8 @@ in { ProtectKernelModules = true; ProtectSystem = true; ReadOnlyPaths = "-/"; - ReadWritePaths = "-/dev/shm -${dirOf cfg.auditFilePath} -/tmp -${dirOf cfg.ruleFile}"; - RestrictAddressFamilies = "AF_UNIX AF_NETLINK"; + ReadWritePaths = "-/dev/shm -/tmp"; + RestrictAddressFamilies = [ "AF_UNIX" "AF_NETLINK" ]; RestrictNamespaces = true; RestrictRealtime = true; SystemCallArchitectures = "native"; @@ -233,4 +206,9 @@ in { }; }; }; + imports = [ + (mkRemovedOptionModule [ "services" "usbguard" "ruleFile" ] "The usbguard module now uses ${defaultRuleFile} as ruleFile. Alternatively, use services.usbguard.rules to configure rules.") + (mkRemovedOptionModule [ "services" "usbguard" "IPCAccessControlFiles" ] "The usbguard module now hardcodes IPCAccessControlFiles to /var/lib/usbguard/IPCAccessControl.d.") + (mkRemovedOptionModule [ "services" "usbguard" "auditFilePath" ] "Removed usbguard module audit log files. Audit logs can be found in the systemd journal.") + ]; } From 3100da7409721946c0db269bf500a76ff034de1c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 10 Aug 2020 02:35:42 +0000 Subject: [PATCH 07/29] bitwarden_rs: 1.16.1 -> 1.16.3 --- pkgs/tools/security/bitwarden_rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix index 78e0bb7a87d..2223c38a9cf 100644 --- a/pkgs/tools/security/bitwarden_rs/default.nix +++ b/pkgs/tools/security/bitwarden_rs/default.nix @@ -8,13 +8,13 @@ let in rustPlatform.buildRustPackage rec { pname = "bitwarden_rs"; - version = "1.16.1"; + version = "1.16.3"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "18w6fan133ym8n01h2yfv84h1gh1vyib75ksd6c6a554b8ka864s"; + sha256 = "1scy8abzy6j1jsms84cg2nqkn1zsxr5mjikp2xh0yl0ckkk13ffn"; }; nativeBuildInputs = [ pkgconfig ]; @@ -25,7 +25,7 @@ in rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; - cargoSha256 = "11a1a6q53n8gby7j2ghp8d2yi766fp9wklg48ap5i5afngj5lgzp"; + cargoSha256 = "112mvgq581cms0war5dbni7f7yryjr5agryzn5qx835qkznzar8s"; cargoBuildFlags = [ featuresFlag ]; checkPhase = '' From dc89d3dba7f6d5a0cdec8a00622456adc6dcb63b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 10 Aug 2020 04:20:00 +0000 Subject: [PATCH 08/29] xonsh: 0.9.18 -> 0.9.19 https://github.com/xonsh/xonsh/releases/tag/0.9.19 --- pkgs/shells/xonsh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 192e38b963d..5d6a8a6065b 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.9.18"; + version = "0.9.19"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = version; - sha256 = "1zg5dl9qdysbaw2djy9f7f1ydp7vzjv840cjwqxlmg9615lgg7xa"; + sha256 = "1s7nb23zh4may4k3c9yfiizfdflm97hf5q2aww4j6ibykgcydv64"; }; LC_ALL = "en_US.UTF-8"; From c2c82468479f8ddb465ead41769c204918a307ea Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 10 Aug 2020 04:20:00 -0500 Subject: [PATCH 09/29] zeek: 3.1.5 -> 3.2.0 https://github.com/zeek/zeek/releases/tag/v3.2.0 --- pkgs/applications/networking/ids/zeek/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 51b1d0578e5..a0e6433a202 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { pname = "zeek"; - version = "3.1.5"; + version = "3.2.0"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "1rwrwdx0jf76pb11vpmv5z513ss9rrkgpjv1pa1vydf4gbafhi5r"; + sha256 = "0ky4485z0gpaj1z75y7jr5bn9wr8x8w3v637aqq4v9a0a5iyagmg"; }; nativeBuildInputs = [ cmake flex bison file ]; @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { # Fix pybind c++17 build with Clang. See: https://github.com/pybind/pybind11/issues/1604 (fetchpatch { url = "https://github.com/pybind/pybind11/commit/759221f5c56939f59d8f342a41f8e2d2cacbc8cf.patch"; - sha256 = "0l8z7d7chq1awd8dnfarj4c40wx36hkhcan0702p5l89x73wqk54"; - extraPrefix = "aux/broker/bindings/python/3rdparty/pybind11/"; + sha256 = "17qznp8yavnv84fjsbghv3d59z6k6rx74j49w0izakmgw5a95w84"; + extraPrefix = "auxil/broker/bindings/python/3rdparty/pybind11/"; stripLen = 1; }) ]; From 526e77e55d4f1cf0e7750ff2cd7388989fa3aad5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 10 Aug 2020 12:55:06 +0000 Subject: [PATCH 10/29] helmfile: 0.125.1 -> 0.125.5 --- pkgs/applications/networking/cluster/helmfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 02390c08149..83ec321db82 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helmfile"; - version = "0.125.1"; + version = "0.125.5"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "0ym9q1rww3r54czkrckdd1ahlym6n61l2563nmj48hkn5d4qxqbm"; + sha256 = "00c1sppvdnsqay8zk6fz5xz8yw74zv30hq54r4sf1a5rb84nd05h"; }; vendorSha256 = "04mga3jc2c01daygjcn245mv30lc2ibax0mpb1wjk3s8lkl4cxcz"; From edb0920697a93803547e7d3f28db5f99214d7761 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 10 Aug 2020 23:29:17 +0200 Subject: [PATCH 11/29] chromium: 84.0.4147.105 -> 84.0.4147.125 https://chromereleases.googleblog.com/2020/08/stable-channel-update-for-desktop.html This update includes 15 security fixes. CVEs: CVE-2020-6542 CVE-2020-6543 CVE-2020-6544 CVE-2020-6545 CVE-2020-6546 CVE-2020-6547 CVE-2020-6548 CVE-2020-6549 CVE-2020-6550 CVE-2020-6551 CVE-2020-6552 CVE-2020-6553 CVE-2020-6554 CVE-2020-6555 --- .../browsers/chromium/upstream-info.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 81cc31aacc8..17c3c188a48 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "06cl77yi7cb6r7n8mn38d61zmgwxi690qxrkd56hg2773hn06wq5"; - sha256bin64 = "0a6c44qb0n2hdc42p5xqybnbhgdxd51lyygkqz42fmym6id65v88"; - version = "85.0.4183.39"; + sha256 = "0qvcp47m3mc1lw22sq1a4pvaxxi5wlmwzjz23ak01wj3v1xifsh6"; + sha256bin64 = "1a06yhaifbjs88wskfb3mcx06klhvdvz2mnkzz6szhkypz8mi3dp"; + version = "85.0.4183.59"; }; dev = { - sha256 = "1l2d3gk7si1djxn3901fjgykv7nzc8g970m3fb9pjflfrr8f17v6"; - sha256bin64 = "0flsmy5blrc9gs6cikag7mdlvgkm6mzm745kcq0shfmhanvlkykn"; - version = "86.0.4209.2"; + sha256 = "0nirf72i3zdqsy201qzinfn9k40iy315i6z0a8xn3ciagh10p5j4"; + sha256bin64 = "1ss36w8bsqfswnqddhn2aamjmsyh2vr0y9gjlzrh702mda8yraq1"; + version = "86.0.4221.3"; }; stable = { - sha256 = "1b6cqnwx76pp4y5hvz3qm8lm1ayaxr5578k76164acr35bmypx6a"; - sha256bin64 = "0znxq5ncyvyysx3p8xikzg8jm8jr51k478y29m985x6c5p5a4zyw"; - version = "84.0.4147.105"; + sha256 = "1xdg9pnnvbzasmra09rl7wdrir61rfcqml46jj7kv39drwk9chwq"; + sha256bin64 = "1fbn9vkz4kf1dhivi1sfnfi8dady9qjmfr44hvfmb8aibh9kzc8w"; + version = "84.0.4147.125"; }; } From 6f2ec6d9679353f358fc49283faa8fdd2be32555 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 10 Aug 2020 01:23:15 -0700 Subject: [PATCH 12/29] pythonInterpreters.pypy{27,36}_prebuilt: 7.1.1 -> 7.3.1 Signed-off-by: Anders Kaseorg --- .../interpreters/python/default.nix | 10 ++++------ .../interpreters/python/pypy/prebuilt.nix | 19 +++++++++---------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 1a04f9d0e48..149c436c5c0 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -191,13 +191,12 @@ in { self = pythonInterpreters.pypy27_prebuilt; sourceVersion = { major = "7"; - minor = "1"; + minor = "3"; patch = "1"; }; - sha256 = "0rlx4x9xy9h989w6sy4h7lknm00956r30c5gjxwsvf8fhvq9xc3k"; # linux64 + sha256 = "18xc5kwidj5hjwbr0w8v1nfpg5l4lk01z8cn804zfyyz8xjqhx5y"; # linux64 pythonVersion = "2.7"; inherit passthruFun; - ncurses = ncurses5; }; pypy36_prebuilt = callPackage ./pypy/prebuilt.nix { @@ -205,13 +204,12 @@ in { self = pythonInterpreters.pypy36_prebuilt; sourceVersion = { major = "7"; - minor = "1"; + minor = "3"; patch = "1"; }; - sha256 = "1c1xx6dm1n4xvh1vd3rcvyyixm5jm9rvzisji1a5bc9l38xzc540"; # linux64 + sha256 = "04nv0mkalaliphbjw7y0pmb372bxwjzwmcsqkf9kwsik99kg2z7n"; # linux64 pythonVersion = "3.6"; inherit passthruFun; - ncurses = ncurses5; }; graalpython37 = callPackage ./graalpython/default.nix { diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index 0ebd3364834..1522047a380 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -8,10 +8,9 @@ , zlib , openssl_1_0_2 , expat -, libffi -, ncurses -, tcl -, tk +, ncurses6 +, tcl-8_5 +, tk-8_5 # For the Python package set , packageOverrides ? (self: super: {}) , sourceVersion @@ -46,10 +45,9 @@ let zlib openssl_1_0_2 expat - libffi - ncurses - tcl - tk + ncurses6 + tcl-8_5 + tk-8_5 ]; in with passthru; stdenv.mkDerivation { @@ -66,6 +64,7 @@ in with passthru; stdenv.mkDerivation { mkdir -p $out/lib echo "Moving files to $out" mv -t $out bin include lib-python lib_pypy site-packages + mv lib/libffi.so.6* $out/lib/ mv $out/bin/libpypy*-c.so $out/lib/ @@ -78,8 +77,8 @@ in with passthru; stdenv.mkDerivation { $out/bin/pypy* pushd $out - find {lib,lib_pypy*} -name "*.so" -exec patchelf --replace-needed "libbz2.so.1.0" "libbz2.so.1" {} \; - find {lib,lib_pypy*} -name "*.so" -exec patchelf --set-rpath ${stdenv.lib.makeLibraryPath deps} {} \; + find {lib,lib_pypy*} -name "*.so" -exec patchelf --remove-needed libncursesw.so.6 --replace-needed libtinfow.so.6 libncursesw.so.6 {} \; + find {lib,lib_pypy*} -name "*.so" -exec patchelf --set-rpath ${stdenv.lib.makeLibraryPath deps}:$out/lib {} \; echo "Removing bytecode" find . -name "__pycache__" -type d -depth -exec rm -rf {} \; From b31e4a20a43ce8489255b5705bdea3355c995560 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 10 Aug 2020 13:34:00 -0700 Subject: [PATCH 13/29] pypy, pypy3: 7.1.1 -> 7.3.1 Signed-off-by: Anders Kaseorg --- pkgs/development/interpreters/python/default.nix | 8 ++++---- pkgs/development/interpreters/python/pypy/default.nix | 11 ++--------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 149c436c5c0..c9c313b437a 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -158,10 +158,10 @@ in { self = pypy27; sourceVersion = { major = "7"; - minor = "1"; + minor = "3"; patch = "1"; }; - sha256 = "0yq6ln1ic476sasp8zs4mg5i9524l1p96qwanp486rr1yza1grlg"; + sha256 = "08ckkhd0ix6j9873a7gr507c72d4cmnv5lwvprlljdca9i8p2dzs"; pythonVersion = "2.7"; db = db.override { dbmSupport = !stdenv.isDarwin; }; python = python27; @@ -174,10 +174,10 @@ in { self = pypy36; sourceVersion = { major = "7"; - minor = "1"; + minor = "3"; patch = "1"; }; - sha256 = "1hqvnran7d2dzj5555n7q680dyzhmbklz04pvkxgb5j604v7kkx1"; + sha256 = "10zsk8jby8j6visk5mzikpb1cidvz27qq4pfpa26jv53klic6b0c"; pythonVersion = "3.6"; db = db.override { dbmSupport = !stdenv.isDarwin; }; python = python27; diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index e5828fdd374..10073602071 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -34,7 +34,7 @@ in with passthru; stdenv.mkDerivation rec { inherit pname version; src = fetchurl { - url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2"; + url = "https://bitbucket.org/pypy/pypy/downloads/pypy${pythonVersion}-v${version}-src.tar.bz2"; inherit sha256; }; @@ -75,13 +75,6 @@ in with passthru; stdenv.mkDerivation rec { postPatch = '' substituteInPlace "lib-python/${if isPy3k then "3/tkinter/tix.py" else "2.7/lib-tk/Tix.py"}" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" - # hint pypy to find nix ncurses - substituteInPlace pypy/module/_minimal_curses/fficurses.py \ - --replace "/usr/include/ncurses/curses.h" "${ncurses.dev}/include/curses.h" \ - --replace "ncurses/curses.h" "${ncurses.dev}/include/curses.h" \ - --replace "ncurses/term.h" "${ncurses.dev}/include/term.h" \ - --replace "libraries=['curses']" "libraries=['ncurses']" - sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite.dev}/include'], library_dirs=['${sqlite.out}/lib']@" lib_pypy/_sqlite3_build.py ''; @@ -137,7 +130,7 @@ in with passthru; stdenv.mkDerivation rec { ln -s $out/${executable}-c/${executable}-c $out/bin/${executable} # other packages expect to find stuff according to libPrefix - ln -s $out/${executable}/include $out/include/${libPrefix} + ln -s $out/${executable}-c/include $out/include/${libPrefix} ln -s $out/${executable}-c/lib-python/${if isPy3k then "3" else pythonVersion} $out/lib/${libPrefix} ${stdenv.lib.optionalString stdenv.isDarwin '' From d5adbd40b4793454a67c2b4e2dc03f8d1703116b Mon Sep 17 00:00:00 2001 From: "Robert K. Bell" Date: Tue, 11 Aug 2020 13:48:15 +1000 Subject: [PATCH 14/29] jetbrains: update Used ./update.pl, no other changes. --- .../editors/jetbrains/default.nix | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index bfdf320aeb9..9e65ca7d362 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -268,12 +268,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2020.1.2"; /* updated by script */ + version = "2020.2"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "0q5bnb0rmsgks7brrdpgah83s2ixa4pyhw8jvg9p2g48b582rmf7"; /* updated by script */ + sha256 = "1j80k6r4nbr8abwkpx78sy3jzq3jsywn2k6g4mjx6h0adwxswymm"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -281,12 +281,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2020.1.5"; /* updated by script */ + version = "2020.2"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "0605d772156lzlz5904px2spdijc92yz6rjvmpyg6vk5zv5k2wm9"; /* updated by script */ + sha256 = "0d0m6v4lr6qhi79csdpcyiyd2hnhlsan9lpnjmhkdxd84i1dl15a"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -294,12 +294,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2020.1.4"; /* updated by script */ + version = "2020.2.1"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "1wgcc1faqn0y9brxikh53s6ly7zvpdmpg7m5gvp5437isbllisbl"; /* updated by script */ + sha256 = "15jd2yn4g3lya54ppcp8b0bvf2pp2khdvqba2g1aml16d5z8mkq6"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -307,12 +307,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2020.1.3"; /* updated by script */ + version = "2020.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1aycsy2pg8nw5il8p2r6bhim9y47g5rfga63f0p435mpjmzpll0s"; /* updated by script */ + sha256 = "0rymyyhgm42i487dhlxh78shyvq4hd56frgz7wrqf85hg2j5ha0y"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -320,12 +320,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2020.1.3"; /* updated by script */ + version = "2020.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "188wkqcv67kizq4w6v4vg9jpr3qfgbg9x5jc77s4ki4nafkbfxas"; /* updated by script */ + sha256 = "00mbf8asxjdnfciz6bl8b83kqknqdnars5w5w5w38rmza53pzxsi"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -333,12 +333,12 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2020.1.2"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "Create your own domain-specific language"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/mps/2020.1/MPS-${version}.tar.gz"; - sha256 = "0ygk31l44bxcv64h6lnqxssmx5prcb5b5xdm3qxmrv7xz1qv59c1"; /* updated by script */ + sha256 = "1ncvq834vn47pmh3q875hgqi4m7h3inljp89w3jwwhjn3g985ysz"; /* updated by script */ }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -346,12 +346,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2020.1.3"; /* updated by script */ + version = "2020.2"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "0cw2rx68rl6mrnizpb69ahz4hrh8blry70cv4rjnkw19d4x877m8"; /* updated by script */ + sha256 = "1zxhb2w7nivnx8habcf5vii6bwzaihs5x8smy0zf8ngv3xwr6vjc"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -359,12 +359,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2020.1.3"; /* updated by script */ + version = "2020.2"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1290k17nihiih8ipxfqax1xlx320h1vkwbcc5hc50psvpsfgiall"; /* updated by script */ + sha256 = "12pp3xp74dzgjrv2nz83dnqycb250kkgqlb3skjkdx9pabmfxck0"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -372,12 +372,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2020.1.3"; /* updated by script */ + version = "2020.2"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1ag8jrfs38f0q11pyil4pvddi8lv46b0jxd3mcbmidn3p1z29f9x"; /* updated by script */ + sha256 = "0xq0nba31yc7cm1lbgkmgfbr5kp5fq5k7j2n6kampm2hyx5fa0ak"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -398,12 +398,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2020.1.3"; /* updated by script */ + version = "2020.2"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "1z6z2c31aq29hzi1cifc77zz9vnw48h2jvw4w61lvgskcnzrw9vn"; /* updated by script */ + sha256 = "1caxd5qcxwwrdy3ma87gnywr5czg3lam1n2gwbnc7hdxgfnvn3qz"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -411,12 +411,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2020.1.3"; /* updated by script */ + version = "2020.2"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "19zqac77fkw1czf86s39ggnd24r9ljr80gj422ch4fdkz4qy832q"; /* updated by script */ + sha256 = "100j2q9hz0a50n3x3khk7hap7b496g6sx0y6q7n7vy2zayh5ibm5"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; From d9ea518b9588a78b3187523c9feab56cfb8bee2d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Aug 2020 04:32:16 +0000 Subject: [PATCH 15/29] jx: 2.1.121 -> 2.1.127 --- pkgs/applications/networking/cluster/jx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index c9b63b49d42..a91c6792a23 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "jx"; - version = "2.1.121"; + version = "2.1.127"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "0bjpnh962w5wz4gj5my9g52dawxj8zccvpkxlxy1n7c3dkzjxx5j"; + sha256 = "01dfpnqgbrn8b6h2irq080xdm76b4jx6sd80f8x4zmyaz6hf5vlv"; }; - vendorSha256 = "0l9djgvnrgdnw7nsf05yq7qpzzzm3gasgh9a7dyc16pp2kxvza6k"; + vendorSha256 = "0la92a8720l8my5r4wsbgv74y6m19ikmm0wv3l4m4w5gjyplfsxb"; subPackages = [ "cmd/jx" ]; From 20d4fd08b9d702085f765402304cf52bf788d40c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Aug 2020 04:42:03 +0000 Subject: [PATCH 16/29] kmon: 1.3.5 -> 1.4.0 --- pkgs/tools/system/kmon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/kmon/default.nix b/pkgs/tools/system/kmon/default.nix index e3d84cb2131..a2610327f61 100644 --- a/pkgs/tools/system/kmon/default.nix +++ b/pkgs/tools/system/kmon/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kmon"; - version = "1.3.5"; + version = "1.4.0"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "1jbp1pd1xlbj5jzz7v2zmrzik45z91ddpvaxazjwcbqmw6hn732q"; + sha256 = "1f9q4bc1kr1hgwf8byj13d6vsfs97wz7x10zwa82iv9b0wb1lr5w"; }; - cargoSha256 = "17srf1krknabqprjilk76mmvjq284zf138gf15vybsbjd9dkpals"; + cargoSha256 = "1xy8rkba9idd0w4bnczmv4ll9awvar99vb7s0jd25fjbzqqlz820"; nativeBuildInputs = [ python3 ]; From 21b89cec814dbbde87ebb1023826700922130d51 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Aug 2020 08:27:31 +0000 Subject: [PATCH 17/29] neofetch: 7.0.0 -> 7.1.0 --- pkgs/tools/misc/neofetch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index a1a0c159bb4..f08e3828325 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "neofetch"; - version = "7.0.0"; + version = "7.1.0"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "neofetch"; rev = version; - sha256 = "0xc0fdc7n5bhqirh83agqiy8r14l14zwca07czvj8vgnsnfybslr"; + sha256 = "0i7wpisipwzk0j62pzaigbiq42y1mn4sbraz4my2jlz6ahwf00kv"; }; dontBuild = true; From be8b65102619398fdeebe3c51905af3bbf6a782a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Aug 2020 08:35:29 +0000 Subject: [PATCH 18/29] nfpm: 1.5.0 -> 1.6.0 --- pkgs/tools/package-management/nfpm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index ce8312a9158..6b4cde02c09 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "075jrarvpvh4hll3zvrf65ar3a2ya63ma343hss11l1mr3gykb9d"; + sha256 = "1q4fzjlaiwsm028cwcw7xgcbdkccw18f2mf1vh7lz42l1bxy8bk4"; }; - vendorSha256 = "11ab1w89zn3m81swzsnyiw1x10v58phid4y68rralkp6bhisz25b"; + vendorSha256 = "1bsb05qhr9zm8yar8mdi3mw0i5ak1s5x0i8qkz5fd6wcqnsw2jjw"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; From 4c54e6ab5f64925425b968899b4447c74c21189c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 8 Aug 2020 10:32:27 +0200 Subject: [PATCH 19/29] ocamlPackages.uunf: 12.0.0 -> 13.0.0 --- pkgs/development/ocaml-modules/uunf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index f9569f86086..aa251742628 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -4,15 +4,15 @@ let webpage = "https://erratique.ch/software/${pname}"; in -assert stdenv.lib.versionAtLeast ocaml.version "4.01"; +assert stdenv.lib.versionAtLeast ocaml.version "4.03"; stdenv.mkDerivation rec { name = "ocaml-${pname}-${version}"; - version = "12.0.0"; + version = "13.0.0"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "031fxixp37hjv45mib87wxm865k82903w72x60hp6v36k7jn34a4"; + sha256 = "1qci04nkp24kdls1z4s8kz5dzgky4nwd5r8345nwdrgwmxhw7ksm"; }; buildInputs = [ ocaml findlib ocamlbuild topkg uutf cmdliner ]; From f797bed266a9f25f708e0c19ab2d8ec3260400c5 Mon Sep 17 00:00:00 2001 From: "Tristan Helmich (omniIT)" Date: Tue, 11 Aug 2020 09:00:45 +0000 Subject: [PATCH 20/29] graylog: 3.3.3 -> 3.3.4 Bumps Graylog and integration plugins to version 3.3.4 --- pkgs/tools/misc/graylog/default.nix | 4 ++-- pkgs/tools/misc/graylog/plugins.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 2785255092b..cb7adf795d3 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "graylog"; - version = "3.3.3"; + version = "3.3.4"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "1yc2rirbdydirs1kph60acz06ciqnjbf115p3q4vhh15l84lg3sg"; + sha256 = "0wynnb56plch61pzjl46jx5q94c5hclzyrr8567fc1jhnqycfngs"; }; dontBuild = true; diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index 15d11b0bf08..b1abc8a5065 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -64,10 +64,10 @@ in { enterprise-integrations = glPlugin rec { name = "graylog-enterprise-integrations-${version}"; pluginName = "graylog-plugin-enterprise-integrations"; - version = "3.3.3"; + version = "3.3.4"; src = fetchurl { url = "https://downloads.graylog.org/releases/graylog-enterprise-integrations/graylog-enterprise-integrations-plugins-${version}.tgz"; - sha256 = "14b8whgvx8lzil09gjjxhps5syw3slwbh3gswrgc9kh1sqmdhl85"; + sha256 = "0ln0vmnfgxg6hdq7sh58xdqn14bl86qrgy3923f3q3hx209v6vn9"; }; installPhase = '' mkdir -p $out/bin @@ -96,10 +96,10 @@ in { integrations = glPlugin rec { name = "graylog-integrations-${version}"; pluginName = "graylog-plugin-integrations"; - version = "3.3.3"; + version = "3.3.4"; src = fetchurl { url = "https://downloads.graylog.org/releases/graylog-integrations/graylog-integrations-plugins-${version}.tgz"; - sha256 = "1zf97q8xm81z6q2s7c3nwvpl1m6pc6w7zjm4hmd7ds1br6pg4bdh"; + sha256 = "14g6vdyibp3rva8bwss7vjbi9fpxvgp2gbk1r8divbhhpiwsjyxc"; }; installPhase = '' mkdir -p $out/bin From 2c564010aa3c9aa84a77ae0dd009f2f563dd32d2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 4 Aug 2020 11:27:52 +0200 Subject: [PATCH 21/29] =?UTF-8?q?ocamlPackages.ppx=5Fderiving=5Fyojson:=20?= =?UTF-8?q?3.5.2=20=E2=86=92=203.5.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../development/ocaml-modules/ppx_deriving_yojson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix index 5faaca81039..9af2c6edb32 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "ppx_deriving_yojson"; - version = "3.5.2"; + version = "3.5.3"; minimumOCamlVersion = "4.04"; @@ -12,7 +12,7 @@ buildDunePackage rec { owner = "ocaml-ppx"; repo = "ppx_deriving_yojson"; rev = "v${version}"; - sha256 = "1vbhmnhnj1aa4jrp8xqi52nggwj7vrml83z2j0r0qzvl65v02mc0"; + sha256 = "030638gp39mr4hkilrjhd98q4s8gjqxifm6fy6bwqrg74hmrl2y5"; }; buildInputs = [ ppxfind ounit ]; From 15d16de8f160f674c16007decab63e5afeb5342e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 11 Aug 2020 12:18:21 +0200 Subject: [PATCH 22/29] scalafmt: 2.6.2 -> 2.6.4 --- pkgs/development/tools/scalafmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index c445026193b..0f14f52295e 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -2,7 +2,7 @@ let baseName = "scalafmt"; - version = "2.6.2"; + version = "2.6.4"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -13,7 +13,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1q2bsc6vqgbgzg8hcz8pn6vl3263ghjfbkn93vijvmz0ivc806j4"; + outputHash = "1h19rsxsn2piifillv29nwks2k9l391jwygjbfy8pc0ha8yi63mw"; }; in stdenv.mkDerivation { From 686cb7e18e8d480c14f8c131f5794fea71707677 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 11 Aug 2020 11:09:58 +0100 Subject: [PATCH 23/29] home-assistant: relax dependency on slugify --- pkgs/servers/home-assistant/relax-dependencies.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/relax-dependencies.patch b/pkgs/servers/home-assistant/relax-dependencies.patch index 8bbe7bb28b3..03b488627d6 100644 --- a/pkgs/servers/home-assistant/relax-dependencies.patch +++ b/pkgs/servers/home-assistant/relax-dependencies.patch @@ -1,5 +1,5 @@ diff --git a/setup.py b/setup.py -index 7cf06942f3..bace4479fb 100755 +index 7cf06942f3..b3dd1b3e1b 100755 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ PROJECT_URLS = { @@ -18,7 +18,8 @@ index 7cf06942f3..bace4479fb 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.0", "pytz>=2020.1", "pyyaml==5.3.1", - "requests==2.24.0", From 6449c5eee5ef929a8a2f1ac30699a50907e1a2ed Mon Sep 17 00:00:00 2001 From: Diego Rodriguez Date: Tue, 11 Aug 2020 04:54:46 -0600 Subject: [PATCH 24/29] terraform: 0.13.0-rc1 -> 0.13.0 (#95135) --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 74aa881c999..8aa1f4a44fe 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -132,8 +132,8 @@ in rec { }); terraform_0_13 = pluggable (generic { - version = "0.13.0-rc1"; - sha256 = "1lja2s9viz5ja40qmlf49p6hk3rwdz6q0rw3ff1894b464zbsnk2"; + version = "0.13.0"; + sha256 = "0kangddd99ix50w67hi0pwa9js9c0hjxqvrc0lxaa6msjvjsxyyq"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); From 7defacb757a7ba3a79629b960576a4fbd0305a8b Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 11 Aug 2020 13:41:31 +0200 Subject: [PATCH 25/29] emacs: 26.3 -> 27.1 --- pkgs/applications/editors/emacs/clean-env.patch | 15 ++++++++------- pkgs/applications/editors/emacs/default.nix | 9 ++------- .../emacs/tramp-detect-wrapped-gvfsd.patch | 10 ++++------ 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/editors/emacs/clean-env.patch b/pkgs/applications/editors/emacs/clean-env.patch index 88befda899a..2ffe8b777a0 100644 --- a/pkgs/applications/editors/emacs/clean-env.patch +++ b/pkgs/applications/editors/emacs/clean-env.patch @@ -2,14 +2,15 @@ Dump temacs in an empty environment to prevent -dev paths from ending up in the dumped image. diff --git a/src/Makefile.in b/src/Makefile.in +index fd05a45df5..13f529c253 100644 --- a/src/Makefile.in +++ b/src/Makefile.in -@@ -535,7 +535,7 @@ ifeq ($(CANNOT_DUMP),yes) - ln -f temacs$(EXEEXT) $@ - else - unset EMACS_HEAP_EXEC; \ -- LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump -+ env -i LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump +@@ -570,7 +570,7 @@ emacs$(EXEEXT): temacs$(EXEEXT) \ + lisp.mk $(etc)/DOC $(lisp) \ + $(lispsource)/international/charprop.el ${charsets} + ifeq ($(DUMPING),unexec) +- LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup --temacs=dump ++ env -i LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup --temacs=dump ifneq ($(PAXCTL_dumped),) - $(PAXCTL_dumped) $@ + $(PAXCTL_dumped) emacs$(EXEEXT) endif diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index b88aa00d42d..1bfe9be6175 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -32,7 +32,7 @@ assert withXwidgets -> withGTK3 && webkitgtk != null; let - version = "26.3"; + version = "27.1"; versionModifier = ""; name = "emacs-${version}${versionModifier}"; @@ -41,7 +41,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "mirror://gnu/emacs/${name}.tar.xz"; - sha256 = "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d"; + sha256 = "0h9f2wpmp6rb5rfwvqwv1ia1nw86h74p7hnz3vb3gjazj67i4k2a"; }; enableParallelBuilding = true; @@ -49,11 +49,6 @@ in stdenv.mkDerivation { patches = [ ./clean-env.patch ./tramp-detect-wrapped-gvfsd.patch - # unbreak macOS unexec - (fetchpatch { - url = "https://github.com/emacs-mirror/emacs/commit/888ffd960c06d56a409a7ff15b1d930d25c56089.patch"; - sha256 = "08q3ygdigqwky70r47rcgzlkc5jy82xiq8am5kwwy891wlpl7frw"; - }) ]; postPatch = lib.concatStringsSep "\n" [ diff --git a/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch b/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch index 5d16194fd20..5af6fcaba8c 100644 --- a/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch +++ b/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch @@ -1,14 +1,12 @@ diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el -index f370abba31..f2806263a9 100644 +index 34a234c..b5a471c 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el -@@ -164,7 +164,8 @@ tramp-gvfs-enabled - (and (featurep 'dbusbind) +@@ -122,6 +122,7 @@ (tramp-compat-funcall 'dbus-get-unique-name :system) (tramp-compat-funcall 'dbus-get-unique-name :session) -- (or (tramp-compat-process-running-p "gvfs-fuse-daemon") -+ (or (tramp-compat-process-running-p ".gvfsd-fuse-wrapped") -+ (tramp-compat-process-running-p "gvfs-fuse-daemon") + (or (tramp-compat-process-running-p "gvfs-fuse-daemon") ++ (tramp-compat-process-running-p ".gvfsd-fuse-wrapped") (tramp-compat-process-running-p "gvfsd-fuse")))) "Non-nil when GVFS is available.") From 0a3e8eb6fec731fdb34f1d91bebb043c5cf7770a Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Tue, 11 Aug 2020 11:46:24 +0000 Subject: [PATCH 26/29] go-ethereum: 1.9.18 -> 1.9.19 --- pkgs/applications/blockchains/go-ethereum.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index 421acfef6ba..85bbf3a0de3 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-ethereum"; - version = "1.9.18"; + version = "1.9.19"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "0nkzwmrzk0m9662cr18h5i54v07mw8v3fh0csvqx8n50z5fcvb7b"; + sha256 = "08wf7qklk31dky2z0l2j9vbyr8721gkvy4dsc60afwrwihwd8lrp"; }; usb = fetchFromGitHub { From 084d5c0b8c1ca63330538e26a5a7870b5e2f8862 Mon Sep 17 00:00:00 2001 From: Cyril Cohen Date: Sat, 8 Aug 2020 00:36:01 +0200 Subject: [PATCH 27/29] coq-elpi: 1.4.1 -> 1.5.1 --- pkgs/development/coq-modules/coq-elpi/default.nix | 9 +++++++-- .../coq-modules/hierarchy-builder/default.nix | 9 +++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 3857146ea60..e58e51c63ae 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -2,9 +2,14 @@ let params = { "8.11" = rec { - version = "1.4.1"; + version = "1.5.0"; rev = "v${version}"; - sha256 = "12jwldcianai62y9jnghsjfya5dj6fvc6ilf37c7w037kylx45sd"; + sha256 = "0dlw869j6ib58i8fhbr7x3hq2cy088arihhfanv8i08djqml6g8x"; + }; + "8.12" = rec { + version = "1.5.1"; + rev = "v${version}"; + sha256 = "1znjc8c8rivsawmz5bgm9ddl69p62p2pwxphvpap1gfmi5cp8lwi"; }; }; param = params.${coq.coq-version}; diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix index ed14217d4f3..9be8459ee9f 100644 --- a/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -2,14 +2,15 @@ let versions = { - "0.9.1" = { - rev = "v0.9.1"; - sha256 = "00fibahkmvisr16ffaxfrc00gcijsv9rgk4v8ibmy1jv0iyk875b"; + "0.10.0" = { + rev = "v0.10.0"; + sha256 = "1a3vry9nzavrlrdlq3cys3f8kpq3bz447q8c4c7lh2qal61wb32h"; }; }; version = x: versions.${x} // {version = x;}; params = { - "8.11" = version "0.9.1"; + "8.11" = version "0.10.0"; + "8.12" = version "0.10.0"; }; param = params.${coq.coq-version}; in From 5aa6b4c2a136476005e56eaa0b8f17da903a7ed3 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 11 Aug 2020 14:11:39 +0200 Subject: [PATCH 28/29] gitlab: 13.0.9 -> 13.0.12 (#94968) --- pkgs/applications/version-management/gitlab/data.json | 10 +++++----- .../version-management/gitlab/gitaly/default.nix | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index ee4d901c287..fe211d1b87f 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "13.0.9", - "repo_hash": "0rzby1q4vy59cs9ghnx29f6gflmz9114yh5yia0kdikiyky95rsx", + "version": "13.0.12", + "repo_hash": "0m9pn1alxdib9ppf878wf186bvn0llik7vcpqijzcdzc18q9cldq", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v13.0.9-ee", + "rev": "v13.0.12-ee", "passthru": { - "GITALY_SERVER_VERSION": "13.0.9", + "GITALY_SERVER_VERSION": "13.0.12", "GITLAB_PAGES_VERSION": "1.18.0", "GITLAB_SHELL_VERSION": "13.2.0", "GITLAB_WORKHORSE_VERSION": "8.31.2" } -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 612ef3f0c87..5f3fa345d85 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -19,14 +19,14 @@ let }; }; in buildGoPackage rec { - version = "13.0.9"; + version = "13.0.12"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "0bw3g1c3ji78grh6fs4qq64hq1s4z2da5f18zbkac41hkkqbf1in"; + sha256 = "00jzrib8f51b3wkl0zy9a9cr5j9kp6cmm49vxm27zgxpyz8k1axw"; }; # Fix a check which assumes that hook files are writeable by their From fb24a3f3999c1ed29c962eeb531cddd261a954b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Mon, 10 Aug 2020 22:27:50 +0200 Subject: [PATCH 29/29] orca: 3.36.3 -> 3.36.4 --- pkgs/applications/misc/orca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 849e156b529..77c1f67ecf0 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -35,13 +35,13 @@ buildPythonApplication rec { pname = "orca"; - version = "3.36.3"; + version = "3.36.4"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1x0xrcyxlvcjlqp6wcsx5d951i500079wqs04scssjzwqggy330n"; + sha256 = "1s6qrmbn3pywidwwfa24ly21c1cz6fnnsipi9vlp3sxswbdcwiwz"; }; patches = [