From 720ba79a373bceabd44fd166f7f388316fad9e3b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Aug 2021 07:05:54 +0000 Subject: [PATCH 01/11] krankerl: 0.13.1 -> 0.13.2 --- pkgs/development/tools/krankerl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/krankerl/default.nix b/pkgs/development/tools/krankerl/default.nix index 8697f81a9da6..c44677235d95 100644 --- a/pkgs/development/tools/krankerl/default.nix +++ b/pkgs/development/tools/krankerl/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "krankerl"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "ChristophWurst"; repo = "krankerl"; rev = "v${version}"; - sha256 = "sha256-uIFcWHdW8887CDkFxZznh9akYs+vxsE9Bc9g1hKi7Kc="; + sha256 = "sha256-Kol39AtM5m6FC+s5SDbQhWuASkGbeXPlmSGb7axEuK8="; }; - cargoSha256 = "sha256-6joHwz0HIVbta8ALvsJLMvmeDh9IFPR4Cx36H63MliI="; + cargoSha256 = "sha256-bPcKe3vE3VIjLJ4iYdF3Gt0sID09gRpxG5TpTGWhnPs="; nativeBuildInputs = [ pkg-config From 9f74d336f86ad96c23147edfff3aabc4454c2bc7 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Wed, 25 Aug 2021 15:44:22 +0200 Subject: [PATCH 02/11] perl.perl-cross: 1.3.6 -> 01c176ac0 --- pkgs/development/interpreters/perl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 3b39974c16b1..a34ffe7517ab 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -168,14 +168,14 @@ let priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` }; } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "1.3.6"; + crossVersion = "01c176ac0f57d40cc3b6f8e441062780f073d952"; # Aug 22, 2021 perl-cross-src = fetchFromGitHub { name = "perl-cross-${crossVersion}"; owner = "arsv"; repo = "perl-cross"; rev = crossVersion; - sha256 = "0k5vyj40czbkfl7r3dcwxpc7dvdlp2xliaav358bviq3dq9vq9bb"; + sha256 = "19mwr1snwl4156rlhn74kmpl1wyc7ahhlrjfpnfcj3n63ic0c56y"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; From 57b7e413531a89858374889c1f07645590a18d74 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Wed, 25 Aug 2021 15:45:19 +0200 Subject: [PATCH 03/11] perldevel: 5.35.0 -> 5.35.3 --- pkgs/development/interpreters/perl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index a34ffe7517ab..54b7e9afefd4 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -212,7 +212,7 @@ in { perldevel = common { perl = pkgs.perldevel; buildPerl = buildPackages.perldevel; - version = "5.35.0"; - sha256 = "0217nbswhkjhw60kng2p64611xna7za681kk30fkriyicd3yph6n"; + version = "5.35.3"; + sha256 = "06442zc5rvisl120f58jpy95bkf8f1cc4n577nzihdavlbfmnyyn"; }; } From f5e95757f22ba20b9977c7a3ae560f5773952bbe Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 30 Aug 2021 17:13:00 +0200 Subject: [PATCH 04/11] xonotic: support user statistics reporting Xonotic supports (opt-in) tracking of user statistics. For staistics to be trackable each player needs a unique identifier that is based on some cryptographic identity. For that to work we need to build the "blind" library and provide it do xonotic during runtime. The official xonotic releases ship with the public key of some sort of central trust authority and thus we must retain that file within our data package as well. Before this commit the crypto_* commands in the ingame console weren't available. With this commit you should be able to execute "crypto_keys" commands as show below. $ crypto_keys 0: public key key_0.d0pk (fingerprint: Xon//KssdlzGkFKdnnN4sgg8H+koTbBn5JTi37BAW1Q=) private ID key_0.d0si (public key fingerprint: 9piqrk8ajAPRc3BnSbkac5GA+yL3dOwh53BhyrfmVlI=) Once the above command works you have to configure your player profile to allow tracking (if you want) via the Multiplayer -> Profile dialog. In the top right-hand corner there will be checkboxes to control the level of tracking that you are opting in to. --- pkgs/games/xonotic/default.nix | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 6d7327714768..d5374c5446d1 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -6,6 +6,8 @@ libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, alsa-lib , # sdl SDL2 +, # blind + gmp , withSDL ? true , withGLX ? false @@ -63,7 +65,7 @@ let }; nativeBuildInputs = [ unzip ]; - buildInputs = [ libjpeg zlib libvorbis curl ] + buildInputs = [ libjpeg zlib libvorbis curl gmp ] ++ lib.optional withGLX [ libX11.dev libGLU.dev libGL.dev libXpm.dev libXext.dev libXxf86vm.dev alsa-lib.dev ] ++ lib.optional withSDL [ SDL2.dev ]; @@ -74,17 +76,27 @@ let dontStrip = target != "release"; - buildPhase = lib.optionalString withDedicated '' + postConfigure = '' + pushd ../d0_blind_id + ./configure $configureFlags + popd + ''; + + buildPhase = (lib.optionalString withDedicated '' make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES sv-${target} '' + lib.optionalString withGLX '' make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES cl-${target} '' + lib.optionalString withSDL '' make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES sdl-${target} + '') + '' + pushd ../d0_blind_id + make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES + popd ''; enableParallelBuilding = true; - installPhase = '' + installPhase = ('' for size in 16x16 24x24 32x32 48x48 64x64 72x72 96x96 128x128 192x192 256x256 512x512 1024x1024 scalable; do install -Dm644 ../../misc/logos/xonotic_icon.svg \ $out/share/icons/hicolor/$size/xonotic.svg @@ -95,6 +107,10 @@ let install -Dm755 darkplaces-glx "$out/bin/xonotic-glx" '' + lib.optionalString withSDL '' install -Dm755 darkplaces-sdl "$out/bin/xonotic-sdl" + '') + '' + pushd ../d0_blind_id + make install + popd ''; # Xonotic needs to find libcurl.so at runtime for map downloads @@ -121,10 +137,10 @@ in rec { xonotic-data = fetchzip { name = "xonotic-data"; url = "https://dl.xonotic.org/xonotic-${version}.zip"; - sha256 = "1ygkh0v68y4sd1w5vpk8dgb65h5jm599hwszdfgjp3ax4d3ml81x"; + sha256 = "15caj11v9hhr7w55w3rs1rspblzr9lg1crqivbn9pyyq0rif8cpl"; extraPostFetch = '' cd $out - rm -rf $(ls | grep -v "^data$") + rm -rf $(ls | grep -v "^data$" | grep -v "^key_0.d0pk$") ''; meta.hydraPlatforms = []; passthru.version = version; @@ -156,7 +172,7 @@ in rec { copyDesktopItems '' + '' for binary in $out/bin/xonotic-*; do - wrapProgram $binary --add-flags "-basedir ${xonotic-data}" + wrapProgram $binary --add-flags "-basedir ${xonotic-data}" --prefix LD_LIBRARY_PATH : "${xonotic-unwrapped}/lib" done ''); } From e02711df7d0ec59984280986159ff99135bdd9a0 Mon Sep 17 00:00:00 2001 From: Svend Sorensen Date: Mon, 30 Aug 2021 18:23:28 -0700 Subject: [PATCH 05/11] gthumb: 3.11.3 -> 3.11.4 Add `libheif` for AVIF/HEIF image support. --- pkgs/applications/graphics/gthumb/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index cd3a6f368e9c..50e1babda2ac 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -5,6 +5,7 @@ , meson , ninja , exiv2 +, libheif , libjpeg , libtiff , gst_all_1 @@ -32,11 +33,11 @@ stdenv.mkDerivation rec { pname = "gthumb"; - version = "3.11.3"; + version = "3.11.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11bvcimamdcksgqj1ymh54yzhpwc5j8glda8brqqhwq3h2wj0j9d"; + sha256 = "sha256-3ZsPiUXX34Ev/a3OyMO94dyXZyMy4AVt5Cp/ELZLIGw="; }; nativeBuildInputs = [ @@ -66,6 +67,7 @@ stdenv.mkDerivation rec { json-glib lcms2 libchamplain + libheif libjpeg libraw librsvg From 1bb91a2329ec13d0dc3ae91b58b07287b254f35e Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 1 Sep 2021 21:54:31 +0200 Subject: [PATCH 06/11] mutt: 2.1.1 -> 2.1.2 --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 0c2ffdc7fffc..a7b90c284acf 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "0jjjvqkqmpj55v111p1a1i2ry7mpd1bpphn1bhvlr18rgw7xdrja"; + sha256 = "0s9wkygjd7xhvd1zdaidbvszq4abb0iv5830ir65glcfzbdbfak9"; }; patches = optional smimeSupport (fetchpatch { From 33df189fae1c0909feb64462e067e405c7639f3a Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 2 Sep 2021 01:51:41 +0300 Subject: [PATCH 07/11] pythonPackages.fiona: fix build --- pkgs/top-level/python-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ef3b52af0a4..e1f7cccc31ac 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2564,7 +2564,9 @@ in { fints = callPackage ../development/python-modules/fints { }; - fiona = callPackage ../development/python-modules/fiona { }; + fiona = callPackage ../development/python-modules/fiona { + gdal = pkgs.gdal_2; + }; fipy = callPackage ../development/python-modules/fipy { }; From 35f292e38e2cdcb867a33c1f8ad2b9808fd072b0 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 2 Sep 2021 14:08:49 +0200 Subject: [PATCH 08/11] strace: 5.13 -> 5.14 ChangeLog: https://github.com/strace/strace/releases/tag/v5.14 --- pkgs/development/tools/misc/strace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index b3722965fdcd..785331fb50be 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "5.13"; + version = "5.14"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Wsw0iIudUQrWrJFdSo3wj1HPGukg6iRkn2pLuYTQtlY="; + sha256 = "sha256-kBvubbXhfeutRTDdn/tNyalsSmVu2+HDFBt8swexHnM="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From 9ce8df127d6d0b21ec3fc3864625677bb2fa73f6 Mon Sep 17 00:00:00 2001 From: Matthias Treydte Date: Thu, 2 Sep 2021 15:43:57 +0200 Subject: [PATCH 09/11] nixos/etc: make sure local "source" files are imported to the store The treatment of the "source" parameter changed with eb7120dc79966d5ed168321fd213de38de13a2b1, breaking stuff. Before that commit, the source parameter was converted to a string by implicit coercion, which would copy the file to the store and yield an string containing the store path. Now, by the virtue of escapeShellArg, toString is called explicitly on that path, which will yield an string containing the absolute path of the file. This commit restores the old behavior. --- nixos/modules/system/etc/etc.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index 6971ab42d99f..84468ea31f74 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -6,7 +6,9 @@ with lib; let - etc' = filter (f: f.enable) (attrValues config.environment.etc); + # if the source is a local file, it should be imported to the store + localToStore = mapAttrs (name: value: if name == "source" then "${value}" else value); + etc' = map localToStore (filter (f: f.enable) (attrValues config.environment.etc)); etc = pkgs.runCommandLocal "etc" { # This is needed for the systemd module From f2b50ffadb6b5365844003cf8f861e524ff44a8a Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 2 Sep 2021 19:41:59 +0900 Subject: [PATCH 10/11] elixir-ls: 0.8.0 -> 0.8.1 --- pkgs/development/beam-modules/elixir-ls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix index 56aa47f59f9f..1385b40fc1f5 100644 --- a/pkgs/development/beam-modules/elixir-ls/default.nix +++ b/pkgs/development/beam-modules/elixir-ls/default.nix @@ -4,20 +4,20 @@ mixRelease rec { pname = "elixir-ls"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "elixir-lsp"; repo = "elixir-ls"; rev = "v${version}"; - sha256 = "sha256-pUvONMTYH8atF/p2Ep/K3bwJUDxTzCsxLPbpjP0tQpM="; + sha256 = "sha256-KlZq12RCor9GrwA8QMP3R+jUQ/xFHRjkLwwkvthiMU0="; fetchSubmodules = true; }; mixFodDeps = fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version; - sha256 = "sha256-YRzPASpg1K2kZUga5/aQf4Q33d8aHCwhw7KJxSY56k4="; + sha256 = "sha256-OzjToAg+q/ybCyqzNFk28OBsItjFTbdPi416EPh2qX0="; }; # elixir_ls is an umbrella app From 4194d02deb6c3bd60dffe752b4b788570553a649 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich <56614642+Kranzes@users.noreply.github.com> Date: Thu, 2 Sep 2021 19:35:46 +0300 Subject: [PATCH 11/11] jitsi-meet-electron: 2.8.10 -> 2.8.11 (#136197) --- .../instant-messengers/jitsi-meet-electron/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index 6a98df12583d..149be3686e85 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-electron"; - version = "2.8.10"; + version = "2.8.11"; src = fetchurl { url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage"; - sha256 = "sha256-k++vumbhcMl9i4s8f04zOUAfYlA1g477FjrGuEGSD1U="; + sha256 = "sha256-DznbSwA1UISw3EkIfM5hGgmIToeXsH1b1HB7UOgDTKU="; name = "${pname}-${version}.AppImage"; };