diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-06-14 06:02:07 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-14 06:02:07 +0000 |
commit | 886a17f9347d5377d14f0c3bf0963ba5208a902c (patch) | |
tree | 9aefcc7635d87a8144d91b9d733c48d7c9acfb73 | |
parent | 7eb0857556f1d487f22f2fa449f101da407f3ded (diff) | |
parent | 6a7069b65a6efc0df64211f1393193d01bd13f61 (diff) |
Merge staging-next into staging
-rw-r--r-- | pkgs/applications/audio/strawberry/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/1password/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/palemoon/default.nix | 9 | ||||
-rw-r--r-- | pkgs/applications/networking/flexget/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/jellyfin-mpv-shim/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/aws-adfs/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/python-modules/velbus-aio/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/analysis/tfsec/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/polymc/default.nix | 27 | ||||
-rw-r--r-- | pkgs/servers/nosql/redis/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/filesystems/httm/default.nix | 6 |
11 files changed, 47 insertions, 38 deletions
diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 459380b86a3ac..fc02833207efa 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -37,13 +37,13 @@ mkDerivation rec { pname = "strawberry"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - hash = "sha256-UjmrU/SA8gf+HwyCb6hm8IClUaEXvWGmIy3xDJPIsgE="; + hash = "sha256-6d7oB54IPI+G5Mhkj+PdQQY93r1SBE2R06qSGIacj8Q="; }; # the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 619e01f578478..6231e62bc2dcb 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.3.1"; + version = "2.4.1"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-MikzcVqlhVSKzr1ttOCAg4p57sjsalSuwcqBhVUr5Ng=" "zip"; - i686-linux = fetch "linux_386" "sha256-ElOhd3n38xAPtVePjQb8qMUCCAWqEfBKlX9Vuz5/Zns=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-r8yl9dDiiIQBooePrq/dGw2RU9tJXmeblx+qk3qq5Ys=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-sXdYInNBOEW/zIEPjhKbFOMxZdrMlE8pOwhmXLUJgsk=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-ANRYE1BoezrcDxZrQYp/OPdtn4J+FmC/PLSIP5Amm18=" "zip"; + i686-linux = fetch "linux_386" "sha256-w3anr76uj/Z+ilZ+LUGOB1CoKkvxcD+v8c8lVADPwRY=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-axZ+XDIMJlAicnYTIXgcaoT+Zcg6xvHlchl/ng7V9GY=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-/DnrQ4fwbc2ELtsEClvzA9kTrse3pMgGLbhiKZ3gphA=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 77419c95eb0ae..c4c00d563786a 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -113,6 +113,13 @@ stdenv.mkDerivation rec { configurePhase = '' runHook preConfigure + # Too many cores can lead to build flakiness + # https://forum.palemoon.org/viewtopic.php?f=5&t=28480 + export jobs=$(($NIX_BUILD_CORES<=32 ? $NIX_BUILD_CORES : 32)) + if [ -z "$enableParallelBuilding" ]; then + jobs=1 + fi + export MOZCONFIG=$PWD/mozconfig export MOZ_NOSPAM=1 @@ -120,7 +127,7 @@ stdenv.mkDerivation rec { export gtkversion=${if withGTK3 then "3" else "2"} export xlibs=${lib.makeLibraryPath [ xorg.libX11 ]} export prefix=$out - export mozmakeflags="-j${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"}" + export mozmakeflags="-j$jobs" export autoconf=${autoconf213}/bin/autoconf substituteAll ${./mozconfig} $MOZCONFIG diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 038c6d58d13f7..0a4cea6288152 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.3.16"; + version = "3.3.17"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-XN5KJ9GgFSDMYd6n9Mt3UARsa/ZAB61DBGMRvFz/NVA="; + hash = "sha256-xVHk6fQBY8EQsZJDZYoQ+WXDpLGJrRTVR6xhF1DWv0I="; }; postPatch = '' diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix index 827824930cb20..9642556ad1320 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -13,11 +13,11 @@ buildPythonApplication rec { pname = "jellyfin-mpv-shim"; - version = "2.0.2"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "yFFMsGbzMAKyXpD/vZelswYulTYe5WybjG5pD2RpLrk="; + sha256 = "Nh2bSmzxInZgZmmelsXih6lRartDKjbC0/CB1gYiLcQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index 3b2963f7d6930..7f79f99e3a677 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -5,6 +5,7 @@ , click , configparser , fetchFromGitHub +, fetchpatch , fido2 , lxml , poetry-core @@ -46,6 +47,14 @@ buildPythonPackage rec { requests-kerberos ]; + patches = [ + # Apply new fido2 api (See: venth/aws-adfs#243) + (fetchpatch { + url = "https://github.com/venth/aws-adfs/commit/09836d89256f3537270d760d8aa30ab9284725a8.diff"; + hash = "sha256-pAAJvOa43BXtyWvV8hsLe2xqd5oI+vzndckRTRol61s="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace 'boto3 = "^1.20.50"' 'boto3 = "*"' \ diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index 2196d9b71f2c7..b31af8f36f526 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2022.6.1"; + version = "20212.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = pname; rev = version; - sha256 = "sha256-YHq194H7T4IxyCvPgA92vkWf7MX+ulXyw/uxo4WRupU="; + sha256 = "sha256-MqSqwyfNICEU6h7+HAep3z1Uak30rlQ6noWEB3awVpA="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 73771c8e87579..9dc35bcb78952 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "tfsec"; - version = "1.23.3"; + version = "1.24.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7NpnEuvYjffxapVKs9pYiLVWGyUBwFwvz/GVKURa95Y="; + sha256 = "sha256-puH8MoY04OokEcHMn93i/7jBIYbXtYBh2BcBwmBZJVs="; }; ldflags = [ diff --git a/pkgs/games/polymc/default.nix b/pkgs/games/polymc/default.nix index a0f4abc1e7ce1..2fa5ce7cf06fe 100644 --- a/pkgs/games/polymc/default.nix +++ b/pkgs/games/polymc/default.nix @@ -1,12 +1,12 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub , cmake , jdk8 , jdk , zlib , file -, makeWrapper +, wrapQtAppsHook , xorg , libpulseaudio , qtbase @@ -15,32 +15,25 @@ , glfw , openal , msaClientID ? "" +, jdks ? [ jdk jdk8 ] }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "polymc"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "PolyMC"; repo = "PolyMC"; rev = version; - sha256 = "sha256-oTzhKGDi1Kr3JXY9dYQf1rVDPFr52tJ7L+rb5LCbtBE="; + sha256 = "sha256-hqsyS82UzgCUZ9HjoPKjOLE49fwLntRAh3mVrTsmi3o="; fetchSubmodules = true; }; - nativeBuildInputs = [ cmake file jdk makeWrapper ]; + nativeBuildInputs = [ cmake file jdk wrapQtAppsHook ]; buildInputs = [ qtbase zlib quazip ]; - postPatch = '' - # hardcode jdk paths - substituteInPlace launcher/java/JavaUtils.cpp \ - --replace 'scanJavaDir("/usr/lib/jvm")' 'javas.append("${jdk}/lib/openjdk/bin/java")' \ - --replace 'scanJavaDir("/usr/lib32/jvm")' 'javas.append("${jdk8}/lib/openjdk/bin/java")' - ''; - - cmakeFlags = [ "-DLauncher_PORTABLE=0" ] ++ - lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]; + cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]; dontWrapQtApps = true; @@ -58,9 +51,9 @@ mkDerivation rec { ]; in '' # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 - wrapProgram $out/bin/polymc \ - "''${qtWrapperArgs[@]}" \ + wrapQtApp $out/bin/polymc \ --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \ + --prefix POLYMC_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks} \ --prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]} ''; diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index a99523cfd7037..5483dece905e8 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "redis"; - version = "7.0.0"; + version = "7.0.2"; src = fetchurl { url = "https://download.redis.io/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-KE2L0f2F1qVaBe5OfDHDGXetVsvzRO2DeQvusUi6pyA="; + sha256 = "sha256-Xlfq/n1Kxey2p9ZNa2Hbd1YW2/kDKTs/zGYHFtvaXus="; }; # Cross-compiling fixes diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index c44e75724c091..f4cfdc46e9b43 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.11.1"; + version = "0.11.6"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - sha256 = "GNiqWm6MsgLYjrkrbIHgKxtLmE4IJntcLd9GVRu1v2A="; + sha256 = "5jeCENAas7i/eBySSBjwmdc3MEHVhWWH7/RZGS8g1Y4="; }; - cargoSha256 = "87BkVAZ3BPtnuNUBTzdR4oiE0ZLIr5CacdYenU4V9qU="; + cargoSha256 = "x4qfi3Wm5r0HNqDgmJBXNvS1xQDU7MQ/H2+zNpHon+s="; nativeBuildInputs = [ installShellFiles ]; |