From 4132ba3545f2d4e39aadb5abe91ff34ecda4ff17 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 02:29:26 +0000 Subject: [PATCH 01/11] hcloud: 1.27.0 -> 1.28.0 --- pkgs/development/tools/hcloud/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index fe3dfb9a34c8..6ec8240799bb 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "hcloud"; - version = "1.27.0"; + version = "1.28.0"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-bvPMSys2EY8cMNQ3rG4WlXaI9k2JsEWQkMZnDgcNFhY="; + sha256 = "sha256-ySCfU/VWZz6tSZbrbhT/OIoxme+Y53eFtlVTI43yNVA="; }; nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "sha256-/bqlDcv4lQ49NM849MTlna36ENfzUfcHtwuo75I77VQ="; + vendorSha256 = "sha256-G3kiaYoCyoltyS/OlecJHaYWpeFax1qonOJZr30wSV8="; doCheck = false; From 76e5589812f29da19311075fd2e196645e27d4e6 Mon Sep 17 00:00:00 2001 From: Zhenya Vinogradov Date: Thu, 16 Sep 2021 13:52:15 +0300 Subject: [PATCH 02/11] youtrack: use jdk11 instead of jdk16 Youtrack supports jdk11 officially, with jdk16 it will initialize but then fail with the error: Unable to make protected final java.lang.Class java.lang.ClassLoader.defineClass(java.lang.String,byte[],int,int,java.security.ProtectionDomain) throws java.lang.ClassFormatError accessible: module java.base does not "opens java.lang" to unnamed module @26d27c7d --- pkgs/servers/jetbrains/youtrack.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix index cba162fd2620..ac144f166063 100644 --- a/pkgs/servers/jetbrains/youtrack.nix +++ b/pkgs/servers/jetbrains/youtrack.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre, gawk }: +{ lib, stdenv, fetchurl, makeWrapper, jdk11, gawk }: stdenv.mkDerivation rec { pname = "youtrack"; @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - makeWrapper ${jre}/bin/java $out/bin/youtrack \ + makeWrapper ${jdk11}/bin/java $out/bin/youtrack \ --add-flags "\$YOUTRACK_JVM_OPTS -jar $jar" \ --prefix PATH : "${lib.makeBinPath [ gawk ]}" \ - --set JRE_HOME ${jre} + --set JRE_HOME ${jdk11} runHook postInstall ''; From 2e0dc26070c33a2a84275ea0fef827f5b1b88c75 Mon Sep 17 00:00:00 2001 From: Enno Richter Date: Thu, 30 Sep 2021 21:09:38 +0200 Subject: [PATCH 03/11] metasploit: add wrappers for pattern_create/offset --- pkgs/tools/security/metasploit/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index afd852f106e5..0d9216b95f2d 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -40,6 +40,11 @@ in stdenv.mkDerivation rec { done ) + makeWrapper ${env}/bin/bundle $out/bin/msf-pattern_create \ + --add-flags "exec ${ruby}/bin/ruby $out/share/msf/tools/exploit/pattern_create.rb" + + makeWrapper ${env}/bin/bundle $out/bin/msf-pattern_offset \ + --add-flags "exec ${ruby}/bin/ruby $out/share/msf/tools/exploit/pattern_offset.rb" ''; # run with: nix-shell maintainers/scripts/update.nix --argstr path metasploit From 37142f3c309e41553695fdd1ea72cd75ea887896 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 30 Sep 2021 22:37:14 +0200 Subject: [PATCH 04/11] python3Packages.restfly: 1.4.1 -> 1.4.2 --- pkgs/development/python-modules/restfly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/restfly/default.nix b/pkgs/development/python-modules/restfly/default.nix index 5cc87077e663..2eef8cdba604 100644 --- a/pkgs/development/python-modules/restfly/default.nix +++ b/pkgs/development/python-modules/restfly/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "restfly"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "stevemcgrath"; repo = pname; rev = version; - sha256 = "03k1843llpi4ycd450j5x8bd58vxsbfw43p81hsawidsx4c6bk85"; + sha256 = "sha256-1sLkjM6hRAbfrZEXP97N9ZDqpL255LC7JS1r2yOXG5E="; }; propagatedBuildInputs = [ From 00a5d0172c8a5fa1df573f44b387ad662083fabc Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 1 Oct 2021 21:39:40 +0200 Subject: [PATCH 05/11] pkgs/development/libraries/audio: enable build on darwin --- pkgs/development/libraries/{ => audio}/libkeyfinder/default.nix | 2 +- pkgs/development/libraries/audio/libsmf/default.nix | 2 +- pkgs/development/libraries/audio/lilv/default.nix | 2 +- pkgs/development/libraries/audio/lvtk/default.nix | 2 +- pkgs/development/libraries/audio/qm-dsp/default.nix | 2 +- pkgs/development/libraries/audio/raul/default.nix | 2 +- pkgs/development/libraries/audio/sratom/default.nix | 2 +- pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) rename pkgs/development/libraries/{ => audio}/libkeyfinder/default.nix (95%) diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/audio/libkeyfinder/default.nix similarity index 95% rename from pkgs/development/libraries/libkeyfinder/default.nix rename to pkgs/development/libraries/audio/libkeyfinder/default.nix index 04137eb02e7b..8265cd0ba7c1 100644 --- a/pkgs/development/libraries/libkeyfinder/default.nix +++ b/pkgs/development/libraries/audio/libkeyfinder/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "Musical key detection for digital audio (C++ library)"; homepage = "https://mixxxdj.github.io/libkeyfinder/"; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/development/libraries/audio/libsmf/default.nix index 0c173a6a99e0..a98f3f55a488 100644 --- a/pkgs/development/libraries/audio/libsmf/default.nix +++ b/pkgs/development/libraries/audio/libsmf/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/stump/libsmf"; license = licenses.bsd2; maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index f074287ab163..a630d0420b49 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "A C library to make the use of LV2 plugins"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix index 0ded707b3a10..111a72972ed3 100644 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "https://lvtk.org/"; license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/audio/qm-dsp/default.nix b/pkgs/development/libraries/audio/qm-dsp/default.nix index 3d8e15f97cdb..a9163a257764 100644 --- a/pkgs/development/libraries/audio/qm-dsp/default.nix +++ b/pkgs/development/libraries/audio/qm-dsp/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { homepage = "https://code.soundsoftware.ac.uk/projects/qm-dsp"; license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix index b1a8288c5f04..c200d4ab79c5 100644 --- a/pkgs/development/libraries/audio/raul/default.nix +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = "http://drobilla.net/software/raul"; license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index bc8dc70f9b47..1a40d249fd5e 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { description = "A library for serialising LV2 atoms to/from RDF"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix index 4d033d99d295..01b3caa24ea2 100644 --- a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix +++ b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://vamp-plugins.org/"; license = licenses.bsd3; maintainers = [ maintainers.goibhniu maintainers.marcweber ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a4d06d73eb5..c50474e3dadc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17453,7 +17453,7 @@ with pkgs; libkate = callPackage ../development/libraries/libkate { }; - libkeyfinder = callPackage ../development/libraries/libkeyfinder { }; + libkeyfinder = callPackage ../development/libraries/audio/libkeyfinder { }; libkml = callPackage ../development/libraries/libkml { }; From 360707c5d67a16b26a881237024da3b9305f38aa Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 1 Oct 2021 21:47:39 +0200 Subject: [PATCH 06/11] ungoogled-chromium: 94.0.4606.61 -> 94.0.4606.71 --- .../networking/browsers/chromium/upstream-info.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 9f9143c698e0..8e0427126b8a 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -44,9 +44,9 @@ } }, "ungoogled-chromium": { - "version": "94.0.4606.61", - "sha256": "1gxrxmd2almwf067zycilyxkmc0d62h99ln8wp3n3i02bi9xnik4", - "sha256bin64": "116xrf8hcprbdpdx6a4xysac2phyvw88vs3n1bs24ly6pxydsasz", + "version": "94.0.4606.71", + "sha256": "0nywwcdjda1b1swfslks8i28qq6jx9gyw50bhl8c2plcc0pbmfya", + "sha256bin64": "1ffa9hqs7ibch0by574l01lwhi5a1mhcyy1qrlr81ssq4pyygrq4", "deps": { "gn": { "version": "2021-08-11", @@ -55,8 +55,8 @@ "sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0" }, "ungoogled-patches": { - "rev": "94.0.4606.61-1", - "sha256": "1sb6n3dnp8d1bzhyl9d8yc0x9imyccnwxf1fqzv7vs3fd6dgcprp" + "rev": "94.0.4606.71-1", + "sha256": "12p39ay8lmdni6gnmw3w67pg4w3nrphhgn6bmz3cr6cy7nx4kiv2" } } } From ce50eda3949fa3149aea4f0f556dbb63f48e4288 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 1 Oct 2021 21:47:39 +0200 Subject: [PATCH 07/11] chromium: 94.0.4606.61 -> 94.0.4606.71 https://chromereleases.googleblog.com/2021/09/stable-channel-update-for-desktop_30.html This update includes 4 security fixes. Google is aware the exploits for CVE-2021-37975 and CVE-2021-37976 exist in the wild. CVEs: CVE-2021-37974 CVE-2021-37975 CVE-2021-37976 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 9f9143c698e0..8c772a350437 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "94.0.4606.61", - "sha256": "1gxrxmd2almwf067zycilyxkmc0d62h99ln8wp3n3i02bi9xnik4", - "sha256bin64": "116xrf8hcprbdpdx6a4xysac2phyvw88vs3n1bs24ly6pxydsasz", + "version": "94.0.4606.71", + "sha256": "0nywwcdjda1b1swfslks8i28qq6jx9gyw50bhl8c2plcc0pbmfya", + "sha256bin64": "1ffa9hqs7ibch0by574l01lwhi5a1mhcyy1qrlr81ssq4pyygrq4", "deps": { "gn": { "version": "2021-08-11", @@ -12,9 +12,9 @@ } }, "chromedriver": { - "version": "94.0.4606.41", - "sha256_linux": "06flgis4am4jmd9qz6yn1jfdr07w2n3mfrlicw6a9icg5ir64fdq", - "sha256_darwin": "1mc0hhksqm5ms4k4aji043xzxncbifjwz5fqzywy4ji64w5kqrca" + "version": "94.0.4606.61", + "sha256_linux": "1l7ls8qqqd9q3a20a459q40jd9djzf67s8qfdmfj44vwgidiw0fj", + "sha256_darwin": "1b43agdd6vw5zarrbbk1sgmdr6n3d9cdl4dcikk304yplh58d49v" } }, "beta": { From ed2c99e65f4f5f4bf3bb3a3422f07fc8ec9a97ce Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 1 Oct 2021 22:09:35 +0200 Subject: [PATCH 08/11] llvmPackages_13: 13.0.0-rc4 -> 13.0.0 --- pkgs/development/compilers/llvm/13/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index 4605b87846fd..9fd4cd98901d 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -19,7 +19,7 @@ let release_version = "13.0.0"; - candidate = "rc4"; # empty or "rcN" + candidate = ""; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; rev = ""; # When using a Git commit rev-version = ""; # When using a Git commit From 4da83b53d92714a51e9211eec7059f32046ca154 Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Sat, 2 Oct 2021 00:14:23 +0000 Subject: [PATCH 09/11] vscodium: 1.60.1 -> 1.60.2 --- pkgs/applications/editors/vscode/vscodium.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index fb2417389652..65eb761cabcd 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "03z6wpzbvf046sl1mjvvcshy5czvr4bq2f3ajlr8bj39y9df93h9"; - x86_64-darwin = "0cs5ikf5dxkg9qkyaq75h0rypil80sk6zmbb0s63191gj6l569yl"; - aarch64-linux = "05ivgn72v05yy3a9qly4qx0qpyjd2r3ygdw978zc8z09694g5x3i"; - armv7l-linux = "044izh9ap5s50k796zjcfk0p997b7sfryshp4gaxh3yf5qs0w7l9"; + x86_64-linux = "11zj9b8zhgfyh3m78ihg1k78m3v1khwa742mmsxji6ryxqkhvnr4"; + x86_64-darwin = "19jk8rry11dvyfprq8i2j9r9aj17kfxqx5hl069mlkz0ca18kxmc"; + aarch64-linux = "01slccwqhh6njd8q278svbfxph5lajx77ns03yrj9iva8w48gixy"; + armv7l-linux = "1g7zq6y99b5sg8g10hq50qr15m99n0cmydm6rl9dkyca2038ihbi"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.60.1"; + version = "1.60.2"; pname = "vscodium"; executableName = "codium"; From 40c61e528f0c7f503e73666ee60ab064b8a0944b Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Fri, 1 Oct 2021 18:09:56 -0700 Subject: [PATCH 10/11] ocamlPackages.logs: make jsoo support optional --- pkgs/development/ocaml-modules/logs/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/logs/default.nix b/pkgs/development/ocaml-modules/logs/default.nix index e786b02d93ec..157e7c52fee1 100644 --- a/pkgs/development/ocaml-modules/logs/default.nix +++ b/pkgs/development/ocaml-modules/logs/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild , topkg, result, lwt, cmdliner, fmt , js_of_ocaml +, jsooSupport ? true }: let pname = "logs"; @@ -21,10 +22,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ findlib topkg fmt cmdliner js_of_ocaml lwt ]; + buildInputs = [ findlib topkg fmt cmdliner lwt ] + ++ lib.optional jsooSupport js_of_ocaml; propagatedBuildInputs = [ result ]; - buildPhase = "${topkg.run} build --with-js_of_ocaml true"; + buildPhase = "${topkg.run} build --with-js_of_ocaml ${lib.boolToString jsooSupport}"; inherit (topkg) installPhase; From 55e05e8e0b14679521ab3d0364faab99451f121a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 2 Oct 2021 12:06:49 +0200 Subject: [PATCH 11/11] intel-media-driver: 21.3.3 -> 21.3.4 --- pkgs/development/libraries/intel-media-driver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 5f3488a8ab11..a3825df47a97 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "21.3.3"; + version = "21.3.4"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "1j33qq53jjmcvpr9w1xlyl5bpmq4rmshrd123l9alc2ddqbngrf7"; + sha256 = "1ch1bvqg6p0i7ahblhy0h9c43y2mfhqb25v1s344iqsrywwcpzzr"; }; cmakeFlags = [