From 973639dcf106b2f776c8d8b95dd1ec786be47091 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Thu, 7 Oct 2021 12:03:26 +0200 Subject: [PATCH 01/18] bundlerEnv.wrappedRuby: inherit gemPath and meta --- pkgs/development/ruby-modules/bundled-common/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 70afd412f3e4..6a4a87bc8963 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -119,6 +119,7 @@ let wrappedRuby = stdenv.mkDerivation { name = "wrapped-ruby-${pname'}"; nativeBuildInputs = [ makeWrapper ]; + inherit (ruby) gemPath meta; buildCommand = '' mkdir -p $out/bin for i in ${ruby}/bin/*; do From 34ca27bc95261256846ee8d0ebcdf4aeafef907a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 7 Oct 2021 21:04:39 +0200 Subject: [PATCH 02/18] grpc: don't set LD_LIBRARY_PATH when cross compiling LD_LIBRARY_PATH is only necessary in the native compilation case when we need to execute grpc_cpp_plugin from the build directory. Disabling this for cross is not only cleaner, but eliminates linker failures when cross compiling to a compatible configuration, since LD_LIBRARY_PATH takes precedence over the rpath set in buildPackages.grpc's grpc_cpp_plugin. --- pkgs/development/libraries/grpc/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 2000bdccb008..0787ffea41fa 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -68,7 +68,12 @@ stdenv.mkDerivation rec { rm -vf BUILD ''; - preBuild = '' + # When natively compiling, grpc_cpp_plugin is executed from the build directory, + # needing to load dynamic libraries from the build directory, so we set + # LD_LIBRARY_PATH to enable this. When cross compiling we need to avoid this, + # since it can cause the grpc_cpp_plugin executable from buildPackages to + # crash if build and host architecture are compatible (e. g. pkgsLLVM). + preBuild = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' export LD_LIBRARY_PATH=$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH ''; From 8e57c33ab6b284be5053717daba75a18c285cd5b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 7 Oct 2021 21:06:56 +0200 Subject: [PATCH 03/18] pkgsLLVM.grpc: fix build with clang < 11 Apparently there's an issue where compiling grpc with -std=c++17 fails unless the clang version is at least 11. Hopefully our default clang version will be increased to that soon, but until then we need to work around this problem by setting an older C++ standard. It's unclear if using C++11 causes further issues, but compiling is better than not compiling, I suppose. Contrary to the linked bug report, the darwin stdenv doesn't exhibit this problem for some reason. --- pkgs/development/libraries/grpc/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 0787ffea41fa..5d2b58aa3dba 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -57,7 +57,12 @@ stdenv.mkDerivation rec { "-DgRPC_ABSL_PROVIDER=package" "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_SKIP_BUILD_RPATH=OFF" - "-DCMAKE_CXX_STANDARD=17" + # Needs to be compiled with -std=c++11 for clang < 11. Interestingly this is + # only an issue with the useLLVM stdenv, not the darwin stdenv… + # https://github.com/grpc/grpc/issues/26473#issuecomment-860885484 + (if (stdenv.hostPlatform.useLLVM or false) && lib.versionOlder stdenv.cc.cc.version "11.0" + then "-DCMAKE_CXX_STANDARD=11" + else "-DCMAKE_CXX_STANDARD=17") ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc" ]; From 56fa7bd6b4c817c0b3a2b54c7869619735c6a827 Mon Sep 17 00:00:00 2001 From: Ryan Rix Date: Mon, 27 Sep 2021 20:47:18 -0700 Subject: [PATCH 04/18] Update koreader to 2021.09 --- pkgs/applications/misc/koreader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index 249569ffbab0..af66e2282b40 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -13,12 +13,12 @@ let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; }; in stdenv.mkDerivation rec { pname = "koreader"; - version = "2021.03"; + version = "2021.09"; src = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - sha256 = "sha256-XdCyx+SdcV1QitDVkOl9EZCHpU8Qiwu0qhcXkU6b+9o="; + sha256 = "1q2mbmczx2y5ylriq4k3lbjlpw4pwfq2vvcx06ymax31fsrvix84"; }; sourceRoot = "."; From 21225494766730afdd6fb2227bad947e6426d2c6 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 8 Oct 2021 00:14:23 -0300 Subject: [PATCH 05/18] dapl: init at 0.2.0+unstable=2021-06-30 --- .../interpreters/dzaima-apl/default.nix | 66 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 10 +++ 2 files changed, 76 insertions(+) create mode 100644 pkgs/development/interpreters/dzaima-apl/default.nix diff --git a/pkgs/development/interpreters/dzaima-apl/default.nix b/pkgs/development/interpreters/dzaima-apl/default.nix new file mode 100644 index 000000000000..956311584388 --- /dev/null +++ b/pkgs/development/interpreters/dzaima-apl/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, fetchFromGitHub +, jdk +, makeWrapper +, buildNativeImage ? true +}: + +stdenv.mkDerivation rec { + pname = "dapl" + lib.optionalString buildNativeImage "-native"; + version = "0.2.0+unstable=2021-06-30"; + + src = fetchFromGitHub { + owner = "dzaima"; + repo = "APL"; + rev = "28b3667beb23c6472266bb2b6eb701708fa421c6"; + hash = "sha256-2kM9XDMclxJNOZngwLvoDQG23UZQQ6ePK/j215UumCg="; + }; + + nativeBuildInputs = [ + makeWrapper + jdk + ]; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + + patchShebangs --build ./build + ./build + '' + lib.optionalString buildNativeImage '' + native-image --report-unsupported-elements-at-runtime \ + -H:CLibraryPath=${lib.getLib jdk}/lib -jar APL.jar dapl + '' + '' + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + '' + (if buildNativeImage then '' + mv dapl $out/bin + '' else '' + mkdir -p $out/share/${pname} + mv APL.jar $out/share/${pname}/ + + makeWrapper "${lib.getBin jdk}/bin/java" "$out/bin/dapl" \ + --add-flags "-jar $out/share/${pname}/APL.jar" + '') + '' + ln -s $out/bin/dapl $out/bin/apl + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/dzaima/APL"; + description = "An APL implementation in Java" + lib.optionalString buildNativeImage ", compiled as a native image"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + inherit (jdk.meta) platforms; + }; +} +# TODO: Processing app +# TODO: minimalistic JDK diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 509cd7faf1ad..3faddffeccba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5621,6 +5621,16 @@ with pkgs; gnuapl = callPackage ../development/interpreters/gnu-apl { }; + dapl = callPackage ../development/interpreters/dzaima-apl { + buildNativeImage = false; + stdenv = stdenvNoCC; + jdk = jre; + }; + dapl-native = callPackage ../development/interpreters/dzaima-apl { + buildNativeImage = true; + jdk = graalvm11-ce; + }; + gnucap = callPackage ../applications/science/electronics/gnucap { }; gnu-cobol = callPackage ../development/compilers/gnu-cobol { }; From bcae9bb64fa51b8a4651ac16a8a543d04b5b6ef1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Fri, 8 Oct 2021 12:58:38 +0100 Subject: [PATCH 06/18] portfolio: 0.54.2 -> 0.55.0 --- pkgs/applications/office/portfolio/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index 8533df467132..f5418f372983 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , autoPatchelfHook , fetchurl , glibc @@ -24,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.54.2"; + version = "0.55.0"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-fKUKVeR0q8oylpwF4d3jnkON4vbQ80Fc9WYWStb67ek="; + sha256 = "0s7qb7z2wiypiahw1y1lz9pbhxcacj5myzy0qcqjrpnaq7ymvs05"; }; nativeBuildInputs = [ From 545fca99f20d7109e6ffe50f985de50e7392ad52 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 8 Oct 2021 12:18:00 -0500 Subject: [PATCH 07/18] nodejs-16_x: 16.10.0 -> 16.11.0 https://github.com/nodejs/node/releases/tag/v16.11.0 --- pkgs/development/web/nodejs/v16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index f89f98f63200..89a35565064d 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "16.10.0"; - sha256 = "04krpy0r8msv64rcf0vy2l2yzf0a401km8p5p7h12j9b4g51mp4p"; + version = "16.11.0"; + sha256 = "1bk5f47hm409129w437h8qdvmqjdr11awblvnhkfsp911nyk3xnk"; patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; } From 01b6b651b4864e68a44b47c9b9f65a411112be2a Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Fri, 8 Oct 2021 12:32:04 -0700 Subject: [PATCH 08/18] zoneminder: 1.34.22 -> 1.36.8 --- ...1-Don-t-use-file-timestamp-in-cache-filename.patch | 11 +++++------ pkgs/servers/zoneminder/default.nix | 7 ++++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch b/pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch index 6ca55a147688..ca2792099bd1 100644 --- a/pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch +++ b/pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch @@ -1,4 +1,4 @@ -From db38a11228eceea10dc97ecc87023b4919caa918 Mon Sep 17 00:00:00 2001 +From 8823e48b055b7e574c08069048ba21ffa4393699 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Fri, 21 Feb 2020 21:52:00 -0500 Subject: [PATCH] Don't use file timestamp in cache filename @@ -14,13 +14,13 @@ unique. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/includes/functions.php b/web/includes/functions.php -index 19567a5c1..0242c09bc 100644 +index 89d2cc8ad..52cbb6f38 100644 --- a/web/includes/functions.php +++ b/web/includes/functions.php -@@ -2223,7 +2223,8 @@ function cache_bust($file) { +@@ -1941,7 +1941,8 @@ function cache_bust($file) { $parts = pathinfo($file); global $css; - $dirname = preg_replace('/\//', '_', $parts['dirname']); + $dirname = str_replace('/', '_', $parts['dirname']); - $cacheFile = $dirname.'_'.$parts['filename'].'-'.$css.'-'.filemtime($file).'.'.$parts['extension']; + $srcHash = '@srcHash@'; + $cacheFile = $dirname.'_'.$parts['filename'].'-'.$css.'-'.$srcHash.'.'.$parts['extension']; @@ -28,5 +28,4 @@ index 19567a5c1..0242c09bc 100644 return 'cache/'.$cacheFile; } else { -- -2.25.1 - +2.32.0 diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index 2ea162b0d60e..3aed72eb8b8d 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -78,13 +78,14 @@ let in stdenv.mkDerivation rec { pname = "zoneminder"; - version = "1.34.22"; + version = "1.36.8"; src = fetchFromGitHub { owner = "ZoneMinder"; repo = "zoneminder"; rev = version; - sha256 = "1144j9crm0q5pwxnkmy3ahw1vbkddpbk2ys2m2pxxxiqifdhll83"; + sha256 = "sha256-UUpq4CCZq+EwVNGsLCQuVWdY3yoGw977AaMk1iJ6a5U="; + fetchSubmodules = true; }; patches = [ @@ -130,7 +131,7 @@ in stdenv.mkDerivation rec { for f in scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in \ scripts/zmupdate.pl.in \ - src/zm_config.h.in \ + src/zm_config_data.h.in \ web/api/app/Config/bootstrap.php.in \ web/includes/config.php.in ; do substituteInPlace $f --replace @ZM_CONFIG_SUBDIR@ /etc/zoneminder From 6b97150cda5b61bf5fee0f7385ec16dcb93654e1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 8 Oct 2021 08:31:03 +0200 Subject: [PATCH 09/18] python3Packages.hap-python: 4.1.0 -> 4.3.0 --- pkgs/development/python-modules/hap-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix index 39d7429e8106..c58e50bee868 100644 --- a/pkgs/development/python-modules/hap-python/default.nix +++ b/pkgs/development/python-modules/hap-python/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "hap-python"; - version = "4.1.0"; + version = "4.3.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ikalchev"; repo = "HAP-python"; rev = "v${version}"; - sha256 = "sha256-vUbcsG6mKPgH+IF5i/BYSIkfIizSZzMWz0Kq0yfuKxE="; + sha256 = "sha256-G4KL6iMeVn/tmvFtFL8vyqHGNfqk6j8iG4tDK9VpCyM="; }; propagatedBuildInputs = [ From 5a2ecde0daa038cda090fef88d32e3a110c21e6f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Oct 2021 22:39:38 +0200 Subject: [PATCH 10/18] gitea: 1.15.3 -> 1.15.4 ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.15.4 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 30ffc2b3295e..3088a68ca699 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -16,12 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.15.3"; + version = "1.15.4"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-r8FP9jEIChg4XDb0AF9riQBpNCVmffrVI0yzI83qwA0="; + sha256 = "sha256-UsaTA6bI5pr3vbvO3jFn8A8qVRi385fbiJQD09Ut/X0="; }; unpackPhase = '' From 55ed9b77357ba2c7042af32b8c8e58293fd2ec06 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 8 Oct 2021 16:49:06 -0500 Subject: [PATCH 11/18] _3270font: 2.3.0 -> 2.3.1 https://github.com/rbanffy/3270font/releases/tag/v2.3.1 --- pkgs/data/fonts/3270font/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/3270font/default.nix b/pkgs/data/fonts/3270font/default.nix index d737c9383f15..914583d97eec 100644 --- a/pkgs/data/fonts/3270font/default.nix +++ b/pkgs/data/fonts/3270font/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "2.3.0"; + version = "2.3.1"; in fetchzip { name = "3270font-${version}"; - url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_fd00815.zip"; + url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_3b8f2fb.zip"; - sha256 = "0ny2jcsfa1kfzkm979dfzqv756ijm5xirm02ln7a4kwhxxsm5xr1"; + sha256 = "06n87ydn2ayfhpg8318chmnwmdk3d4mmy65fcgf8frbiv2kpqncs"; postFetch = '' mkdir -p $out/share/fonts/ From 27ce3b12b3d600155732eb014c02ca3dde180a24 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Oct 2021 23:13:10 +0200 Subject: [PATCH 12/18] home-assistant: 2021.10.0 -> 2021.10.1 --- pkgs/servers/home-assistant/component-packages.nix | 4 ++-- pkgs/servers/home-assistant/default.nix | 4 ++-- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index e9b203554c64..9299679dcc1c 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.10.0"; + version = "2021.10.1"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -216,7 +216,7 @@ "edimax" = ps: with ps; [ pyedimax ]; "edl21" = ps: with ps; [ pysml ]; "ee_brightbox" = ps: with ps; [ eebrightbox ]; - "efergy" = ps: with ps; [ ]; # missing inputs: pyefergy + "efergy" = ps: with ps; [ pyefergy ]; "egardia" = ps: with ps; [ pythonegardia ]; "eight_sleep" = ps: with ps; [ pyeight ]; "elgato" = ps: with ps; [ elgato ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 970f14bbec22..2a9c660be670 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -114,7 +114,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.10.0"; + hassVersion = "2021.10.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -131,7 +131,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "0m54ynx0i4a6wljg6d9i6xa79c15cqah5cgaswgrbaxhjw5q78iv"; + sha256 = "11bg3pik2ib87wnzww7415aihv90rmqqb2fhna71dw3qjqx4359v"; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index c7e6c6b7e4a4..9b3746fb2d1e 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 = "20211006.0"; + version = "20211007.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rlscTHqa1TMsIVW7kWFGR/feak0XewDRkybpo8dPXj0="; + sha256 = "sha256-GchSCqdVPk8RVe4iNEVvrsIgrV9/CHE5bQwyaT+ErvU="; }; # there is nothing to strip in this package From c1cf3662a1488840420f25ebb95c0fdeb20f3b4e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 9 Oct 2021 01:00:35 +0200 Subject: [PATCH 13/18] python3Packages.python-didl-lite: 1.2.6 -> 1.3.0 --- pkgs/development/python-modules/python-didl-lite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-didl-lite/default.nix b/pkgs/development/python-modules/python-didl-lite/default.nix index 64fcd189c749..cab8bc0c0b0c 100644 --- a/pkgs/development/python-modules/python-didl-lite/default.nix +++ b/pkgs/development/python-modules/python-didl-lite/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "python-didl-lite"; - version = "1.2.6"; + version = "1.3.0"; disabled = pythonOlder "3.5.3"; src = fetchFromGitHub { owner = "StevenLooman"; repo = pname; rev = version; - sha256 = "sha256-1rr26dnV5As15HeFLWEDBDYPiRDHkGfYOYFhSJi7iyU="; + sha256 = "sha256-NsZ/VQlKEp4p3JRSNQKTGvzLrKgDCkkT81NzgS3UHos="; }; propagatedBuildInputs = [ From 4a7a5d175ab5419fb170bb46dea2b2409e271c7b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 9 Oct 2021 01:01:01 +0200 Subject: [PATCH 14/18] python3Packages.async-upnp-client: 0.22.5 -> 0.22.8 --- pkgs/development/python-modules/async-upnp-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index 2f5bb183795f..a921948bcfe6 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.22.5"; + version = "0.22.8"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; rev = version; - sha256 = "sha256-/GELV94m75jSIFR4Ua3Sr+L9iGmzRQxPMIK2yfDiX9E="; + sha256 = "sha256-0McLH5iNiA6aIyk6OaN57JAs97R+/4M7xaUDmh+xV6c="; }; propagatedBuildInputs = [ From a1d3f8f48e56cc4de2417a576ee9f82f8a2f4758 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 9 Oct 2021 01:03:41 +0200 Subject: [PATCH 15/18] home-assistant: 2021.10.1 -> 2021.10.2 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 9299679dcc1c..13547f56a2ab 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.10.1"; + version = "2021.10.2"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 2a9c660be670..af49670b9114 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -114,7 +114,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.10.1"; + hassVersion = "2021.10.2"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -131,7 +131,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "11bg3pik2ib87wnzww7415aihv90rmqqb2fhna71dw3qjqx4359v"; + sha256 = "0nds4491v8wy4d8w842asjpjj7xhqghlq0h61i7z6wp8jln7m418"; }; # leave this in, so users don't have to constantly update their downstream patch handling From d02c87a392cd964af20243e072b186f9efd90572 Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Sat, 9 Oct 2021 00:13:41 +0000 Subject: [PATCH 16/18] vscodium: 1.60.2 -> 1.61.0 --- 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 65eb761cabcd..8ca19d95a7a5 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 = "11zj9b8zhgfyh3m78ihg1k78m3v1khwa742mmsxji6ryxqkhvnr4"; - x86_64-darwin = "19jk8rry11dvyfprq8i2j9r9aj17kfxqx5hl069mlkz0ca18kxmc"; - aarch64-linux = "01slccwqhh6njd8q278svbfxph5lajx77ns03yrj9iva8w48gixy"; - armv7l-linux = "1g7zq6y99b5sg8g10hq50qr15m99n0cmydm6rl9dkyca2038ihbi"; + x86_64-linux = "072wdzl8gp4ygprgza4cfg46fvrd13zx9za5fa8s6vsd9w1l95l7"; + x86_64-darwin = "083sipxp9r7g6p6la15jjlib52l8xjbfxn2cb05scigq3zsyffy7"; + aarch64-linux = "1s82f6ba57r7bnjhbanmih5g7wa001sf6php1402w06cxxy7dz00"; + armv7l-linux = "113nk1rqw07giqq8pnc11dymzxdhj3nn3q2p0fppnm3lpccaq9hs"; }.${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.2"; + version = "1.61.0"; pname = "vscodium"; executableName = "codium"; From 85bd79c702e524761512d2a8a4a1730b4b85786e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 8 Oct 2021 20:10:07 -0500 Subject: [PATCH 17/18] actionlint: 1.6.4 -> 1.6.5 https://github.com/rhysd/actionlint/releases/tag/v1.6.5 --- pkgs/development/tools/analysis/actionlint/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/actionlint/default.nix b/pkgs/development/tools/analysis/actionlint/default.nix index 72c5595e2883..0855084b314e 100644 --- a/pkgs/development/tools/analysis/actionlint/default.nix +++ b/pkgs/development/tools/analysis/actionlint/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "actionlint"; - version = "1.6.4"; + version = "1.6.5"; subPackages = [ "cmd/actionlint" ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "rhysd"; repo = "actionlint"; rev = "v${version}"; - sha256 = "1516892wikz3zda0la57s8nbm6459pf4vd123rv09s4nivznbmcx"; + sha256 = "12s9ijfvnmfbcvf5lxi2jm3j7vrn7rfkas2lib5jdih77hf9270k"; }; vendorSha256 = "1i7442n621jmc974b73pfz1gyqw74ilpg1zz16yxqpfh5c958m7n"; @@ -30,5 +30,6 @@ buildGoModule rec { changelog = "https://github.com/rhysd/actionlint/raw/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = [ maintainers.marsam ]; + mainProgram = "actionlint"; }; } From e19b6535d1c7a2edc499f9b392bbb0560c6bc9f9 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 9 Oct 2021 02:16:43 +0000 Subject: [PATCH 18/18] keepalived: 2.2.2 -> 2.2.4 This also fixes compilation under newer glibc, it seems. --- pkgs/tools/networking/keepalived/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index 48fe72d42967..22606ec78b69 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -1,25 +1,30 @@ { lib, stdenv, fetchFromGitHub, nixosTests -, libnfnetlink, libnl, net-snmp, openssl -, pkg-config, autoreconfHook }: +, file, libmnl, libnftnl, libnl +, net-snmp, openssl, pkg-config +, autoreconfHook }: stdenv.mkDerivation rec { pname = "keepalived"; - version = "2.2.2"; + version = "2.2.4"; src = fetchFromGitHub { owner = "acassen"; repo = "keepalived"; rev = "v${version}"; - sha256 = "sha256-qugEEbOQ4bemzelIOaNFvo3piMZpKUZGjR+4XF8aLHw="; + sha256 = "sha256-WXKu+cabMmXNHiLwXrQqS8GQHIWYkee7vPddyGURWic="; }; buildInputs = [ - libnfnetlink + file + libmnl + libnftnl libnl net-snmp openssl ]; + enableParallelBuilding = true; + passthru.tests.keepalived = nixosTests.keepalived; nativeBuildInputs = [ pkg-config autoreconfHook ]; @@ -32,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://keepalived.org"; description = "Routing software written in C"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; }