b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge staging into staging-next

Browse source
This commit is contained in:
Frederik Rietdijk 2021-03-08 19:20:18 +01:00
parent 6ba8f344c6 042adf08d1
commit 277d488026
374 changed files with 3871 additions and 2493 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
doc/languages-frameworks/rust.section.md
View file

@ -72,8 +72,8 @@ For `cargoHash` you can use:
Per the instructions in the [Cargo Book](https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html) Per the instructions in the [Cargo Book](https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html)
best practices guide, Rust applications should always commit the `Cargo.lock` best practices guide, Rust applications should always commit the `Cargo.lock`
file in git to ensure a reproducible build. However, a few packages do not, and file in git to ensure a reproducible build. However, a few packages do not, and
Nix depends on this file, so if it missing you can use `cargoPatches` to apply Nix depends on this file, so if it is missing you can use `cargoPatches` to
it in the `patchPhase`. Consider sending a PR upstream with a note to the apply it in the `patchPhase`. Consider sending a PR upstream with a note to the
maintainer describing why it's important to include in the application. maintainer describing why it's important to include in the application.
The fetcher will verify that the `Cargo.lock` file is in sync with the `src` The fetcher will verify that the `Cargo.lock` file is in sync with the `src`
@ -146,6 +146,8 @@ where they are known to differ. But there are ways to customize the argument:
rustc.platform = { foo = ""; bar = ""; }; rustc.platform = { foo = ""; bar = ""; };
}; };
} }
```
will result in: will result in:
```shell ```shell
--target /nix/store/asdfasdfsadf-thumb-crazy.json # contains {"foo":"","bar":""} --target /nix/store/asdfasdfsadf-thumb-crazy.json # contains {"foo":"","bar":""}
@ -156,7 +158,7 @@ path) can be passed directly to `buildRustPackage`:
```nix ```nix
pkgs.rustPlatform.buildRustPackage { pkgs.rustPlatform.buildRustPackage {
(...) /* ... */
target = "x86_64-fortanix-unknown-sgx"; target = "x86_64-fortanix-unknown-sgx";
} }
``` ```
@ -191,6 +193,13 @@ rustPlatform.buildRustPackage {
Please note that the code will be compiled twice here: once in `release` mode Please note that the code will be compiled twice here: once in `release` mode
for the `buildPhase`, and again in `debug` mode for the `checkPhase`. for the `buildPhase`, and again in `debug` mode for the `checkPhase`.
Test flags, e.g., `--features xxx/yyy`, can be passed to `cargo test` via the
`cargoTestFlags` attribute.
Another attribute, called `checkFlags`, is used to pass arguments to the test
binary itself, as stated
(here)[https://doc.rust-lang.org/cargo/commands/cargo-test.html].
#### Tests relying on the structure of the `target/` directory #### Tests relying on the structure of the `target/` directory
Some tests may rely on the structure of the `target/` directory. Those tests Some tests may rely on the structure of the `target/` directory. Those tests
@ -320,9 +329,10 @@ attributes can also be used:
variable `buildAndTestSubdir` can be used to build a crate in a variable `buildAndTestSubdir` can be used to build a crate in a
Cargo workspace. Additional maturin flags can be passed through Cargo workspace. Additional maturin flags can be passed through
`maturinBuildFlags`. `maturinBuildFlags`.
* `cargoCheckHook`: run tests using Cargo. Additional flags can be * `cargoCheckHook`: run tests using Cargo. The build type for checks
passed to Cargo using `checkFlags` and `checkFlagsArray`. By can be set using `cargoCheckType`. Additional flags can be passed to
default, tests are run in parallel. This can be disabled by setting the tests using `checkFlags` and `checkFlagsArray`. By default,
tests are run in parallel. This can be disabled by setting
`dontUseCargoParallelTests`. `dontUseCargoParallelTests`.
* `cargoInstallHook`: install binaries and static/shared libraries * `cargoInstallHook`: install binaries and static/shared libraries
that were built using `cargoBuildHook`. that were built using `cargoBuildHook`.

5
lib/systems/default.nix
View file

@ -107,6 +107,11 @@ rec {
powerpc64le = "ppc64le"; powerpc64le = "ppc64le";
}.${final.parsed.cpu.name} or final.parsed.cpu.name; }.${final.parsed.cpu.name} or final.parsed.cpu.name;
darwinArch = {
armv7a = "armv7";
aarch64 = "arm64";
}.${final.parsed.cpu.name} or final.parsed.cpu.name;
emulator = pkgs: let emulator = pkgs: let
qemu-user = pkgs.qemu.override { qemu-user = pkgs.qemu.override {
smartcardSupport = false; smartcardSupport = false;

2
nixos/modules/services/misc/redmine.nix
View file

@ -28,7 +28,7 @@ let
unpack = id: (name: source: unpack = id: (name: source:
pkgs.stdenv.mkDerivation { pkgs.stdenv.mkDerivation {
name = "redmine-${id}-${name}"; name = "redmine-${id}-${name}";
buildInputs = [ pkgs.unzip ]; nativeBuildInputs = [ pkgs.unzip ];
buildCommand = '' buildCommand = ''
mkdir -p $out mkdir -p $out
cd $out cd $out

4
nixos/modules/services/web-apps/dokuwiki.nix
View file

@ -193,7 +193,7 @@ let
}; };
sourceRoot = "."; sourceRoot = ".";
# We need unzip to build this package # We need unzip to build this package
buildInputs = [ pkgs.unzip ]; nativeBuildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory # Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/"; installPhase = "mkdir -p $out; cp -R * $out/";
}; };
@ -220,7 +220,7 @@ let
sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6"; sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6";
}; };
# We need unzip to build this package # We need unzip to build this package
buildInputs = [ pkgs.unzip ]; nativeBuildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory # Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/"; installPhase = "mkdir -p $out; cp -R * $out/";
}; };

4
nixos/modules/services/web-apps/wordpress.nix
View file

@ -109,7 +109,7 @@ let
sha256 = "1rhba5h5fjlhy8p05zf0p14c9iagfh96y91r36ni0rmk6y891lyd"; sha256 = "1rhba5h5fjlhy8p05zf0p14c9iagfh96y91r36ni0rmk6y891lyd";
}; };
# We need unzip to build this package # We need unzip to build this package
buildInputs = [ pkgs.unzip ]; nativeBuildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory # Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/"; installPhase = "mkdir -p $out; cp -R * $out/";
}; };
@ -136,7 +136,7 @@ let
sha256 = "0rjwm811f4aa4q43r77zxlpklyb85q08f9c8ns2akcarrvj5ydx3"; sha256 = "0rjwm811f4aa4q43r77zxlpklyb85q08f9c8ns2akcarrvj5ydx3";
}; };
# We need unzip to build this package # We need unzip to build this package
buildInputs = [ pkgs.unzip ]; nativeBuildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory # Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/"; installPhase = "mkdir -p $out; cp -R * $out/";
}; };

4
nixos/tests/dokuwiki.nix
View file

@ -9,7 +9,7 @@ let
sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6"; sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6";
}; };
# We need unzip to build this package # We need unzip to build this package
buildInputs = [ pkgs.unzip ]; nativeBuildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory # Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/"; installPhase = "mkdir -p $out; cp -R * $out/";
}; };
@ -24,7 +24,7 @@ let
sha256 = "e40ed7dd6bbe7fe3363bbbecb4de481d5e42385b5a0f62f6a6ce6bf3a1f9dfa8"; sha256 = "e40ed7dd6bbe7fe3363bbbecb4de481d5e42385b5a0f62f6a6ce6bf3a1f9dfa8";
}; };
# We need unzip to build this package # We need unzip to build this package
buildInputs = [ pkgs.unzip ]; nativeBuildInputs = [ pkgs.unzip ];
sourceRoot = "."; sourceRoot = ".";
# Installing simply means copying all files to the output directory # Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/"; installPhase = "mkdir -p $out; cp -R * $out/";

3
pkgs/applications/audio/espeak/default.nix
View file

@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0n86gwh9pw0jqqpdz7mxggllfr8k0r7pc67ayy7w5z6z79kig6mz"; sha256 = "0n86gwh9pw0jqqpdz7mxggllfr8k0r7pc67ayy7w5z6z79kig6mz";
}; };
buildInputs = [ unzip portaudio ]; nativeBuildInputs = [ unzip ];
buildInputs = [ portaudio ];
patches = [ patches = [
./gcc6.patch ./gcc6.patch

4
pkgs/applications/audio/espeak/edit.nix
View file

@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0x8s7vpb7rw5x37yjzy1f98m4f2csdg89libb74fm36gn8ly0hli"; sha256 = "0x8s7vpb7rw5x37yjzy1f98m4f2csdg89libb74fm36gn8ly0hli";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config unzip ];
buildInputs = [ unzip portaudio wxGTK ]; buildInputs = [ portaudio wxGTK ];
# TODO: # TODO:
# Uhm, seems like espeakedit still wants espeak-data/ in $HOME, even thought # Uhm, seems like espeakedit still wants espeak-data/ in $HOME, even thought

3
pkgs/applications/audio/mp3gain/default.nix
View file

@ -7,7 +7,8 @@ stdenv.mkDerivation {
sha256 = "0varr6y7k8zarr56b42r0ad9g3brhn5vv3xjg1c0v19jxwr4gh2w"; sha256 = "0varr6y7k8zarr56b42r0ad9g3brhn5vv3xjg1c0v19jxwr4gh2w";
}; };
buildInputs = [ unzip mpg123 ]; nativeBuildInputs = [ unzip ];
buildInputs = [ mpg123 ];
sourceRoot = "."; sourceRoot = ".";

4
pkgs/applications/audio/mpg123/default.nix
View file

@ -7,11 +7,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mpg123-1.26.3"; name = "mpg123-1.26.4";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/mpg123/${name}.tar.bz2"; url = "mirror://sourceforge/mpg123/${name}.tar.bz2";
sha256 = "0vkcfdx0mqq6lmpczsmpa2jsb0s6dryx3i7gvr32i3w9b9w9ij9h"; sha256 = "sha256-CBmRVA33pmaykEmthw8pPPoohjs2SIq01Yzqp7WEZFQ=";
}; };
outputs = [ "out" "conplay" ]; outputs = [ "out" "conplay" ];

3
pkgs/applications/audio/pd-plugins/helmholtz/default.nix
View file

@ -10,7 +10,8 @@ stdenv.mkDerivation {
sha256 = "0h1fj7lmvq9j6rmw33rb8k0byxb898bi2xhcwkqalb84avhywgvs"; sha256 = "0h1fj7lmvq9j6rmw33rb8k0byxb898bi2xhcwkqalb84avhywgvs";
}; };
buildInputs = [ unzip puredata ]; nativeBuildInputs = [ unzip ];
buildInputs = [ puredata ];
unpackPhase = '' unpackPhase = ''
unzip $src unzip $src

3
pkgs/applications/audio/pd-plugins/puremapping/default.nix
View file

@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1h7qgqd8srrxw2y1rkdw5js4k6f5vc8x6nlm2mq9mq9vjck7n1j7"; sha256 = "1h7qgqd8srrxw2y1rkdw5js4k6f5vc8x6nlm2mq9mq9vjck7n1j7";
}; };
buildInputs = [ unzip puredata ]; nativeBuildInputs = [ unzip ];
buildInputs = [ puredata ];
unpackPhase = '' unpackPhase = ''
unzip $src unzip $src

3
pkgs/applications/audio/pd-plugins/timbreid/default.nix
View file

@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "14k2xk5zrzrw1zprdbwx45hrlc7ck8vq4drpd3l455i5r8yk4y6b"; sha256 = "14k2xk5zrzrw1zprdbwx45hrlc7ck8vq4drpd3l455i5r8yk4y6b";
}; };
buildInputs = [ unzip puredata fftw ]; nativeBuildInputs = [ unzip ];
buildInputs = [ puredata fftw ];
unpackPhase = '' unpackPhase = ''
mkdir source mkdir source

2
pkgs/applications/audio/sunvox/default.nix
View file

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
sha256 = "0lqzr68n2c6aifw2vbyars91wn1chmgb9xfdk463g4vjqiava3ih"; sha256 = "0lqzr68n2c6aifw2vbyars91wn1chmgb9xfdk463g4vjqiava3ih";
}; };
buildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];
unpackPhase = "unzip $src"; unpackPhase = "unzip $src";

2
pkgs/applications/editors/android-studio/common.nix
View file

@ -65,9 +65,9 @@ let
sha256 = sha256Hash; sha256 = sha256Hash;
}; };
nativeBuildInputs = [ unzip ];
buildInputs = [ buildInputs = [
makeWrapper makeWrapper
unzip
]; ];
installPhase = '' installPhase = ''
cp -r . $out cp -r . $out

2
pkgs/applications/editors/edit/default.nix
View file

@ -10,8 +10,8 @@ stdenv.mkDerivation {
sha256 = "0wv8i3ii7cd9bqhjpahwp2g5fcmyk365nc7ncmvl79cxbz3f7y8v"; sha256 = "0wv8i3ii7cd9bqhjpahwp2g5fcmyk365nc7ncmvl79cxbz3f7y8v";
}; };
nativeBuildInputs = [ unzip ];
buildInputs = [ buildInputs = [
unzip
pkg-config pkg-config
ncurses ncurses
libX11 libX11

3
pkgs/applications/editors/fte/default.nix
View file

@ -3,7 +3,8 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "fte-0.50.02"; name = "fte-0.50.02";
buildInputs = [ unzip perl libX11 libXpm gpm ncurses slang ]; nativeBuildInputs = [ unzip ];
buildInputs = [ perl libX11 libXpm gpm ncurses slang ];
ftesrc = fetchurl { ftesrc = fetchurl {
url = "mirror://sourceforge/fte/fte-20110708-src.zip"; url = "mirror://sourceforge/fte/fte-20110708-src.zip";

4
pkgs/applications/editors/monodevelop/default.nix
View file

@ -34,10 +34,10 @@ stdenv.mkDerivation rec {
patchFlags = [ "-p2" ]; patchFlags = [ "-p2" ];
patches = [ ./git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch ]; patches = [ ./git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config unzip ];
buildInputs = [ buildInputs = [
autoconf automake shared-mime-info intltool autoconf automake shared-mime-info intltool
mono gtk-sharp-2_0 gnome-sharp unzip mono gtk-sharp-2_0 gnome-sharp
dotnetPackages.NUnit dotnetPackages.NUnit
dotnetPackages.NUnitRunners dotnetPackages.NUnitRunners
dotnetPackages.Nuget dotnetPackages.Nuget

4
pkgs/applications/editors/netbeans/default.nix
View file

@ -56,8 +56,8 @@ stdenv.mkDerivation {
ln -s ${desktopItem}/share/applications/* $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications
''; '';
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper unzip ];
buildInputs = [ perl python unzip libicns imagemagick ]; buildInputs = [ perl python libicns imagemagick ];
meta = { meta = {
description = "An integrated development environment for Java, C, C++ and PHP"; description = "An integrated development environment for Java, C, C++ and PHP";

4
pkgs/applications/editors/textadept/10/default.nix
View file

@ -4,9 +4,9 @@ stdenv.mkDerivation rec {
version = "10.8"; version = "10.8";
pname = "textadept"; pname = "textadept";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config unzip ];
buildInputs = [ buildInputs = [
gtk2 ncurses glib unzip zip gtk2 ncurses glib zip
]; ];
src = fetchhg { src = fetchhg {

4
pkgs/applications/editors/textadept/11/default.nix
View file

@ -4,9 +4,9 @@ stdenv.mkDerivation rec {
version = "11.0_beta"; version = "11.0_beta";
pname = "textadept11"; pname = "textadept11";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config unzip ];
buildInputs = [ buildInputs = [
gtk2 ncurses glib unzip zip gtk2 ncurses glib zip
]; ];
src = fetchFromGitHub { src = fetchFromGitHub {

8
pkgs/applications/editors/vscode/generic.nix
View file

@ -60,14 +60,12 @@ in
''; '';
}; };
buildInputs = (if stdenv.isDarwin buildInputs = [ libsecret libXScrnSaver ]
then [ unzip ] ++ lib.optionals (!stdenv.isDarwin) ([ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages);
else [ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages)
++ [ libsecret libXScrnSaver ];
runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib libdbusmenu ]; runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib libdbusmenu ];
nativeBuildInputs = lib.optional (!stdenv.isDarwin) autoPatchelfHook; nativeBuildInputs = [unzip] ++ lib.optional (!stdenv.isDarwin) autoPatchelfHook;
dontBuild = true; dontBuild = true;
dontConfigure = true; dontConfigure = true;

4
pkgs/applications/graphics/avocode/default.nix
View file

@ -58,8 +58,8 @@ stdenv.mkDerivation rec {
comment = "The bridge between designers and developers"; comment = "The bridge between designers and developers";
}; };
nativeBuildInputs = [makeWrapper wrapGAppsHook]; nativeBuildInputs = [makeWrapper wrapGAppsHook unzip];
buildInputs = [ unzip gtk3 gnome3.adwaita-icon-theme ]; buildInputs = [ gtk3 gnome3.adwaita-icon-theme ];
# src is producing multiple folder on unzip so we must # src is producing multiple folder on unzip so we must
# override unpackCmd to extract it into newly created folder # override unpackCmd to extract it into newly created folder

3
pkgs/applications/graphics/imagej/default.nix
View file

@ -15,8 +15,7 @@ let
url = "https://wsr.imagej.net/distros/cross-platform/ij150.zip"; url = "https://wsr.imagej.net/distros/cross-platform/ij150.zip";
sha256 = "97aba6fc5eb908f5160243aebcdc4965726693cb1353d9c0d71b8f5dd832cb7b"; sha256 = "97aba6fc5eb908f5160243aebcdc4965726693cb1353d9c0d71b8f5dd832cb7b";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper unzip ];
buildInputs = [ unzip ];
inherit jre; inherit jre;
# JAR files that are intended to be used by other packages # JAR files that are intended to be used by other packages

3
pkgs/applications/graphics/zgrviewer/default.nix
View file

@ -6,7 +6,8 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/zvtm/${pname}/${version}/${pname}-${version}.zip"; url = "mirror://sourceforge/zvtm/${pname}/${version}/${pname}-${version}.zip";
sha256 = "1yg2rck81sqqrgfi5kn6c1bz42dr7d0zqpcsdjhicssi1y159f23"; sha256 = "1yg2rck81sqqrgfi5kn6c1bz42dr7d0zqpcsdjhicssi1y159f23";
}; };
buildInputs = [jre unzip]; nativeBuildInputs = [ unzip ];
buildInputs = [jre];
buildPhase = ""; buildPhase = "";
installPhase = '' installPhase = ''
mkdir -p "$out"/{bin,share/java/zvtm/plugins,share/doc/zvtm} mkdir -p "$out"/{bin,share/java/zvtm/plugins,share/doc/zvtm}

2
pkgs/applications/kde/fetch.sh
View file

@ -1 +1 @@
WGET_ARGS=( http://download.kde.org/stable/release-service/20.12.1/src -A '*.tar.xz' ) WGET_ARGS=( http://download.kde.org/stable/release-service/20.12.2/src -A '*.tar.xz' )

1792
pkgs/applications/kde/srcs.nix
View file

File diff suppressed because it is too large Load diff

79
pkgs/applications/misc/audio/soxr/arm64-check.patch Normal file
View file

@ -0,0 +1,79 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Misty De Meo <mistydemeo@gmail.com>
Date: Tue, 15 Sep 2020 16:57:26 -0700
Subject: [PATCH] Check for __arm64__, not just __arm__
On at least one 64-bit ARM processor I've tested (Apple Silicon on macOS),
__arm__ isn't defined but __arm64__ is. As a result, some of the
ARM-specific macros are missing and calls to them fail.
---
src/cr-core.c | 2 +-
src/dev32s.h | 2 +-
src/pffft-wrap.c | 2 +-
src/pffft.c | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/cr-core.c b/src/cr-core.c
index 159a5d9..fe5ea8a 100644
--- a/src/cr-core.c
+++ b/src/cr-core.c
@@ -80,7 +80,7 @@ static void cubic_stage_fn(stage_t * p, fifo_t * output_fifo)
#define DEFINED_X86 0
#endif
-#if defined __arm__
+#if defined(__arm__) || defined(__arm64__)
#define DEFINED_ARM 1
#else
#define DEFINED_ARM 0
diff --git a/src/dev32s.h b/src/dev32s.h
index 7edae86..a14d7ad 100644
--- a/src/dev32s.h
+++ b/src/dev32s.h
@@ -31,7 +31,7 @@ SIMD_INLINE(void) vStorSum(float * a, v4_t b) {
v4_t t = vAdd(_mm_movehl_ps(b, b), b);
_mm_store_ss(a, vAdd(t, _mm_shuffle_ps(t,t,1)));}
-#elif defined __arm__
+#elif defined(__arm__) || defined(__arm64__)
#include <arm_neon.h>
diff --git a/src/pffft-wrap.c b/src/pffft-wrap.c
index c920f06..1641fc4 100644
--- a/src/pffft-wrap.c
+++ b/src/pffft-wrap.c
@@ -40,7 +40,7 @@ static void pffft_zconvolve(PFFFT_Setup *s, const float *a, const float *b, floa
float ar, ai, br, bi;
-#ifdef __arm__
+#if defined(__arm__) || defined(__arm64__)
__builtin_prefetch(va);
__builtin_prefetch(vb);
__builtin_prefetch(va+2);
diff --git a/src/pffft.c b/src/pffft.c
index 46c841e..8c775a9 100644
--- a/src/pffft.c
+++ b/src/pffft.c
@@ -157,7 +157,7 @@ typedef __m128 v4sf;
/*
ARM NEON support macros
*/
-#elif !defined(PFFFT_SIMD_DISABLE) && defined(__arm__)
+#elif !defined(PFFFT_SIMD_DISABLE) && (defined(__arm__) || defined(__arm64__))
# include <arm_neon.h>
typedef float32x4_t v4sf;
# define SIMD_SZ 4
@@ -1732,7 +1732,7 @@ void pffft_zconvolve_accumulate(PFFFT_Setup *s, const float *a, const float *b,
const v4sf * RESTRICT vb = (const v4sf*)b;
v4sf * RESTRICT vab = (v4sf*)ab;
-#ifdef __arm__
+#if defined(__arm__) || defined(__arm64__)
__builtin_prefetch(va);
__builtin_prefetch(vb);
__builtin_prefetch(vab);
--
2.30.1

5
pkgs/applications/misc/audio/soxr/default.nix
View file

@ -8,6 +8,11 @@ stdenv.mkDerivation rec {
sha256 = "12aql6svkplxq5fjycar18863hcq84c5kx8g6f4rj0lcvigw24di"; sha256 = "12aql6svkplxq5fjycar18863hcq84c5kx8g6f4rj0lcvigw24di";
}; };
patches = [
# Remove once https://sourceforge.net/p/soxr/code/merge-requests/5/ is merged.
./arm64-check.patch
];
outputs = [ "out" "doc" ]; # headers are just two and very small outputs = [ "out" "doc" ]; # headers are just two and very small
preConfigure = if stdenv.isDarwin then '' preConfigure = if stdenv.isDarwin then ''

2
pkgs/applications/misc/avrdudess/default.nix
View file

@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "18llpvjsfhypzijrvfbzmcg3g141f307mzsrg11wcdxh9syxqak6"; sha256 = "18llpvjsfhypzijrvfbzmcg3g141f307mzsrg11wcdxh9syxqak6";
}; };
buildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];
phases = [ "buildPhase" ]; phases = [ "buildPhase" ];

2
pkgs/applications/misc/kdbplus/default.nix
View file

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
}; };
dontStrip = true; dontStrip = true;
buildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];
phases = "unpackPhase installPhase"; phases = "unpackPhase installPhase";
unpackPhase = "mkdir ${pname}-${version} && cd ${pname}-${version} && unzip -qq ${src}"; unpackPhase = "mkdir ${pname}-${version} && cd ${pname}-${version} && unzip -qq ${src}";

4
pkgs/applications/misc/keepass/default.nix
View file

@ -12,8 +12,8 @@ with builtins; buildDotnetPackage rec {
sourceRoot = "."; sourceRoot = ".";
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper unzip ];
buildInputs = [ unzip icoutils ]; buildInputs = [ icoutils ];
patches = [ patches = [
(substituteAll { (substituteAll {

4
pkgs/applications/misc/lyx/default.nix
View file

@ -3,12 +3,12 @@
}: }:
mkDerivation rec { mkDerivation rec {
version = "2.3.6"; version = "2.3.6.1";
pname = "lyx"; pname = "lyx";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz"; url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz";
sha256 = "160whjwwrmxizdakjlkf9xc86bhqfnslw47fixgqq4qhbapcxxkg"; sha256 = "sha256-xr7SYzQZiY4Bp8w1AxDX2TS/WRyrcln8JYGqTADq+ng=";
}; };
# LaTeX is used from $PATH, as people often want to have it with extra pkgs # LaTeX is used from $PATH, as people often want to have it with extra pkgs

3
pkgs/applications/misc/megasync/default.nix
View file

@ -38,7 +38,7 @@ mkDerivation rec {
}; };
nativeBuildInputs = nativeBuildInputs =
[ autoconf automake doxygen lsb-release pkg-config qttools swig ]; [ autoconf automake doxygen lsb-release pkg-config qttools swig unzip ];
buildInputs = [ buildInputs = [
c-ares c-ares
cryptopp cryptopp
@ -53,7 +53,6 @@ mkDerivation rec {
qtbase qtbase
qtx11extras qtx11extras
sqlite sqlite
unzip
wget wget
]; ];

3
pkgs/applications/misc/milu/default.nix
View file

@ -22,10 +22,9 @@ stdenv.mkDerivation {
cp bin/milu $out/bin cp bin/milu $out/bin
''; '';
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config unzip ];
buildInputs = [ buildInputs = [
glib glib
unzip
llvmPackages.libclang llvmPackages.libclang
]; ];

3
pkgs/applications/misc/omegat.nix
View file

@ -9,8 +9,7 @@ stdenv.mkDerivation {
sha256 = "0axz7r30p34z5hgvdglznc82g7yvm3g56dv5190jixskx6ba58rs"; sha256 = "0axz7r30p34z5hgvdglznc82g7yvm3g56dv5190jixskx6ba58rs";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper unzip ];
buildInputs = [ unzip ];
unpackCmd = "unzip -o $curSrc"; # tries to go interactive without -o unpackCmd = "unzip -o $curSrc"; # tries to go interactive without -o

3
pkgs/applications/misc/openjump/default.nix
View file

@ -18,8 +18,7 @@ stdenv.mkDerivation {
cd $out; unzip $src cd $out; unzip $src
''; '';
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper unzip ];
buildInputs = [ unzip ];
installPhase = '' installPhase = ''
dir=$(echo $out/OpenJUMP-*) dir=$(echo $out/OpenJUMP-*)

6
pkgs/applications/networking/browsers/firefox/common.nix
View file

@ -127,8 +127,9 @@ buildStdenv.mkDerivation ({
inherit src unpackPhase meta; inherit src unpackPhase meta;
patches = [ patches = [
./env_var_for_system_dir.patch
] ++ ] ++
lib.optional (lib.versionOlder ffversion "86") ./env_var_for_system_dir-ff85.patch ++
lib.optional (lib.versionAtLeast ffversion "86") ./env_var_for_system_dir-ff86.patch ++
lib.optional (lib.versionOlder ffversion "83") ./no-buildconfig-ffx76.patch ++ lib.optional (lib.versionOlder ffversion "83") ./no-buildconfig-ffx76.patch ++
lib.optional (lib.versionAtLeast ffversion "84") ./no-buildconfig-ffx84.patch ++ lib.optional (lib.versionAtLeast ffversion "84") ./no-buildconfig-ffx84.patch ++
lib.optional (ltoSupport && lib.versionOlder ffversion "84") ./lto-dependentlibs-generation-ffx83.patch ++ lib.optional (ltoSupport && lib.versionOlder ffversion "84") ./lto-dependentlibs-generation-ffx83.patch ++
@ -160,7 +161,7 @@ buildStdenv.mkDerivation ({
xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
xorg.pixman yasm libGLU libGL xorg.pixman yasm libGLU libGL
xorg.xorgproto xorg.xorgproto
xorg.libXext unzip makeWrapper xorg.libXext makeWrapper
libevent libstartup_notification /* cairo */ libevent libstartup_notification /* cairo */
libpng jemalloc glib libpng jemalloc glib
nasm icu67 libvpx_1_8 nasm icu67 libvpx_1_8
@ -221,6 +222,7 @@ buildStdenv.mkDerivation ({
rust-cbindgen rust-cbindgen
rustc rustc
which which
unzip
] ]
++ lib.optional gtk3Support wrapGAppsHook ++ lib.optional gtk3Support wrapGAppsHook
++ lib.optionals buildStdenv.isDarwin [ xcbuild rsync ] ++ lib.optionals buildStdenv.isDarwin [ xcbuild rsync ]

0
pkgs/applications/networking/browsers/firefox/env_var_for_system_dir.patch → pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff85.patch
View file

21
pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff86.patch Normal file
View file

@ -0,0 +1,21 @@
diff -r 22fc47c968f2 toolkit/xre/nsXREDirProvider.cpp
--- a/toolkit/xre/nsXREDirProvider.cpp Mon Dec 14 15:09:17 2020 +0000
+++ b/toolkit/xre/nsXREDirProvider.cpp Tue Feb 23 23:38:56 2021 +0100
@@ -11,6 +11,7 @@
#include "jsapi.h"
#include "xpcpublic.h"
+#include "prenv.h"
#include "nsIAppStartup.h"
#include "nsIFile.h"
@@ -305,7 +306,8 @@
"/usr/lib/mozilla"_ns
# endif
;
- rv = NS_NewNativeLocalFile(dirname, false, getter_AddRefs(localDir));
+ const char* pathVar = PR_GetEnv("MOZ_SYSTEM_DIR");
+ rv = NS_NewNativeLocalFile((pathVar && *pathVar) ? nsDependentCString(pathVar) : reinterpret_cast<const nsCString&>(dirname), false, getter_AddRefs(localDir));
# endif
if (NS_SUCCEEDED(rv)) {

4
pkgs/applications/networking/browsers/firefox/packages.nix
View file

@ -7,10 +7,10 @@ in
rec { rec {
firefox = common rec { firefox = common rec {
pname = "firefox"; pname = "firefox";
ffversion = "85.0.2"; ffversion = "86.0";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "2m46li5ni1m4xv42h99rn2hhhv2mqy229wihmzxmgvws1rh2h11yf6x2a07akkjrsp2dmwxmmkhmf9dhakgj9i55z5qqi99azyx07df"; sha512 = "f5a7b9aa53e2955e972e30cc62ae64ae955127eab951d7a1102d5ac8a73804982e01b917787c00a6e0a0ed03594567d29a24808271283ef61a9383bc4bb39e3f";
}; };
meta = { meta = {

4
pkgs/applications/networking/browsers/palemoon/default.nix
View file

@ -43,14 +43,14 @@ in stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ nativeBuildInputs = [
desktop-file-utils file gnum4 perl pkg-config python2 wget which wrapGAppsHook desktop-file-utils file gnum4 perl pkg-config python2 wget which wrapGAppsHook unzip
]; ];
buildInputs = [ buildInputs = [
alsaLib bzip2 cairo dbus dbus-glib ffmpeg fontconfig freetype alsaLib bzip2 cairo dbus dbus-glib ffmpeg fontconfig freetype
gnome2.GConf gtk2 hunspell libevent libjpeg libnotify gnome2.GConf gtk2 hunspell libevent libjpeg libnotify
libstartup_notification libGLU libGL libstartup_notification libGLU libGL
libpulseaudio unzip yasm zip zlib libpulseaudio yasm zip zlib
] ]
++ (with xorg; [ ++ (with xorg; [
libX11 libXext libXft libXi libXrender libXScrnSaver libX11 libXext libXft libXi libXrender libXScrnSaver

2
pkgs/applications/networking/browsers/vivaldi/widevine.nix
View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0l743f2yyaq1vvc3iicajgnfpjxjsfvjcqvanndbxs23skgjcv6r"; sha256 = "0l743f2yyaq1vvc3iicajgnfpjxjsfvjcqvanndbxs23skgjcv6r";
}; };
buildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];
unpackPhase = '' unpackPhase = ''
unzip $src unzip $src

4
pkgs/applications/networking/browsers/webbrowser/default.nix
View file

@ -41,12 +41,12 @@ in stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
gnum4 makeWrapper perl pkg-config python2 gnum4 makeWrapper perl pkg-config python2 unzip
]; ];
buildInputs = [ buildInputs = [
alsaLib dbus dbus-glib ffmpeg fontconfig freetype yasm zip jack2 gtk2 alsaLib dbus dbus-glib ffmpeg fontconfig freetype yasm zip jack2 gtk2
unzip gnome2.GConf xorg.libXt gnome2.GConf xorg.libXt
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;

3
pkgs/applications/networking/instant-messengers/torchat/default.nix
View file

@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0rb4lvv40pz6ab5kxq40ycvh7kh1yxn7swzgv2ff2nbhi62xnzp0"; sha256 = "0rb4lvv40pz6ab5kxq40ycvh7kh1yxn7swzgv2ff2nbhi62xnzp0";
}; };
buildInputs = [ python unzip wxPython wrapPython ]; nativeBuildInputs = [ unzip ];
buildInputs = [ python wxPython wrapPython ];
pythonPath = [ wxPython ]; pythonPath = [ wxPython ];
preConfigure = "cd torchat/src; rm portable.txt"; preConfigure = "cd torchat/src; rm portable.txt";

4
pkgs/applications/networking/mailreaders/mblaze/default.nix
View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mblaze"; pname = "mblaze";
version = "1.0"; version = "1.1";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];
buildInputs = [ ruby ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; buildInputs = [ ruby ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
owner = "leahneukirchen"; owner = "leahneukirchen";
repo = "mblaze"; repo = "mblaze";
rev = "v${version}"; rev = "v${version}";
sha256 = "0hxy3mjjv4hg856sl1r15fdmqaw4s9c26b3lidsd5x0kpqy601ai"; sha256 = "sha256-Ho2Qoxs93ig4yYUOaoqdYnLA8Y4+7CfRM0dju89JOa4=";
}; };
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];

2
pkgs/applications/networking/mailreaders/thunderbird/68.nix
View file

@ -98,6 +98,7 @@ stdenv.mkDerivation rec {
rustc rustc
which which
yasm yasm
unzip
] ++ lib.optional gtk3Support wrapGAppsHook; ] ++ lib.optional gtk3Support wrapGAppsHook;
buildInputs = [ buildInputs = [
@ -125,7 +126,6 @@ stdenv.mkDerivation rec {
pango pango
perl perl
sqlite sqlite
unzip
xorg.libX11 xorg.libX11
xorg.libXScrnSaver xorg.libXScrnSaver
xorg.libXcursor xorg.libXcursor

2
pkgs/applications/networking/mailreaders/thunderbird/default.nix
View file

@ -99,6 +99,7 @@ stdenv.mkDerivation rec {
rustc rustc
which which
yasm yasm
unzip
] ++ lib.optional gtk3Support wrapGAppsHook; ] ++ lib.optional gtk3Support wrapGAppsHook;
buildInputs = [ buildInputs = [
@ -126,7 +127,6 @@ stdenv.mkDerivation rec {
pango pango
perl perl
sqlite sqlite
unzip
xorg.libX11 xorg.libX11
xorg.libXScrnSaver xorg.libXScrnSaver
xorg.libXcursor xorg.libXcursor

4
pkgs/applications/networking/mpop/default.nix
View file

@ -4,11 +4,11 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mpop"; pname = "mpop";
version = "1.4.11"; version = "1.4.12";
src = fetchurl { src = fetchurl {
url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
sha256 = "1gcxvhin5y0q47svqbf90r5aip0cgywm8sq6m84ygda7km8xylwv"; sha256 = "sha256-X2NVtS2cNgYZYjpAxmwaVXHjk7Q/5YN1wN41QprDSAo=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

4
pkgs/applications/networking/p2p/transgui/default.nix
View file

@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
sha256 = "1dyx778756zhvz5sxgdvy49p2c0x44w4nmcfd90wqrmgfknncnf5"; sha256 = "1dyx778756zhvz5sxgdvy49p2c0x44w4nmcfd90wqrmgfknncnf5";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config unzip ];
buildInputs = [ buildInputs = [
unzip fpc lazarus stdenv.cc fpc lazarus stdenv.cc
libX11 glib gtk2 gdk-pixbuf pango atk cairo openssl libX11 glib gtk2 gdk-pixbuf pango atk cairo openssl
]; ];

3
pkgs/applications/office/ib/controller/default.nix
View file

@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
phases = [ "unpackPhase" "installPhase" ]; phases = [ "unpackPhase" "installPhase" ];
buildInputs = [ unzip jdk ib-tws ]; nativeBuildInputs = [ unzip ];
buildInputs = [ jdk ib-tws ];
installPhase = '' installPhase = ''
mkdir -p $out $out/bin $out/etc/ib/controller $out/share/IBController mkdir -p $out $out/bin $out/etc/ib/controller $out/share/IBController

4
pkgs/applications/science/biology/snpeff/default.nix
View file

@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0i12mv93bfv8xjwc3rs2x73d6hkvi7kgbbbx3ry984l3ly4p6nnm"; sha256 = "0i12mv93bfv8xjwc3rs2x73d6hkvi7kgbbbx3ry984l3ly4p6nnm";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper unzip ];
buildInputs = [ unzip jre ]; buildInputs = [ jre ];
sourceRoot = "snpEff"; sourceRoot = "snpEff";

2
pkgs/applications/science/math/perseus/default.nix
View file

@ -3,7 +3,7 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "perseus-4-beta"; name = "perseus-4-beta";
version = "4-beta"; version = "4-beta";
buildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];
hardeningDisable = [ "stackprotector" ]; hardeningDisable = [ "stackprotector" ];

3
pkgs/applications/science/math/weka/default.nix
View file

@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0zwmhspmqb0a7cm6k6i0s6q3w19ws1g9dx3cp2v3g3vsif6cdh31"; sha256 = "0zwmhspmqb0a7cm6k6i0s6q3w19ws1g9dx3cp2v3g3vsif6cdh31";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper unzip ];
buildInputs = [ unzip ];
# The -Xmx1000M comes suggested from their download page: # The -Xmx1000M comes suggested from their download page:
# http://www.cs.waikato.ac.nz/ml/weka/downloading.html # http://www.cs.waikato.ac.nz/ml/weka/downloading.html

4
pkgs/applications/science/robotics/betaflight-configurator/default.nix
View file

@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
sha256 = "07r60n9422g5sm7x5b62p044cp961l51vx0s8ig2hy24s74hkam1"; sha256 = "07r60n9422g5sm7x5b62p044cp961l51vx0s8ig2hy24s74hkam1";
}; };
nativeBuildInputs = [ wrapGAppsHook ]; nativeBuildInputs = [ wrapGAppsHook unzip ];
buildInputs = [ unzip gsettings-desktop-schemas gtk3 ]; buildInputs = [ gsettings-desktop-schemas gtk3 ];
installPhase = '' installPhase = ''
mkdir -p $out/bin \ mkdir -p $out/bin \

4
pkgs/applications/version-management/mercurial/4.9.nix
View file

@ -21,8 +21,8 @@ in python2Packages.buildPythonApplication {
inherit python; # pass it so that the same version can be used in hg2git inherit python; # pass it so that the same version can be used in hg2git
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper unzip ];
buildInputs = [ docutils unzip ] buildInputs = [ docutils ]
++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; ++ lib.optionals stdenv.isDarwin [ ApplicationServices ];
propagatedBuildInputs = [ hg-git dulwich ]; propagatedBuildInputs = [ hg-git dulwich ];

4
pkgs/applications/version-management/mercurial/default.nix
View file

@ -19,8 +19,8 @@ in python3Packages.buildPythonApplication rec {
passthru = { inherit python; }; # pass it so that the same version can be used in hg2git passthru = { inherit python; }; # pass it so that the same version can be used in hg2git
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper unzip ];
buildInputs = [ docutils unzip ] buildInputs = [ docutils ]
++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; ++ lib.optionals stdenv.isDarwin [ ApplicationServices ];
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];

2
pkgs/applications/video/kodi/default.nix
View file

@ -129,7 +129,7 @@ in stdenv.mkDerivation {
libogg libvorbis flac libxslt systemd libogg libvorbis flac libxslt systemd
lzo libcdio libmodplug libass libbluray lzo libcdio libmodplug libass libbluray
sqlite libmysqlclient avahi lame sqlite libmysqlclient avahi lame
curl bzip2 zip unzip glxinfo curl bzip2 zip glxinfo
libcec libcec_platform dcadec libuuid libcec libcec_platform dcadec libuuid
libgcrypt libgpgerror libunistring libgcrypt libgpgerror libunistring
libcrossguid libplist libcrossguid libplist

4
pkgs/applications/video/vlc/default.nix
View file

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror
libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive systemd gnutls avahi libcddb SDL SDL_image libmtp taglib libarchive
libkate libtiger libv4l samba libssh2 liboggz libass libdvbpsi libva libkate libtiger libv4l samba libssh2 liboggz libass libdvbpsi libva
xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
++ optional jackSupport libjack2 ++ optional jackSupport libjack2
++ optionals chromecastSupport [ protobuf libmicrodns ]; ++ optionals chromecastSupport [ protobuf libmicrodns ];
nativeBuildInputs = [ autoreconfHook perl pkg-config removeReferencesTo ] nativeBuildInputs = [ autoreconfHook perl pkg-config removeReferencesTo unzip ]
++ optionals withQt5 [ wrapQtAppsHook ]; ++ optionals withQt5 [ wrapQtAppsHook ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/applications/window-managers/wmii-hg/default.nix
View file

@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
EOF EOF
''; '';
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config unzip ];
buildInputs = [ unzip libixp_hg txt2tags dash python which buildInputs = [ libixp_hg txt2tags dash python which
libX11 libXrender libXext libXinerama libXrandr libXft ]; libX11 libXrender libXext libXinerama libXrandr libXft ];
# For some reason including mercurial in buildInputs did not help # For some reason including mercurial in buildInputs did not help

4
pkgs/build-support/bintools-wrapper/default.nix
View file

@ -306,6 +306,10 @@ stdenv.mkDerivation {
done done
'' ''
+ optionalString stdenv.targetPlatform.isDarwin ''
echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/libc-ldflags
''
+ '' + ''
for flags in "$out/nix-support"/*flags*; do for flags in "$out/nix-support"/*flags*; do
substituteInPlace "$flags" --replace $'\n' ' ' substituteInPlace "$flags" --replace $'\n' ' '

8
pkgs/build-support/buildenv/default.nix
View file

@ -36,8 +36,9 @@ lib.makeOverridable
, # Shell commands to run after building the symlink tree. , # Shell commands to run after building the symlink tree.
postBuild ? "" postBuild ? ""
, # Additional inputs. Handy e.g. if using makeWrapper in `postBuild`. # Additional inputs
buildInputs ? [] , nativeBuildInputs ? [] # Handy e.g. if using makeWrapper in `postBuild`.
, buildInputs ? []
, passthru ? {} , passthru ? {}
, meta ? {} , meta ? {}
@ -53,7 +54,8 @@ in
runCommand name runCommand name
rec { rec {
inherit manifest ignoreCollisions checkCollisionContents passthru inherit manifest ignoreCollisions checkCollisionContents passthru
meta pathsToLink extraPrefix postBuild buildInputs; meta pathsToLink extraPrefix postBuild
nativeBuildInputs buildInputs;
pkgs = builtins.toJSON (map (drv: { pkgs = builtins.toJSON (map (drv: {
paths = paths =
# First add the usual output(s): respect if user has chosen explicitly, # First add the usual output(s): respect if user has chosen explicitly,

8
pkgs/build-support/cc-wrapper/cc-wrapper.sh
View file

@ -198,7 +198,15 @@ fi
PATH="$path_backup" PATH="$path_backup"
# Old bash workaround, see above. # Old bash workaround, see above.
if (( "${NIX_CC_USE_RESPONSE_FILE:-@use_response_file_by_default@}" >= 1 )); then
exec @prog@ "@<(printf "%q\n" \
${extraBefore+"${extraBefore[@]}"} \
${params+"${params[@]}"} \
${extraAfter+"${extraAfter[@]}"})"
else
exec @prog@ \ exec @prog@ \
${extraBefore+"${extraBefore[@]}"} \ ${extraBefore+"${extraBefore[@]}"} \
${params+"${params[@]}"} \ ${params+"${params[@]}"} \
${extraAfter+"${extraAfter[@]}"} ${extraAfter+"${extraAfter[@]}"}
fi

5
pkgs/build-support/cc-wrapper/default.nix
View file

@ -160,6 +160,7 @@ stdenv.mkDerivation {
local dst="$1" local dst="$1"
local wrapper="$2" local wrapper="$2"
export prog="$3" export prog="$3"
export use_response_file_by_default=${if isClang then "1" else "0"}
substituteAll "$wrapper" "$out/bin/$dst" substituteAll "$wrapper" "$out/bin/$dst"
chmod +x "$out/bin/$dst" chmod +x "$out/bin/$dst"
} }
@ -484,6 +485,10 @@ stdenv.mkDerivation {
substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash
'' ''
+ optionalString stdenv.targetPlatform.isDarwin ''
echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/cc-cflags
''
## ##
## Extra custom steps ## Extra custom steps
## ##

2
pkgs/build-support/expand-response-params/default.nix
View file

@ -10,7 +10,7 @@ stdenv.mkDerivation {
src=$PWD src=$PWD
''; '';
buildPhase = '' buildPhase = ''
"$CC" -std=c99 -O3 -o "expand-response-params" expand-response-params.c NIX_CC_USE_RESPONSE_FILE=0 "$CC" -std=c99 -O3 -o "expand-response-params" expand-response-params.c
''; '';
installPhase = '' installPhase = ''
mkdir -p $prefix/bin mkdir -p $prefix/bin

2
pkgs/build-support/fetchnuget/default.nix
View file

@ -19,7 +19,7 @@ else
sourceRoot = "."; sourceRoot = ".";
buildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];
dontBuild = true; dontBuild = true;

3
pkgs/build-support/release/ant-build.nix
View file

@ -108,7 +108,8 @@ stdenv.mkDerivation (
{ {
name = name + (if src ? version then "-" + src.version else ""); name = name + (if src ? version then "-" + src.version else "");
buildInputs = [ant jre zip unzip] ++ lib.optional (args ? buildInputs) args.buildInputs ; nativeBuildInputs = [ unzip ];
buildInputs = [ant jre zip] ++ lib.optional (args ? buildInputs) args.buildInputs ;
postHook = '' postHook = ''
mkdir -p $out/nix-support mkdir -p $out/nix-support

2
pkgs/build-support/rust/default.nix
View file

@ -103,6 +103,8 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // lib.optionalAttrs u
cargoBuildType = buildType; cargoBuildType = buildType;
cargoCheckType = checkType;
patchRegistryDeps = ./patch-registry-deps; patchRegistryDeps = ./patch-registry-deps;
nativeBuildInputs = nativeBuildInputs ++ [ nativeBuildInputs = nativeBuildInputs ++ [

8
pkgs/build-support/rust/hooks/cargo-build-hook.sh
View file

@ -9,6 +9,10 @@ cargoBuildHook() {
pushd "${buildAndTestSubdir}" pushd "${buildAndTestSubdir}"
fi fi
if [ "${cargoBuildType}" != "debug" ]; then
cargoBuildProfileFlag="--${cargoBuildType}"
fi
( (
set -x set -x
env \ env \
@ -19,7 +23,7 @@ cargoBuildHook() {
cargo build -j $NIX_BUILD_CORES \ cargo build -j $NIX_BUILD_CORES \
--target @rustTargetPlatformSpec@ \ --target @rustTargetPlatformSpec@ \
--frozen \ --frozen \
--${cargoBuildType} \ ${cargoBuildProfileFlag} \
${cargoBuildFlags} ${cargoBuildFlags}
) )
@ -32,4 +36,6 @@ cargoBuildHook() {
echo "Finished cargoBuildHook" echo "Finished cargoBuildHook"
} }
if [ -z "${dontCargoBuild-}" ] && [ -z "${buildPhase-}" ]; then
buildPhase=cargoBuildHook buildPhase=cargoBuildHook
fi

9
pkgs/build-support/rust/hooks/cargo-check-hook.sh
View file

@ -1,4 +1,5 @@
declare -a checkFlags declare -a checkFlags
declare -a cargoTestFlags
cargoCheckHook() { cargoCheckHook() {
echo "Executing cargoCheckHook" echo "Executing cargoCheckHook"
@ -15,7 +16,11 @@ cargoCheckHook() {
threads=1 threads=1
fi fi
argstr="--${cargoBuildType} --target @rustTargetPlatformSpec@ --frozen"; if [ "${cargoBuildType}" != "debug" ]; then
cargoBuildProfileFlag="--${cargoBuildType}"
fi
argstr="${cargoBuildProfileFlag} --target @rustTargetPlatformSpec@ --frozen ${cargoTestFlags}";
( (
set -x set -x
@ -36,6 +41,6 @@ cargoCheckHook() {
runHook postCheck runHook postCheck
} }
if [ -z "${checkPhase-}" ]; then if [ -z "${dontCargoCheck-}" ] && [ -z "${checkPhase-}" ]; then
checkPhase=cargoCheckHook checkPhase=cargoCheckHook
fi fi

2
pkgs/build-support/rust/hooks/cargo-install-hook.sh
View file

@ -43,7 +43,7 @@ cargoInstallHook() {
} }
if [ -z "${installPhase-}" ]; then if [ -z "${dontCargoInstall-}" ] && [ -z "${installPhase-}" ]; then
installPhase=cargoInstallHook installPhase=cargoInstallHook
postBuildHooks+=(cargoInstallPostBuildHook) postBuildHooks+=(cargoInstallPostBuildHook)
fi fi

2
pkgs/build-support/rust/hooks/cargo-setup-hook.sh
View file

@ -77,7 +77,9 @@ cargoSetupPostPatchHook() {
echo "Finished cargoSetupPostPatchHook" echo "Finished cargoSetupPostPatchHook"
} }
if [ -z "${dontCargoSetupPostUnpack-}" ]; then
postUnpackHooks+=(cargoSetupPostUnpackHook) postUnpackHooks+=(cargoSetupPostUnpackHook)
fi
if [ -z ${cargoVendorDir-} ]; then if [ -z ${cargoVendorDir-} ]; then
postPatchHooks+=(cargoSetupPostPatchHook) postPatchHooks+=(cargoSetupPostPatchHook)

4
pkgs/data/misc/iana-etc/default.nix
View file

@ -1,11 +1,11 @@
{ lib, fetchzip }: { lib, fetchzip }:
let let
version = "20200729"; version = "20210225";
in fetchzip { in fetchzip {
name = "iana-etc-${version}"; name = "iana-etc-${version}";
url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz";
sha256 = "05cymmisfvpyd7fwzc6axvm5fsi1v6hzs0pjr4xp1i95wvpz7qpm"; sha256 = "sha256-NVvZG3EJEYOXFDTBXD5m9sg/8msyMiBMkiZr+ZxWZ/g=";
postFetch = '' postFetch = ''
tar -xzvf $downloadedFile --strip-components=1 tar -xzvf $downloadedFile --strip-components=1

3
pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix
View file

@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0z11y18bgdc0y41hrrzzgi4lagm2cg06x12jgdnary1ycng7xja0"; sha256 = "0z11y18bgdc0y41hrrzzgi4lagm2cg06x12jgdnary1ycng7xja0";
}; };
buildInputs = [ glib gnome3.gnome-shell unzip ]; nativeBuildInputs = [ unzip ];
buildInputs = [ glib gnome3.gnome-shell ];
uuid = "nightthemeswitcher@romainvigier.fr"; uuid = "nightthemeswitcher@romainvigier.fr";

2
pkgs/desktops/plasma-5/fetch.sh
View file

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/plasma/5.20.5/ -A '*.tar.xz' ) WGET_ARGS=( https://download.kde.org/stable/plasma/5.21.1/ -A '*.tar.xz' )

5
pkgs/desktops/plasma-5/ksysguard.nix
View file

@ -3,7 +3,8 @@
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
libcap, libpcap, lm_sensors, libcap, libpcap, lm_sensors,
kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews, kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews,
knewstuff, libksysguard, qtbase knewstuff, libksysguard, qtbase,
networkmanager-qt, libnl
}: }:
mkDerivation { mkDerivation {
@ -12,6 +13,6 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
kdelibs4support ki18n libcap libpcap lm_sensors kdelibs4support ki18n libcap libpcap lm_sensors networkmanager-qt libnl
]; ];
} }

4
pkgs/desktops/plasma-5/kwin/default.nix
View file

@ -12,7 +12,7 @@
kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n,
kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage,
kscreenlocker, kservice, kwayland, kwayland-server, kwidgetsaddons, kwindowsystem, kxmlgui, kscreenlocker, kservice, kwayland, kwayland-server, kwidgetsaddons, kwindowsystem, kxmlgui,
plasma-framework, libcap, libdrm, mesa plasma-framework, libcap, libdrm, mesa, pipewire
}: }:
# TODO (ttuegel): investigate qmlplugindump failure # TODO (ttuegel): investigate qmlplugindump failure
@ -31,7 +31,7 @@ mkDerivation {
kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes
kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice
kwayland kwayland-server kwidgetsaddons kwindowsystem kxmlgui plasma-framework kwayland kwayland-server kwidgetsaddons kwindowsystem kxmlgui plasma-framework
libcap libdrm mesa libcap libdrm mesa pipewire
]; ];
outputs = [ "dev" "out" ]; outputs = [ "dev" "out" ];
patches = [ patches = [

9
pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch
View file

@ -2,7 +2,7 @@ Index: libkscreen-5.9.4/src/backendmanager.cpp
=================================================================== ===================================================================
--- libkscreen-5.9.4.orig/src/backendmanager.cpp --- libkscreen-5.9.4.orig/src/backendmanager.cpp
+++ libkscreen-5.9.4/src/backendmanager.cpp +++ libkscreen-5.9.4/src/backendmanager.cpp
@@ -178,17 +178,11 @@ QFileInfo BackendManager::preferredBacke @@ -172,14 +172,11 @@ QFileInfo BackendManager::preferredBackend(const QString &backend)
QFileInfoList BackendManager::listBackends() QFileInfoList BackendManager::listBackends()
{ {
// Compile a list of installed backends first // Compile a list of installed backends first
@ -10,10 +10,7 @@ Index: libkscreen-5.9.4/src/backendmanager.cpp
- const QStringList paths = QCoreApplication::libraryPaths(); - const QStringList paths = QCoreApplication::libraryPaths();
- QFileInfoList finfos; - QFileInfoList finfos;
- for (const QString &path : paths) { - for (const QString &path : paths) {
- const QDir dir(path + QLatin1String("/kf5/kscreen/"), - const QDir dir(path + QLatin1String("/kf5/kscreen/"), backendFilter, QDir::SortFlags(QDir::QDir::Name), QDir::NoDotAndDotDot | QDir::Files);
- backendFilter,
- QDir::SortFlags(QDir::QDir::Name),
- QDir::NoDotAndDotDot | QDir::Files);
- finfos.append(dir.entryInfoList()); - finfos.append(dir.entryInfoList());
- } - }
- return finfos; - return finfos;
@ -24,4 +21,4 @@ Index: libkscreen-5.9.4/src/backendmanager.cpp
+ return dir.entryInfoList(); + return dir.entryInfoList();
} }
KScreen::AbstractBackend *BackendManager::loadBackendPlugin(QPluginLoader *loader, const QString &name, KScreen::AbstractBackend *BackendManager::loadBackendPlugin(QPluginLoader *loader, const QString &name, const QVariantMap &arguments)

4
pkgs/desktops/plasma-5/plasma-browser-integration.nix
View file

@ -3,7 +3,7 @@
extra-cmake-modules, extra-cmake-modules,
qtbase, qtbase,
kfilemetadata, kio, ki18n, kconfig , kdbusaddons, knotifications, kpurpose, kfilemetadata, kio, ki18n, kconfig , kdbusaddons, knotifications, kpurpose,
krunner, kwindowsystem, kactivities, krunner, kwindowsystem, kactivities, plasma-workspace
}: }:
mkDerivation { mkDerivation {
@ -13,6 +13,6 @@ mkDerivation {
]; ];
buildInputs = [ buildInputs = [
qtbase kfilemetadata kio ki18n kconfig kdbusaddons knotifications kpurpose qtbase kfilemetadata kio ki18n kconfig kdbusaddons knotifications kpurpose
krunner kwindowsystem kactivities krunner kwindowsystem kactivities plasma-workspace
]; ];
} }

2
pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
View file

@ -3,7 +3,7 @@ Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
--- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp --- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp
+++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp +++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
@@ -48,10 +48,6 @@ @@ -48,10 +48,6 @@
#include <sys/stat.h> #include <sys/types.h>
#endif #endif
-// We cannot rely on the $PATH environment variable, because D-Bus activation -// We cannot rely on the $PATH environment variable, because D-Bus activation

48
pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch
View file

@ -1,4 +1,4 @@
From d653bc84c8aed33072237ed858194a8a73b6a2e7 Mon Sep 17 00:00:00 2001 From 65ed69a38a9ffee21f0eb36de1f7a3f152111cad Mon Sep 17 00:00:00 2001
From: Tom Hall <tahall256@protonmail.ch> From: Tom Hall <tahall256@protonmail.ch>
Date: Mon, 7 Sep 2020 18:09:52 +0100 Date: Mon, 7 Sep 2020 18:09:52 +0100
Subject: [PATCH] startkde Subject: [PATCH] startkde
@ -7,14 +7,14 @@ Subject: [PATCH] startkde
startkde/plasma-session/startup.cpp | 2 +- startkde/plasma-session/startup.cpp | 2 +-
startkde/startplasma-waylandsession.cpp | 2 +- startkde/startplasma-waylandsession.cpp | 2 +-
startkde/startplasma-x11.cpp | 2 +- startkde/startplasma-x11.cpp | 2 +-
startkde/startplasma.cpp | 22 +++++++++------------- startkde/startplasma.cpp | 16 ++++++++--------
4 files changed, 12 insertions(+), 16 deletions(-) 4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/startkde/plasma-session/startup.cpp b/startkde/plasma-session/startup.cpp diff --git a/startkde/plasma-session/startup.cpp b/startkde/plasma-session/startup.cpp
index 89cc144ba..8ca9e81d2 100644 index c3e77d4..88cb0e9 100644
--- a/startkde/plasma-session/startup.cpp --- a/startkde/plasma-session/startup.cpp
+++ b/startkde/plasma-session/startup.cpp +++ b/startkde/plasma-session/startup.cpp
@@ -211,7 +211,7 @@ Startup::Startup(QObject *parent): @@ -223,7 +223,7 @@ Startup::Startup(QObject *parent)
upAndRunning(QStringLiteral("ksmserver")); upAndRunning(QStringLiteral("ksmserver"));
const AutoStart autostart; const AutoStart autostart;
@ -24,10 +24,10 @@ index 89cc144ba..8ca9e81d2 100644
KJob *phase1; KJob *phase1;
QProcessEnvironment kdedProcessEnv; QProcessEnvironment kdedProcessEnv;
diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp
index f59654d18..5e3a93db0 100644 index 4fbfe18..6ba916c 100644
--- a/startkde/startplasma-waylandsession.cpp --- a/startkde/startplasma-waylandsession.cpp
+++ b/startkde/startplasma-waylandsession.cpp +++ b/startkde/startplasma-waylandsession.cpp
@@ -61,7 +61,7 @@ int main(int argc, char** argv) @@ -65,7 +65,7 @@ int main(int argc, char **argv)
waitForKonqi(); waitForKonqi();
out << "startplasma-waylandsession: Shutting down...\n"; out << "startplasma-waylandsession: Shutting down...\n";
@ -37,7 +37,7 @@ index f59654d18..5e3a93db0 100644
cleanupX11(); cleanupX11();
out << "startplasma-waylandsession: Done.\n"; out << "startplasma-waylandsession: Done.\n";
diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp
index ae1c4d101..0df24b5be 100644 index 4ddf9f8..e0e59cd 100644
--- a/startkde/startplasma-x11.cpp --- a/startkde/startplasma-x11.cpp
+++ b/startkde/startplasma-x11.cpp +++ b/startkde/startplasma-x11.cpp
@@ -110,7 +110,7 @@ int main(int argc, char **argv) @@ -110,7 +110,7 @@ int main(int argc, char **argv)
@ -50,10 +50,10 @@ index ae1c4d101..0df24b5be 100644
cleanupPlasmaEnvironment(); cleanupPlasmaEnvironment();
cleanupX11(); cleanupX11();
diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
index a055d5635..62afb1513 100644 index 9809197..1250e3e 100644
--- a/startkde/startplasma.cpp --- a/startkde/startplasma.cpp
+++ b/startkde/startplasma.cpp +++ b/startkde/startplasma.cpp
@@ -41,7 +41,7 @@ QTextStream out(stderr); @@ -46,7 +46,7 @@ QTextStream out(stderr);
void messageBox(const QString &text) void messageBox(const QString &text)
{ {
out << text; out << text;
@ -62,17 +62,27 @@ index a055d5635..62afb1513 100644
} }
QStringList allServices(const QLatin1String &prefix) QStringList allServices(const QLatin1String &prefix)
@@ -262,15 +262,15 @@ void setupX11() @@ -267,8 +267,8 @@ void setupX11()
// If the user has overwritten fonts, the cursor font may be different now // If the user has overwritten fonts, the cursor font may be different now
// so don't move this up. // so don't move this up.
- runSync(QStringLiteral("xsetroot"), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")}); - runSync(QStringLiteral("xsetroot"), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
- runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("8t"), QStringLiteral("-set"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("true")}); - runSync(QStringLiteral("xprop"),
- runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("32c"), QStringLiteral("-set"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("5")});
+ runSync(QStringLiteral(NIXPKGS_XSETROOT), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")}); + runSync(QStringLiteral(NIXPKGS_XSETROOT), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
+ runSync(QStringLiteral(NIXPKGS_XPROP), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("8t"), QStringLiteral("-set"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("true")}); + runSync(QStringLiteral(NIXPKGS_XPROP),
+ runSync(QStringLiteral(NIXPKGS_XPROP), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("32c"), QStringLiteral("-set"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("5")}); {QStringLiteral("-root"),
} QStringLiteral("-f"),
QStringLiteral("KDE_FULL_SESSION"),
@@ -276,7 +276,7 @@ void setupX11()
QStringLiteral("-set"),
QStringLiteral("KDE_FULL_SESSION"),
QStringLiteral("true")});
- runSync(QStringLiteral("xprop"),
+ runSync(QStringLiteral(NIXPKGS_XPROP),
{QStringLiteral("-root"),
QStringLiteral("-f"),
QStringLiteral("KDE_SESSION_VERSION"),
@@ -288,8 +288,8 @@ void setupX11()
void cleanupX11() void cleanupX11()
{ {
@ -83,7 +93,7 @@ index a055d5635..62afb1513 100644
} }
// TODO: Check if Necessary // TODO: Check if Necessary
@@ -306,7 +302,7 @@ void setupFontDpi() @@ -321,7 +321,7 @@ void setupFontDpi()
// TODO port to c++? // TODO port to c++?
const QByteArray input = "Xft.dpi: " + QByteArray::number(fontsCfg.readEntry("forceFontDPI", 0)); const QByteArray input = "Xft.dpi: " + QByteArray::number(fontsCfg.readEntry("forceFontDPI", 0));
QProcess p; QProcess p;
@ -92,7 +102,7 @@ index a055d5635..62afb1513 100644
p.setProcessChannelMode(QProcess::ForwardedChannels); p.setProcessChannelMode(QProcess::ForwardedChannels);
p.write(input); p.write(input);
p.closeWriteChannel(); p.closeWriteChannel();
@@ -328,7 +324,7 @@ QProcess* setupKSplash() @@ -343,7 +343,7 @@ QProcess *setupKSplash()
KConfigGroup ksplashCfg = cfg.group("KSplash"); KConfigGroup ksplashCfg = cfg.group("KSplash");
if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) { if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) {
p = new QProcess; p = new QProcess;
@ -102,5 +112,5 @@ index a055d5635..62afb1513 100644
} }
return p; return p;
-- --
2.28.0 2.30.0

12
pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch
View file

@ -1,23 +1,23 @@
From f43f15870f14b8fa17ba0765c0d7e2b225fafc3f Mon Sep 17 00:00:00 2001 From 914d2ec5e669ecf8771cc1308028990f733fb8cc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org> From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 5 Feb 2020 05:03:11 -0600 Date: Wed, 5 Feb 2020 05:03:11 -0600
Subject: [PATCH 2/2] absolute-wallpaper-install-dir Subject: [PATCH] absolute-wallpaper-install-dir
--- ---
sddm-theme/theme.conf.cmake | 2 +- sddm-theme/theme.conf.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake
index 8494a5c8a..f723c1e1b 100644 index a560da3..f723c1e 100644
--- a/sddm-theme/theme.conf.cmake --- a/sddm-theme/theme.conf.cmake
+++ b/sddm-theme/theme.conf.cmake +++ b/sddm-theme/theme.conf.cmake
@@ -4,5 +4,5 @@ logo=${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze/default-logo.svg @@ -4,5 +4,5 @@ logo=${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze/default-logo.svg
type=image type=image
color=#1d99f3 color=#1d99f3
fontSize=10 fontSize=10
-background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.jpg -background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.png
+background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.jpg +background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.png
needsFullUserModel=false needsFullUserModel=false
-- --
2.25.1 2.30.0

4
pkgs/desktops/plasma-5/plasma-workspace/default.nix
View file

@ -16,6 +16,8 @@
qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools, qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools,
qtwayland, qtx11extras, qqc2-desktop-style, qtwayland, qtx11extras, qqc2-desktop-style,
pipewire, libdrm
}: }:
let inherit (lib) getBin getLib; in let inherit (lib) getBin getLib; in
@ -36,6 +38,8 @@ mkDerivation {
qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland
qtx11extras qqc2-desktop-style qtx11extras qqc2-desktop-style
pipewire libdrm
]; ];
propagatedUserEnvPkgs = [ qtgraphicaleffects ]; propagatedUserEnvPkgs = [ qtgraphicaleffects ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

416
pkgs/desktops/plasma-5/srcs.nix
View file

@ -4,395 +4,419 @@
{ {
bluedevil = { bluedevil = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/bluedevil-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/bluedevil-5.21.1.tar.xz";
sha256 = "0bpbvfd6m3ddax484p33a1chvf9mf2mi61cli0vacsan7j84xpmk"; sha256 = "0b69gacp5cbl32m92k2j36cqq38lpxlybx3wnzj1148j6wvfbajn";
name = "bluedevil-5.20.5.tar.xz"; name = "bluedevil-5.21.1.tar.xz";
}; };
}; };
breeze = { breeze = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/breeze-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/breeze-5.21.1.tar.xz";
sha256 = "01zm5hcal6flihd89wn70zi363cmcglfvnc2q6x97lq89silaf6l"; sha256 = "1xdpsc4nf0556x9iimszi287jjks8qpqi45n81iccbcz91i5bnb5";
name = "breeze-5.20.5.tar.xz"; name = "breeze-5.21.1.tar.xz";
}; };
}; };
breeze-grub = { breeze-grub = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/breeze-grub-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/breeze-grub-5.21.1.tar.xz";
sha256 = "17g2jac96sj6pfacmyi6vvn74lfi9yhmigprcm2pwqg9z093n1m2"; sha256 = "0w0kkdqliliy72f41xps0a2mr0rf4kn08immichcvrm47r9bjr37";
name = "breeze-grub-5.20.5.tar.xz"; name = "breeze-grub-5.21.1.tar.xz";
}; };
}; };
breeze-gtk = { breeze-gtk = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/breeze-gtk-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/breeze-gtk-5.21.1.tar.xz";
sha256 = "1jknfswjcd4abbf249i3gclip4m4v8bp9b5x050zafyjkdcwxd5l"; sha256 = "14xq2796n8927362851kffpvxxscw82sm5j9ghsb24hr860zcdk7";
name = "breeze-gtk-5.20.5.tar.xz"; name = "breeze-gtk-5.21.1.tar.xz";
}; };
}; };
breeze-plymouth = { breeze-plymouth = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/breeze-plymouth-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/breeze-plymouth-5.21.1.tar.xz";
sha256 = "0yiqqwms0qrnbxqb8nwmgssrp1f92jwjg8rfzapaq5jxdycl1d9m"; sha256 = "0xgxmh5gnjz8r5h97arsb1ddvizfpajw6zfwrkrsiw0kxkb0ppn9";
name = "breeze-plymouth-5.20.5.tar.xz"; name = "breeze-plymouth-5.21.1.tar.xz";
}; };
}; };
discover = { discover = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/discover-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/discover-5.21.1.tar.xz";
sha256 = "08dmc8rvbfi1zyk9if588h6948xqcqm9jxdp26q84mzq517x9fn5"; sha256 = "1a1wmils7ijkvn1x5gqrdg3rv7mcnh0gaaig9ca555qqc2ab0ivl";
name = "discover-5.20.5.tar.xz"; name = "discover-5.21.1.tar.xz";
}; };
}; };
drkonqi = { drkonqi = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/drkonqi-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/drkonqi-5.21.1.tar.xz";
sha256 = "1rl212qmmikbnkyryibpp6gxh4jpklynhgr45ym5gcn3903i3vh9"; sha256 = "1iqk9mg5bi5yn9ccalwva8yshamrmsx4kfww8imxv8mhmq9p4mib";
name = "drkonqi-5.20.5.tar.xz"; name = "drkonqi-5.21.1.tar.xz";
}; };
}; };
kactivitymanagerd = { kactivitymanagerd = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/kactivitymanagerd-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/kactivitymanagerd-5.21.1.tar.xz";
sha256 = "1jzss3waq8jjzbs3rrxxk9dmr974pj5ryw4rdj8bpkc451wc4068"; sha256 = "1wzwkyylk4qsiab7jzlw62mfv5r3pxdk3vqyydca112836nhbdj3";
name = "kactivitymanagerd-5.20.5.tar.xz"; name = "kactivitymanagerd-5.21.1.tar.xz";
}; };
}; };
kde-cli-tools = { kde-cli-tools = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/kde-cli-tools-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/kde-cli-tools-5.21.1.tar.xz";
sha256 = "0z32fwc9l8c3xfy1l7v0i26ay8icnxqwrnxz6h8qgjlv6p8b4h04"; sha256 = "0835323rbb3akhzdnjxb2myfbfz0wh3c5j1jih4l9zqr0ixx9lb3";
name = "kde-cli-tools-5.20.5.tar.xz"; name = "kde-cli-tools-5.21.1.tar.xz";
}; };
}; };
kdecoration = { kdecoration = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/kdecoration-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/kdecoration-5.21.1.tar.xz";
sha256 = "1kc166f2gqgspsnvxyk8k3k3mmd1ndhgr1dyjzknqdys32dkm5vf"; sha256 = "1qy848hvqiar3vj7cz0srszybqj9sf5lfip8ws0fwllqgsa5v505";
name = "kdecoration-5.20.5.tar.xz"; name = "kdecoration-5.21.1.tar.xz";
}; };
}; };
kde-gtk-config = { kde-gtk-config = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/kde-gtk-config-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/kde-gtk-config-5.21.1.tar.xz";
sha256 = "1f3fvr201wr7jdh1hg8ff7yis7hnv7653hvx0531hx1x2hfdva1r"; sha256 = "0nq741x9flnyzhgj5h4r1774b11211ab0lcclhlji9ch7kqxs8dc";
name = "kde-gtk-config-5.20.5.tar.xz"; name = "kde-gtk-config-5.21.1.tar.xz";
}; };
}; };
kdeplasma-addons = { kdeplasma-addons = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/kdeplasma-addons-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/kdeplasma-addons-5.21.1.tar.xz";
sha256 = "1sypmn72fp6l57px3pq9ivzj2r2l3k9vy5006idnfgblzahvpi2n"; sha256 = "0xpki1kabdm4fwifx0xsb0isig9dnzks4zfglrkg9g0nafahsbf8";
name = "kdeplasma-addons-5.20.5.tar.xz"; name = "kdeplasma-addons-5.21.1.tar.xz";
}; };
}; };
kgamma5 = { kgamma5 = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/kgamma5-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/kgamma5-5.21.1.tar.xz";
sha256 = "1gy0pgsk3xi129y8h78lcif60ajs3y5fxzj1pl7mn6g72f7mwxld"; sha256 = "1316l73jj4b41mrsk1vba3g4mdj0q6hxazqqkvzrcinzwr34p3l2";
name = "kgamma5-5.20.5.tar.xz"; name = "kgamma5-5.21.1.tar.xz";
}; };
}; };
khotkeys = { khotkeys = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/khotkeys-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/khotkeys-5.21.1.tar.xz";
sha256 = "1iw8rxdl9q45jqsnmqdm1lkymzkyxkrfgch51kxfj34vd4mi66h8"; sha256 = "1kp6s1qgzz6j5z4widy5hqnwyh90vw3adf47jk54msdzlh2ak0q7";
name = "khotkeys-5.20.5.tar.xz"; name = "khotkeys-5.21.1.tar.xz";
}; };
}; };
kinfocenter = { kinfocenter = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/kinfocenter-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/kinfocenter-5.21.1.tar.xz";
sha256 = "0k3vvfwrfwmmicw8p81fpqljvmj3n8342avavc49ajmnygls7ssm"; sha256 = "1fy5985f4zf9v656dfb30c95pkbasx2302qamdxpfhrl465nqn5d";
name = "kinfocenter-5.20.5.tar.xz"; name = "kinfocenter-5.21.1.tar.xz";
}; };
}; };
kmenuedit = { kmenuedit = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/kmenuedit-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/kmenuedit-5.21.1.tar.xz";
sha256 = "0apmhglw74ppps52fhspjdsiy19b219lf68aj8jlpiiqcn80mggf"; sha256 = "1cksy6fn9mx96jnlglzmg0n9817vmypl1lwxdyxncxzw275k0c05";
name = "kmenuedit-5.20.5.tar.xz"; name = "kmenuedit-5.21.1.tar.xz";
}; };
}; };
kscreen = { kscreen = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/kscreen-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/kscreen-5.21.1.tar.xz";
sha256 = "1njjkrdgdd6g8avf7ik9fd7j9g4zdbjghli7svcfz2z8h6na626y"; sha256 = "0w199x0ig7vv7ki17v5paipw1jkkiavj6296zmpbnxn88n6i8jw3";
name = "kscreen-5.20.5.tar.xz"; name = "kscreen-5.21.1.tar.xz";
}; };
}; };
kscreenlocker = { kscreenlocker = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/kscreenlocker-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/kscreenlocker-5.21.1.tar.xz";
sha256 = "07y0lhwh4pc5rsdfr5yqb645v37ya97vh3dmy2riw9908hiyybw0"; sha256 = "1qpmysv7cby0bir4qyr1if3zc1ky43fyzhhxfqc69mcx803iabyv";
name = "kscreenlocker-5.20.5.tar.xz"; name = "kscreenlocker-5.21.1.tar.xz";
}; };
}; };
ksshaskpass = { ksshaskpass = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/ksshaskpass-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/ksshaskpass-5.21.1.tar.xz";
sha256 = "1xk55ampbrz56pl739m6r150qcsjq0nw2sxxkpqykgwjh275y4ry"; sha256 = "11avkc3qqskq8pkdsq1jikpdh9izghv3algbf67lwl236s8mmdzk";
name = "ksshaskpass-5.20.5.tar.xz"; name = "ksshaskpass-5.21.1.tar.xz";
}; };
}; };
ksysguard = { ksysguard = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/ksysguard-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/ksysguard-5.21.1.tar.xz";
sha256 = "0ddb3m6rygjisv31bc722vxzyb2q14940szfzijcv48z5ixj5x9j"; sha256 = "1fnccjs04b3pvdb8wwmw03g8x4h7zw5q4pxh0gfy7w705w3wkxwm";
name = "ksysguard-5.20.5.tar.xz"; name = "ksysguard-5.21.1.tar.xz";
}; };
}; };
kwallet-pam = { kwallet-pam = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/kwallet-pam-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/kwallet-pam-5.21.1.tar.xz";
sha256 = "1wn1zm8bfxxsjvx4rbds60v9ckizj55znpq477vnzrh2xfx13rjk"; sha256 = "0ybdyalppfypvq26j6lxjfz2zm41kw1nlsyh857z06f0s65257zb";
name = "kwallet-pam-5.20.5.tar.xz"; name = "kwallet-pam-5.21.1.tar.xz";
}; };
}; };
kwayland-integration = { kwayland-integration = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/kwayland-integration-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/kwayland-integration-5.21.1.tar.xz";
sha256 = "0rqzq851apw1p4c7salk7rcygjdw7ra0x95xw57vh68w19kn9wrk"; sha256 = "0s0gljcfv3sjh63d8bcjmzqgvxrqzjbxj8dsyi68w187dxzca8b4";
name = "kwayland-integration-5.20.5.tar.xz"; name = "kwayland-integration-5.21.1.tar.xz";
}; };
}; };
kwayland-server = { kwayland-server = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/kwayland-server-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/kwayland-server-5.21.1.tar.xz";
sha256 = "0ajxjj2cbrg6rpry3r48q3zhxxkr09498j5in0v1jwijp83n9wz0"; sha256 = "00d14d8q3jw1h2yyn49wpxndwl5v1clxnialrqgkyli6qkwkf29m";
name = "kwayland-server-5.20.5.tar.xz"; name = "kwayland-server-5.21.1.tar.xz";
}; };
}; };
kwin = { kwin = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/kwin-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/kwin-5.21.1.tar.xz";
sha256 = "0kiq46gdvfv2811125kw1ncnk1pmpnqkvrz7p3lry72sjd1ja57c"; sha256 = "035w7b9cfg3hv9kw3rab1y9xw4r51psz7csx7nki05nwzx84812s";
name = "kwin-5.20.5.tar.xz"; name = "kwin-5.21.1.tar.xz";
}; };
}; };
kwrited = { kwrited = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/kwrited-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/kwrited-5.21.1.tar.xz";
sha256 = "1h0vbb0bz4r26g4yf88jfzkbi8xbyf44c2y9nmlrmr5lws4bpcmz"; sha256 = "15xsjkxqx48wpzjawv4qpbgh8a48sfrmldgcwhn1cscq8s0marh3";
name = "kwrited-5.20.5.tar.xz"; name = "kwrited-5.21.1.tar.xz";
}; };
}; };
libkscreen = { libkscreen = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/libkscreen-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/libkscreen-5.21.1.tar.xz";
sha256 = "0641kk7s4xy5y94rn6xzjnrp4sbl7yn9w9qzlw4925858pgrr9qv"; sha256 = "0hrgmnvyv5v5d15wj1gynyzk83jj8p9cjhz0q2l41n2rh81rw52z";
name = "libkscreen-5.20.5.tar.xz"; name = "libkscreen-5.21.1.tar.xz";
}; };
}; };
libksysguard = { libksysguard = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/libksysguard-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/libksysguard-5.21.1.tar.xz";
sha256 = "0v2x7sl5gg8a9i1cwx8prv03pcls4q3wfxxs5qs6g5ami1f679d8"; sha256 = "14zafjp0ikqgkdr8a04idj08xami2xn8cw3scgwfcix3y7mv0ip8";
name = "libksysguard-5.20.5.tar.xz"; name = "libksysguard-5.21.1.tar.xz";
}; };
}; };
milou = { milou = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/milou-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/milou-5.21.1.tar.xz";
sha256 = "1hmpdj2zi6nidm6058a6kjgzij8qy9xihv20hi2dhk0f8ys42k3h"; sha256 = "095mk7592r4fwkw5f3p8mgc0p2wg8wi347qx8s1yblwjcml86a5f";
name = "milou-5.20.5.tar.xz"; name = "milou-5.21.1.tar.xz";
}; };
}; };
oxygen = { oxygen = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/oxygen-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/oxygen-5.21.1.tar.xz";
sha256 = "166jk8ix0dnv92svymaxjwbc08k6q8nag9xr2dc033x5lr2l59qr"; sha256 = "1s5bzdj5l515g4biarrzmkc7vpi0hqbk75rjjkr11fsvkghhphwg";
name = "oxygen-5.20.5.tar.xz"; name = "oxygen-5.21.1.tar.xz";
}; };
}; };
plasma-browser-integration = { plasma-browser-integration = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/plasma-browser-integration-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/plasma-browser-integration-5.21.1.tar.xz";
sha256 = "03zzmzdlc5a3nrx6izb66s7l3cmangkfjda2mf17g2097rrnb9n2"; sha256 = "0m99il47932ybsdp5z7apgb9l991wdhbrm3sninflcrg6ag9myp3";
name = "plasma-browser-integration-5.20.5.tar.xz"; name = "plasma-browser-integration-5.21.1.tar.xz";
}; };
}; };
plasma-desktop = { plasma-desktop = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/plasma-desktop-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/plasma-desktop-5.21.1.tar.xz";
sha256 = "1fc74zgxkp65pj8p58prd5rq7nqspjfcgr70say2imagyj9nwrdx"; sha256 = "1ligy1ps3ajrsg6lvb9ailirgc52sswbknp0zn53n8gka176c555";
name = "plasma-desktop-5.20.5.tar.xz"; name = "plasma-desktop-5.21.1.tar.xz";
}; };
}; };
plasma-disks = { plasma-disks = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/plasma-disks-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/plasma-disks-5.21.1.tar.xz";
sha256 = "0bcwf3g2vy2gf0igg0dyl9x5qc0xx0d5z05n4mi7asg5acl596r1"; sha256 = "0py662wlqbx5408rjbxnsa5ccnsaqx2wfy84fvjs4vl73wqmi2nl";
name = "plasma-disks-5.20.5.tar.xz"; name = "plasma-disks-5.21.1.tar.xz";
};
};
plasma-firewall = {
version = "5.21.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.21.1/plasma-firewall-5.21.1.tar.xz";
sha256 = "19q7w9m1vj7gs5d3prraciw00iy0ywjfxlpjhxjiq0s0s0icf1hb";
name = "plasma-firewall-5.21.1.tar.xz";
}; };
}; };
plasma-integration = { plasma-integration = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/plasma-integration-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/plasma-integration-5.21.1.tar.xz";
sha256 = "1wydjnmryf2kvfgg6m9kafa5waimccqr531qrq3nisdjc5p1w9x8"; sha256 = "0i51grmjkf9k6z1aq4j69wqdwdnn4rcryvi7b9lfpqaz1phsqhq7";
name = "plasma-integration-5.20.5.tar.xz"; name = "plasma-integration-5.21.1.tar.xz";
}; };
}; };
plasma-nano = { plasma-nano = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/plasma-nano-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/plasma-nano-5.21.1.tar.xz";
sha256 = "0h276i1dxbiziw258wf6az9mnysp3xxfh7nlxv0g2w1vfnhm23v5"; sha256 = "0qz14rmnlpk8mc1lgk854zlp032znc27j0wg6a7zsljikbx90dzm";
name = "plasma-nano-5.20.5.tar.xz"; name = "plasma-nano-5.21.1.tar.xz";
}; };
}; };
plasma-nm = { plasma-nm = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/plasma-nm-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/plasma-nm-5.21.1.tar.xz";
sha256 = "060f32adr0wlv2bs9swjyxcil7n74cnk48j8b8984wwhk6zz53a6"; sha256 = "0lg9fkk4lag5pi648jv66b8mzp645xx75y4zylj87yz3i8h9may4";
name = "plasma-nm-5.20.5.tar.xz"; name = "plasma-nm-5.21.1.tar.xz";
}; };
}; };
plasma-pa = { plasma-pa = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/plasma-pa-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/plasma-pa-5.21.1.tar.xz";
sha256 = "0xvkbrz3290xxfvv1rqqv7w57j3gdng8m2jyjj1j6dmaackl512d"; sha256 = "17vxvvrii3q46k22k3v94hicvxw7cdfl4rgaqbb8rvy94f2dhvir";
name = "plasma-pa-5.20.5.tar.xz"; name = "plasma-pa-5.21.1.tar.xz";
}; };
}; };
plasma-phone-components = { plasma-phone-components = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/plasma-phone-components-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/plasma-phone-components-5.21.1.tar.xz";
sha256 = "14h790b2jfs2j2lvv3dwqm20v3nlvah2909g4mhm9kwfdsmgnjms"; sha256 = "1fzjwc1x40n8wxq9fqm83j07yg9zniilmafcsv0rd80k6v99691i";
name = "plasma-phone-components-5.20.5.tar.xz"; name = "plasma-phone-components-5.21.1.tar.xz";
}; };
}; };
plasma-sdk = { plasma-sdk = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/plasma-sdk-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/plasma-sdk-5.21.1.tar.xz";
sha256 = "13cqn700nadqgmn54sy8qbf7waqkgvhzndh73jvmhb0z699z4s6y"; sha256 = "0s18lgp8baan9s9qr8wwaq3ah668255whz9xpl2xl1qv9qnr5v28";
name = "plasma-sdk-5.20.5.tar.xz"; name = "plasma-sdk-5.21.1.tar.xz";
};
};
plasma-systemmonitor = {
version = "5.21.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.21.1/plasma-systemmonitor-5.21.1.tar.xz";
sha256 = "1mfmlnsa2iy4wrdi2hghrapd7j02k3xkv4cfv44pw29i5iihvx6a";
name = "plasma-systemmonitor-5.21.1.tar.xz";
}; };
}; };
plasma-tests = { plasma-tests = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/plasma-tests-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/plasma-tests-5.21.1.tar.xz";
sha256 = "0h6wccqp46s3i8dqc6rrh68l8fk662yvz0fdscqv295g1zwhb45j"; sha256 = "1qxlwvxwkqgxy6kvd9dqp7wg02gc4j37az20gxglm5s4jf9j47kr";
name = "plasma-tests-5.20.5.tar.xz"; name = "plasma-tests-5.21.1.tar.xz";
}; };
}; };
plasma-thunderbolt = { plasma-thunderbolt = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/plasma-thunderbolt-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/plasma-thunderbolt-5.21.1.tar.xz";
sha256 = "06l5zpgn5zmid0rkp8lx228nw72nd991s2cg29yg2h51zyvff4v0"; sha256 = "1v6yjxk30wpr86f1m7zn9sm5vvagcjmqz8b3s9sliv0z69n50fzx";
name = "plasma-thunderbolt-5.20.5.tar.xz"; name = "plasma-thunderbolt-5.21.1.tar.xz";
}; };
}; };
plasma-vault = { plasma-vault = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/plasma-vault-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/plasma-vault-5.21.1.tar.xz";
sha256 = "0b9jnzx5040sgzqsnzjz61sxnlsmbqfsk8mvqclgqphgiqsbcnm2"; sha256 = "0mfjmmn3s2piqg8idmndh1klrr3fllka0lx6ckx7bmj1g7z3kr0d";
name = "plasma-vault-5.20.5.tar.xz"; name = "plasma-vault-5.21.1.tar.xz";
}; };
}; };
plasma-workspace = { plasma-workspace = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/plasma-workspace-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/plasma-workspace-5.21.1.tar.xz";
sha256 = "0966nqyqs7hb7fp3a3jxhm64iqwbafd29sbagigx9d7gj8qg8zim"; sha256 = "0aq2158sijlgz3baslj57kzhmdx3m0zir80qz1svw94grfszjc2a";
name = "plasma-workspace-5.20.5.tar.xz"; name = "plasma-workspace-5.21.1.tar.xz";
}; };
}; };
plasma-workspace-wallpapers = { plasma-workspace-wallpapers = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/plasma-workspace-wallpapers-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/plasma-workspace-wallpapers-5.21.1.tar.xz";
sha256 = "03z7pcba8kkmb70dn7gsqldxgb8lky6qw040p5ik1j07516xm6z3"; sha256 = "1pfgzzfhwdgczhrgizwi7rvav1hawwv6zra8nlqnfia8rc4mjs3n";
name = "plasma-workspace-wallpapers-5.20.5.tar.xz"; name = "plasma-workspace-wallpapers-5.21.1.tar.xz";
}; };
}; };
plymouth-kcm = { plymouth-kcm = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/plymouth-kcm-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/plymouth-kcm-5.21.1.tar.xz";
sha256 = "0lwir088h3mjdxc6zzbd74g7alfnsrhf7m0p7ma6prncdj25pcyz"; sha256 = "1il5a60db4brgs0ifmbxhq1ncqg80pkz5pnddbb3vwiwgwrsjziw";
name = "plymouth-kcm-5.20.5.tar.xz"; name = "plymouth-kcm-5.21.1.tar.xz";
}; };
}; };
polkit-kde-agent = { polkit-kde-agent = {
version = "1-5.20.5"; version = "1-5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/polkit-kde-agent-1-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/polkit-kde-agent-1-5.21.1.tar.xz";
sha256 = "1rkvnci93xvxga6cvw99aaivkn8897kyqdw7p9hmk09qvg2qb92v"; sha256 = "1lm6rl3lfimlfw7yaqk81jdrdi31qbz951vzcss4prwa1iqdi7b2";
name = "polkit-kde-agent-1-5.20.5.tar.xz"; name = "polkit-kde-agent-1-5.21.1.tar.xz";
}; };
}; };
powerdevil = { powerdevil = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/powerdevil-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/powerdevil-5.21.1.tar.xz";
sha256 = "1w3figagjxmrbc7hs81bllfkpq6f9mn4mwj7zjzxjf7d5fkmryrj"; sha256 = "08a9wl97lpcm0qz438ha8avdc6ybsij5vvy3p0ijkdn1psq2974b";
name = "powerdevil-5.20.5.tar.xz"; name = "powerdevil-5.21.1.tar.xz";
};
};
qqc2-breeze-style = {
version = "5.21.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.21.1/qqc2-breeze-style-5.21.1.tar.xz";
sha256 = "1k4zl5hbbyk2v9gila8whkh7yniv3nwcgdc73ysc75ivqyzydsix";
name = "qqc2-breeze-style-5.21.1.tar.xz";
}; };
}; };
sddm-kcm = { sddm-kcm = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/sddm-kcm-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/sddm-kcm-5.21.1.tar.xz";
sha256 = "1zw9y6knrx848f529m45iszr0xplr9lnck242ddmzj3x7qz0x1az"; sha256 = "0j76zwmn2r62hjzv1gni44a9admd38x2s8s30qfc1dzc7nkv61sh";
name = "sddm-kcm-5.20.5.tar.xz"; name = "sddm-kcm-5.21.1.tar.xz";
}; };
}; };
systemsettings = { systemsettings = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/systemsettings-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/systemsettings-5.21.1.tar.xz";
sha256 = "1b1j9hl9nzd4qqs255yd3svsb492w8i6l6ccihllwzqwkb1kpq5j"; sha256 = "0kzg3raa2f3lwb5qs10g8kzmv6px8fk4z2sq5jnjl3n9zqgzykkr";
name = "systemsettings-5.20.5.tar.xz"; name = "systemsettings-5.21.1.tar.xz";
}; };
}; };
xdg-desktop-portal-kde = { xdg-desktop-portal-kde = {
version = "5.20.5"; version = "5.21.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.20.5/xdg-desktop-portal-kde-5.20.5.tar.xz"; url = "${mirror}/stable/plasma/5.21.1/xdg-desktop-portal-kde-5.21.1.tar.xz";
sha256 = "07g70517p89araa305if2xgwpfd7sdbknl880hqn2mqaqd9m83gl"; sha256 = "1xfnwycrq51sz1r57misrz8acq6yd1vrr5gjir4f1ynfclhf9aj6";
name = "xdg-desktop-portal-kde-5.20.5.tar.xz"; name = "xdg-desktop-portal-kde-5.21.1.tar.xz";
}; };
}; };
} }

3
pkgs/development/arduino/arduino-core/default.nix
View file

@ -116,13 +116,12 @@ stdenv.mkDerivation rec {
# the glib setup hook will populate GSETTINGS_SCHEMAS_PATH, # the glib setup hook will populate GSETTINGS_SCHEMAS_PATH,
# wrapGAppHooks (among other things) adds it to XDG_DATA_DIRS # wrapGAppHooks (among other things) adds it to XDG_DATA_DIRS
# so 'save as...' works: # so 'save as...' works:
nativeBuildInputs = [ glib wrapGAppsHook ]; nativeBuildInputs = [ glib wrapGAppsHook unzip ];
buildInputs = [ buildInputs = [
jdk jdk
ant ant
libusb-compat-0_1 libusb-compat-0_1
libusb1 libusb1
unzip
zlib zlib
ncurses5 ncurses5
readline readline

1
pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
View file

@ -63,3 +63,4 @@ for release in releases:
with open("sources.json", "w") as f: with open("sources.json", "w") as f:
json.dump(out, f, indent=2, sort_keys=True) json.dump(out, f, indent=2, sort_keys=True)
f.write('\n')

408
pkgs/development/compilers/adoptopenjdk-bin/sources.json
View file

@ -4,92 +4,92 @@
"jdk": { "jdk": {
"hotspot": { "hotspot": {
"aarch64": { "aarch64": {
"build": "11", "build": "9",
"sha256": "f90c6f941a95e20e305870700328804e5b48acb69d4928dc9c4627b3c755ae8a", "sha256": "420c5d1e5dc66b2ed7dedd30a7bdf94bfaed10d5e1b07dc579722bf60a8114a9",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.9_11.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.10_9.tar.gz",
"version": "11.0.9" "version": "11.0.10"
}, },
"armv6l": { "armv6l": {
"build": "11", "build": "9",
"sha256": "082a13a9a5fbcf7ca45e67ab39e9682a9ef9e3779395e37aa0bf235e42a8eaf5", "sha256": "34908da9c200f5ef71b8766398b79fd166f8be44d87f97510667698b456c8d44",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jdk_arm_linux_hotspot_11.0.9_11.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz",
"version": "11.0.9" "version": "11.0.10"
}, },
"armv7l": { "armv7l": {
"build": "11", "build": "9",
"sha256": "082a13a9a5fbcf7ca45e67ab39e9682a9ef9e3779395e37aa0bf235e42a8eaf5", "sha256": "34908da9c200f5ef71b8766398b79fd166f8be44d87f97510667698b456c8d44",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jdk_arm_linux_hotspot_11.0.9_11.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz",
"version": "11.0.9" "version": "11.0.10"
}, },
"packageType": "jdk", "packageType": "jdk",
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "11", "build": "9",
"sha256": "a3c52b73a76bed0f113604165eb4f2020b767e188704d8cc0bfc8bc4eb596712", "sha256": "ae78aa45f84642545c01e8ef786dfd700d2226f8b12881c844d6a1f71789cb99",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.9_11.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz",
"version": "11.0.9" "version": "11.0.10"
} }
}, },
"openj9": { "openj9": {
"aarch64": { "aarch64": {
"build": "11", "build": "9",
"sha256": "f0426b6d37085d471a7f577ce6f28af7cc8fe35b9b0b09a5111eccaed80a0447", "sha256": "0ce9a8c38d154540610dfe03e59389734deb91c5cb9258408404c5026d4afa41",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_aarch64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_aarch64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz",
"version": "11.0.9" "version": "11.0.10-ea"
}, },
"packageType": "jdk", "packageType": "jdk",
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "11", "build": "9",
"sha256": "812d58fac39465802039291a1bc530b4feaaa61b58664d9c458a075921ae8091", "sha256": "941d5df125d2ad426391340f539408b13d61d00ed31dd79142ff1ac84864a79f",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz",
"version": "11.0.9" "version": "11.0.10"
} }
} }
}, },
"jre": { "jre": {
"hotspot": { "hotspot": {
"aarch64": { "aarch64": {
"build": "11", "build": "9",
"sha256": "89b9b3108afda968a97961c5602a896bae31fea7c95195b54be5ad68b3af9e45", "sha256": "5f9a894bd694f598f2befa4a605169685ac8bcb8ec68d25e587e8db4d2307b74",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.9_11.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.10_9.tar.gz",
"version": "11.0.9" "version": "11.0.10"
}, },
"armv6l": { "armv6l": {
"build": "11", "build": "9",
"sha256": "8e52de3c7a24edb74e423631fa90a09f7af3193aa9e6e4837b337192669530b0", "sha256": "2f2da2149c089c84f00b0eda63c31b77c8b51a1c080e18a70ecb5a78ba40d8c6",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jre_arm_linux_hotspot_11.0.9_11.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.10_9.tar.gz",
"version": "11.0.9" "version": "11.0.10"
}, },
"armv7l": { "armv7l": {
"build": "11", "build": "9",
"sha256": "8e52de3c7a24edb74e423631fa90a09f7af3193aa9e6e4837b337192669530b0", "sha256": "2f2da2149c089c84f00b0eda63c31b77c8b51a1c080e18a70ecb5a78ba40d8c6",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jre_arm_linux_hotspot_11.0.9_11.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.10_9.tar.gz",
"version": "11.0.9" "version": "11.0.10"
}, },
"packageType": "jre", "packageType": "jre",
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "11", "build": "9",
"sha256": "2ed263b662afb8b5d2964d1c9941d20031d07e5af68679ebefdca35d40bb91b1", "sha256": "25fdcf9427095ac27c8bdfc82096ad2e615693a3f6ea06c700fca7ffb271131a",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jre_x64_linux_hotspot_11.0.9_11.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.10_9.tar.gz",
"version": "11.0.9" "version": "11.0.10"
} }
}, },
"openj9": { "openj9": {
"aarch64": { "aarch64": {
"build": "11", "build": "9",
"sha256": "b73f406dba1560dc194ac891452a1aacc2ba3b3e5e7b55e91a64559f8c2d9539", "sha256": "c48d2b19bf7040c74dfdcac9e395ba7b8f937522ee756c820465f2e8e3dffec2",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_aarch64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_aarch64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz",
"version": "11.0.9" "version": "11.0.10-ea"
}, },
"packageType": "jre", "packageType": "jre",
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "11", "build": "9",
"sha256": "54c845c167c197ba789eb6c3508faa5b1c95c9abe2ac26878123b6eecc87a111", "sha256": "7e5f97071f8b86c22c36ddfd7f821c3e8ec531c1128e2e6c931b2e64118a517a",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_x64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz",
"version": "11.0.9" "version": "11.0.10"
} }
} }
} }
@ -100,20 +100,20 @@
"packageType": "jdk", "packageType": "jdk",
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "11", "build": "9",
"sha256": "7b21961ffb2649e572721a0dfad64169b490e987937b661cb4e13a594c21e764", "sha256": "ee7c98c9d79689aca6e717965747b8bf4eec5413e89d5444cc2bd6dbd59e3811",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_x64_mac_hotspot_11.0.9_11.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.10_9.tar.gz",
"version": "11.0.9" "version": "11.0.10"
} }
}, },
"openj9": { "openj9": {
"packageType": "jdk", "packageType": "jdk",
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "11", "build": "9",
"sha256": "382238443d4495d976f9e1a66b0f6e3bc250d3d009b64d2c29d44022afd7e418", "sha256": "58f931dc30160b04da2d94af32e0dfa384f4b2cf92b7217c0937fd057e668d54",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1_openj9-0.23.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.9_11_openj9-0.23.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.10_9_openj9-0.24.0.tar.gz",
"version": "11.0.9" "version": "11.0.10"
} }
} }
}, },
@ -122,20 +122,20 @@
"packageType": "jre", "packageType": "jre",
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "11", "build": "9",
"sha256": "cd8965dc8dbd0b5b3b25b6a336857d9bb622965e039b77e3048bc825e5512e95", "sha256": "215e94323d7c74fe31e5383261e3bfc8e9ca3dc03212738c48d29868b02fe875",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jre_x64_mac_hotspot_11.0.9_11.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.10_9.tar.gz",
"version": "11.0.9" "version": "11.0.10"
} }
}, },
"openj9": { "openj9": {
"packageType": "jre", "packageType": "jre",
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "11", "build": "9",
"sha256": "33a868f12bbe9326f658e60abe48dac658df33578b3719f551355855a87d1911", "sha256": "6e353f0b38a7192ad3e0522009065c7c24356e0d9329899477b21e39d2a7a8da",
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1_openj9-0.23.0/OpenJDK11U-jre_x64_mac_openj9_11.0.9_11_openj9-0.23.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_x64_mac_openj9_11.0.10_9_openj9-0.24.0.tar.gz",
"version": "11.0.9" "version": "11.0.10"
} }
} }
} }
@ -146,19 +146,19 @@
"jdk": { "jdk": {
"hotspot": { "hotspot": {
"aarch64": { "aarch64": {
"build": "8", "build": "8.1",
"sha256": "0e6081cb51f8a6f3062bef4f4c45dbe1fccfd3f3b4b5d52522a3edb76581e3af", "sha256": "0e6081cb51f8a6f3062bef4f4c45dbe1fccfd3f3b4b5d52522a3edb76581e3af",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_aarch64_linux_hotspot_13.0.2_8.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_aarch64_linux_hotspot_13.0.2_8.tar.gz",
"version": "13.0.2" "version": "13.0.2"
}, },
"armv6l": { "armv6l": {
"build": "8", "build": "8.1",
"sha256": "9beec080f2b2a7f6883b024272f4e8d5a0b027325e83647be318215781af1d1a", "sha256": "9beec080f2b2a7f6883b024272f4e8d5a0b027325e83647be318215781af1d1a",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_arm_linux_hotspot_13.0.2_8.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_arm_linux_hotspot_13.0.2_8.tar.gz",
"version": "13.0.2" "version": "13.0.2"
}, },
"armv7l": { "armv7l": {
"build": "8", "build": "8.1",
"sha256": "9beec080f2b2a7f6883b024272f4e8d5a0b027325e83647be318215781af1d1a", "sha256": "9beec080f2b2a7f6883b024272f4e8d5a0b027325e83647be318215781af1d1a",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_arm_linux_hotspot_13.0.2_8.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_arm_linux_hotspot_13.0.2_8.tar.gz",
"version": "13.0.2" "version": "13.0.2"
@ -166,7 +166,7 @@
"packageType": "jdk", "packageType": "jdk",
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "8", "build": "8.1",
"sha256": "9ccc063569f19899fd08e41466f8c4cd4e05058abdb5178fa374cb365dcf5998", "sha256": "9ccc063569f19899fd08e41466f8c4cd4e05058abdb5178fa374cb365dcf5998",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_linux_hotspot_13.0.2_8.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_linux_hotspot_13.0.2_8.tar.gz",
"version": "13.0.2" "version": "13.0.2"
@ -176,7 +176,7 @@
"packageType": "jdk", "packageType": "jdk",
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "8", "build": "8.1",
"sha256": "aeecf6d30d0c847db81d07793cf97e5dc44890c29366d7d9f8f9f397f6c52590", "sha256": "aeecf6d30d0c847db81d07793cf97e5dc44890c29366d7d9f8f9f397f6c52590",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
"version": "13.0.2" "version": "13.0.2"
@ -186,7 +186,7 @@
"jre": { "jre": {
"hotspot": { "hotspot": {
"aarch64": { "aarch64": {
"build": "8", "build": "8.1",
"sha256": "6c4b69d1609f4c65c576c80d6aa101de80048f8ce5566f890e8fff5349228bae", "sha256": "6c4b69d1609f4c65c576c80d6aa101de80048f8ce5566f890e8fff5349228bae",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_aarch64_linux_hotspot_13.0.2_8.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_aarch64_linux_hotspot_13.0.2_8.tar.gz",
"version": "13.0.2" "version": "13.0.2"
@ -194,7 +194,7 @@
"packageType": "jre", "packageType": "jre",
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "8", "build": "8.1",
"sha256": "897f16fe8e056395209e35d2384013bd1ff250e717465769079e3f4793628c34", "sha256": "897f16fe8e056395209e35d2384013bd1ff250e717465769079e3f4793628c34",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_x64_linux_hotspot_13.0.2_8.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_x64_linux_hotspot_13.0.2_8.tar.gz",
"version": "13.0.2" "version": "13.0.2"
@ -204,7 +204,7 @@
"packageType": "jre", "packageType": "jre",
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "8", "build": "8.1",
"sha256": "a0ab38607811e282f64082edc68a2dea3fa6a5113391efb124a6d7d02883110a", "sha256": "a0ab38607811e282f64082edc68a2dea3fa6a5113391efb124a6d7d02883110a",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
"version": "13.0.2" "version": "13.0.2"
@ -218,7 +218,7 @@
"packageType": "jdk", "packageType": "jdk",
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "8", "build": "8.1",
"sha256": "0ddb24efdf5aab541898d19b7667b149a1a64a8bd039b708fc58ee0284fa7e07", "sha256": "0ddb24efdf5aab541898d19b7667b149a1a64a8bd039b708fc58ee0284fa7e07",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_mac_hotspot_13.0.2_8.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_mac_hotspot_13.0.2_8.tar.gz",
"version": "13.0.2" "version": "13.0.2"
@ -228,7 +228,7 @@
"packageType": "jdk", "packageType": "jdk",
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "8", "build": "8.1",
"sha256": "dd8d92eec98a3455ec5cd065a0a6672cc1aef280c6a68c507c372ccc1d98fbaa", "sha256": "dd8d92eec98a3455ec5cd065a0a6672cc1aef280c6a68c507c372ccc1d98fbaa",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_mac_openj9_13.0.2_8_openj9-0.18.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_mac_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
"version": "13.0.2" "version": "13.0.2"
@ -240,7 +240,7 @@
"packageType": "jre", "packageType": "jre",
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "8", "build": "8.1",
"sha256": "3149b9ebf0db1eaf2dc152df9efae82003e7971efb1cf550060e6a4798fe8c5c", "sha256": "3149b9ebf0db1eaf2dc152df9efae82003e7971efb1cf550060e6a4798fe8c5c",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_x64_mac_hotspot_13.0.2_8.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_x64_mac_hotspot_13.0.2_8.tar.gz",
"version": "13.0.2" "version": "13.0.2"
@ -250,7 +250,7 @@
"packageType": "jre", "packageType": "jre",
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "8", "build": "8.1",
"sha256": "6a8a636fca4c7e368241e232a37cd73c9867cdec8f0869fd158b1f58c6128cc2", "sha256": "6a8a636fca4c7e368241e232a37cd73c9867cdec8f0869fd158b1f58c6128cc2",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_x64_mac_openj9_13.0.2_8_openj9-0.18.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_x64_mac_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
"version": "13.0.2" "version": "13.0.2"
@ -394,92 +394,92 @@
"jdk": { "jdk": {
"hotspot": { "hotspot": {
"aarch64": { "aarch64": {
"build": "9", "build": "7",
"sha256": "84398a1566d66ee5a88f3326fb7f0b70504eb510190f8f798bdb386481a3900e", "sha256": "6e8b6b037148cf20a284b5b257ec7bfdf9cc31ccc87778d0dfd95a2fddf228d4",
"url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.1_9.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.2_7.tar.gz",
"version": "15.0.1" "version": "15.0.2"
}, },
"armv6l": { "armv6l": {
"build": "9", "build": "7",
"sha256": "bef5e9f4ab8a87645fa2b3d0ffb9f2b97374caa03cd1296597e8c86e8360d5a2", "sha256": "ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368",
"url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_arm_linux_hotspot_15.0.1_9.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz",
"version": "15.0.1" "version": "15.0.2"
}, },
"armv7l": { "armv7l": {
"build": "9", "build": "7",
"sha256": "bef5e9f4ab8a87645fa2b3d0ffb9f2b97374caa03cd1296597e8c86e8360d5a2", "sha256": "ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368",
"url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_arm_linux_hotspot_15.0.1_9.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz",
"version": "15.0.1" "version": "15.0.2"
}, },
"packageType": "jdk", "packageType": "jdk",
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "9", "build": "7",
"sha256": "61045ecb9434e3320dbc2c597715f9884586b7a18a56d29851b4d4a4d48a2a5e", "sha256": "94f20ca8ea97773571492e622563883b8869438a015d02df6028180dd9acc24d",
"url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_x64_linux_hotspot_15.0.1_9.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz",
"version": "15.0.1" "version": "15.0.2"
} }
}, },
"openj9": { "openj9": {
"aarch64": { "aarch64": {
"build": "9", "build": "7",
"sha256": "6206643ec4a57597f73880423b72fc06c1018d92cc6b02972ec3ea3fe4d853a2", "sha256": "b69a4bc87ed2e985d252cff02d53f1a11b8d83d39e0800cd4a1cab4521375314",
"url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_aarch64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_aarch64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
"version": "15.0.1" "version": "15.0.2-ea"
}, },
"packageType": "jdk", "packageType": "jdk",
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "9", "build": "7",
"sha256": "b1561f7a69c977bfc9991e61e96dcb200c39300dd9ad423254af117c189e4a8d", "sha256": "5515ccd79b1b5e8d8a615b80d5fe1272f7bb41100e46d94fb78ee611ea014816",
"url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_x64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
"version": "15.0.1" "version": "15.0.2"
} }
} }
}, },
"jre": { "jre": {
"hotspot": { "hotspot": {
"aarch64": { "aarch64": {
"build": "9", "build": "7",
"sha256": "9eecdd39239545b922878abf51015030ba9aed4dda5c4574ddbc669a71ddab31", "sha256": "1c1fc968d76004b0be0042027712835dcbe3570a6fc3a208157a4ab6adabbef2",
"url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_aarch64_linux_hotspot_15.0.1_9.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_aarch64_linux_hotspot_15.0.2_7.tar.gz",
"version": "15.0.1" "version": "15.0.2"
}, },
"armv6l": { "armv6l": {
"build": "9", "build": "7",
"sha256": "f289d1b9fc05099889eaa9a52d352275d44698f3448153cc2ef05f2fa1c04cca", "sha256": "304be224952dbea7000cda6223b2978b3eefdf2e3749032c3b381a213c8d9c5e",
"url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_arm_linux_hotspot_15.0.1_9.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_arm_linux_hotspot_15.0.2_7.tar.gz",
"version": "15.0.1" "version": "15.0.2"
}, },
"armv7l": { "armv7l": {
"build": "9", "build": "7",
"sha256": "f289d1b9fc05099889eaa9a52d352275d44698f3448153cc2ef05f2fa1c04cca", "sha256": "304be224952dbea7000cda6223b2978b3eefdf2e3749032c3b381a213c8d9c5e",
"url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_arm_linux_hotspot_15.0.1_9.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_arm_linux_hotspot_15.0.2_7.tar.gz",
"version": "15.0.1" "version": "15.0.2"
}, },
"packageType": "jre", "packageType": "jre",
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "9", "build": "7",
"sha256": "e619197c7a5757631f6ea9c912ab47528ebf64c27cf788cdad22bc9245779411", "sha256": "31af7efdb1cc0ffd001bc145c3d255266889ad6b502133283ae8bf233d11334c",
"url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_x64_linux_hotspot_15.0.1_9.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_linux_hotspot_15.0.2_7.tar.gz",
"version": "15.0.1" "version": "15.0.2"
} }
}, },
"openj9": { "openj9": {
"aarch64": { "aarch64": {
"build": "9", "build": "7",
"sha256": "1db3c28e8c423d005fcf3b0c8a081061e56c51966273e32e3930d4c57c21bf49", "sha256": "37492012e75d75021dfb2b25fe5cc73664c03fee85532cec30ce4f5a4e5389c6",
"url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_aarch64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_aarch64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
"version": "15.0.1" "version": "15.0.2-ea"
}, },
"packageType": "jre", "packageType": "jre",
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "9", "build": "7",
"sha256": "e47fdadfe91f554f3e343b24e678b6862673f9b1dce3703efd1447950188357b", "sha256": "a4ae1b7275fcfd6d87a3387edacc8e353dc95ee44f00ca5a348ea90331ec2084",
"url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_x64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_x64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
"version": "15.0.1" "version": "15.0.2"
} }
} }
} }
@ -490,20 +490,20 @@
"packageType": "jdk", "packageType": "jdk",
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "9", "build": "7",
"sha256": "d32f9429c4992cef7be559a15c542011503d6bc38c89379800cd209a9d7ec539", "sha256": "d358a7ff03905282348c6c80562a4da2e04eb377b60ad2152be4c90f8d580b7f",
"url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_x64_mac_hotspot_15.0.1_9.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_mac_hotspot_15.0.2_7.tar.gz",
"version": "15.0.1" "version": "15.0.2"
} }
}, },
"openj9": { "openj9": {
"packageType": "jdk", "packageType": "jdk",
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "9", "build": "7",
"sha256": "c9b19fd1fda9c581aa0bcddbf5f821204c351a1de29da1c5aa51cb680ee99517", "sha256": "1336ae5529af3a0e35ae569e4188944831aeed7080a482f2490fc619380cbe53",
"url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9.1_openj9-0.23.0/OpenJDK15U-jdk_x64_mac_openj9_15.0.1_9_openj9-0.23.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_mac_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
"version": "15.0.1" "version": "15.0.2"
} }
} }
}, },
@ -512,20 +512,20 @@
"packageType": "jre", "packageType": "jre",
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "9", "build": "7",
"sha256": "fde1713fc51e824a08f8eeb5e2b8a2acf21424d5f9a0e70cfd2e85a77c827bc4", "sha256": "6a7150fa3ca8277394ff5bae6f56a70f61d2144a5dbbea4f008d86a3e5498795",
"url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_x64_mac_hotspot_15.0.1_9.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_mac_hotspot_15.0.2_7.tar.gz",
"version": "15.0.1" "version": "15.0.2"
} }
}, },
"openj9": { "openj9": {
"packageType": "jre", "packageType": "jre",
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "9", "build": "7",
"sha256": "e7c3710d6cc23480ac66eba79b48d9e2bebec34ba688f3053bb5eba406a2c315", "sha256": "2c0ba5e66764d660037343db4bf32f1ed75ad27661e54e9a4df23d40cae448b0",
"url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9.1_openj9-0.23.0/OpenJDK15U-jre_x64_mac_openj9_15.0.1_9_openj9-0.23.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_x64_mac_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
"version": "15.0.1" "version": "15.0.2"
} }
} }
} }
@ -536,92 +536,92 @@
"jdk": { "jdk": {
"hotspot": { "hotspot": {
"aarch64": { "aarch64": {
"build": "10", "build": "8",
"sha256": "cfbde5191027c6d25af44af8a3d64625c6e22422dea8c4af6fe9240e7e249baa", "sha256": "9c07cf2099bbc6c850c46fd870bd243f5fcb6635181eabb312bdffe43ffc5080",
"url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u272b10.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz",
"version": "8.0.272" "version": "8.0.282"
}, },
"armv6l": { "armv6l": {
"build": "10", "build": "1",
"sha256": "b005e9e8a912aa6605debdea3685a223c077d5a4ba7c90bca02d804c5f39d0b9", "sha256": "e2e41a8705061dfcc766bfb6b7edd4c699e94aac68e4deeb28c8e76734a46fb7",
"url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u272b10.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jdk_arm_linux_hotspot_8u275b01.tar.gz",
"version": "8.0.272" "version": "8.0.275"
}, },
"armv7l": { "armv7l": {
"build": "10", "build": "1",
"sha256": "b005e9e8a912aa6605debdea3685a223c077d5a4ba7c90bca02d804c5f39d0b9", "sha256": "e2e41a8705061dfcc766bfb6b7edd4c699e94aac68e4deeb28c8e76734a46fb7",
"url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u272b10.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jdk_arm_linux_hotspot_8u275b01.tar.gz",
"version": "8.0.272" "version": "8.0.275"
}, },
"packageType": "jdk", "packageType": "jdk",
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "10", "build": "8",
"sha256": "6f124b69d07d8d3edf39b9aa5c58473f63a380b686ddb73a5495e01d25c2939a", "sha256": "e6e6e0356649b9696fa5082cfcb0663d4bef159fc22d406e3a012e71fce83a5c",
"url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u272b10.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz",
"version": "8.0.272" "version": "8.0.282"
} }
}, },
"openj9": { "openj9": {
"aarch64": { "aarch64": {
"build": "10", "build": "8",
"sha256": "bbc78dc8caf25372578a95287bcf672c4bf62af23939d4a988634b2a1356cd89", "sha256": "e107d3b8092f71ee042284b0fc0f0430ef214916812ce02aa6d549aa81b6dc70",
"url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jdk_aarch64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_aarch64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz",
"version": "8.0.272" "version": "8.0.282-ea"
}, },
"packageType": "jdk", "packageType": "jdk",
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "10", "build": "8",
"sha256": "ca852f976e5b27ccd9b73a527a517496bda865b2ae2a85517ca74486fb8de7da", "sha256": "ef10c776dccdff02da6222002a3c023c1cc47d50dd1f6f81314da3d1fe28d13e",
"url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jdk_x64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz",
"version": "8.0.272" "version": "8.0.282"
} }
} }
}, },
"jre": { "jre": {
"hotspot": { "hotspot": {
"aarch64": { "aarch64": {
"build": "10", "build": "8",
"sha256": "ed3a862d83dd1f19037fc6ccf73500f2ecf453eb245af8b70bec3fb80d084289", "sha256": "5ffa116636b90bac486faba2882a2121aca1398a5426ef3e4ad0d913985e680d",
"url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_aarch64_linux_hotspot_8u272b10.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_aarch64_linux_hotspot_jdk8u282-b08.tar.gz",
"version": "8.0.272" "version": "8.0.282"
}, },
"armv6l": { "armv6l": {
"build": "10", "build": "1",
"sha256": "906113d909d81b930c4eb519512d1cc9f9be9789dfd349128d6e7efaeeb36e1c", "sha256": "2e228d39d00ba8d974fd8ccdaaee0225833e79594251b64c724485c4fc94870f",
"url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_arm_linux_hotspot_8u272b10.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jre_arm_linux_hotspot_8u275b01.tar.gz",
"version": "8.0.272" "version": "8.0.275"
}, },
"armv7l": { "armv7l": {
"build": "10", "build": "1",
"sha256": "906113d909d81b930c4eb519512d1cc9f9be9789dfd349128d6e7efaeeb36e1c", "sha256": "2e228d39d00ba8d974fd8ccdaaee0225833e79594251b64c724485c4fc94870f",
"url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_arm_linux_hotspot_8u272b10.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jre_arm_linux_hotspot_8u275b01.tar.gz",
"version": "8.0.272" "version": "8.0.275"
}, },
"packageType": "jre", "packageType": "jre",
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "10", "build": "8",
"sha256": "e6894601a559c5226c6dc337308df263444d356a6430f4aabb66e02607c82956", "sha256": "3b2e2c6ad3ee04a58ffb8d629e3e242b0ae87b38cfd06425e4446b1f9490f521",
"url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_x64_linux_hotspot_8u272b10.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_linux_hotspot_8u282b08.tar.gz",
"version": "8.0.272" "version": "8.0.282"
} }
}, },
"openj9": { "openj9": {
"aarch64": { "aarch64": {
"build": "10", "build": "8",
"sha256": "b0891c3493a9fc6135700d065a826fc67223d54e9d0da3c41b57e6cb6897b726", "sha256": "1ffc7ac14546ee5e16e0efd616073baaf1b80f55abf61257095f132ded9da1e5",
"url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jre_aarch64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_aarch64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz",
"version": "8.0.272" "version": "8.0.282-ea"
}, },
"packageType": "jre", "packageType": "jre",
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "10", "build": "8",
"sha256": "a4e58f3c15ca3bc15cb3aaa9f116de972809ca52ae81e0726f84c059442174d5", "sha256": "4fad259c32eb23ec98925c8b2cf28aaacbdb55e034db74c31a7636e75b6af08d",
"url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jre_x64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz",
"version": "8.0.272" "version": "8.0.282"
} }
} }
} }
@ -632,20 +632,20 @@
"packageType": "jdk", "packageType": "jdk",
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "10", "build": "8",
"sha256": "091f9ee39b0bdbc8af8ec19f51aaa0f73e416c2e93a8fb2c79b82f4caac83ab6", "sha256": "1766d756f6e4a5d41b539f2ecf83e5a33e9336bd75f1602e8f4b4afbb8f47aaa",
"url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_x64_mac_hotspot_8u272b10.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_mac_hotspot_8u282b08.tar.gz",
"version": "8.0.272" "version": "8.0.282"
} }
}, },
"openj9": { "openj9": {
"packageType": "jdk", "packageType": "jdk",
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "10", "build": "8",
"sha256": "bbd66ec27a4ea9b0b0952f501e1837e69c24262f64b316dab0408d1a8633a527", "sha256": "265d4fb01b61ed7a3a9fae6a50bcf6322687b5f08de8598d8e42263cbd8b5772",
"url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10.1_openj9-0.23.0/OpenJDK8U-jdk_x64_mac_openj9_8u272b10_openj9-0.23.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_mac_openj9_8u282b08_openj9-0.24.0.tar.gz",
"version": "8.0.272" "version": "8.0.282"
} }
} }
}, },
@ -654,20 +654,20 @@
"packageType": "jre", "packageType": "jre",
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "10", "build": "8",
"sha256": "afb9c08cb8b93d8e7d4f1e48ced3d43cfb3082491595a2eaf1f00c48abd25428", "sha256": "9e7a40d570d5151aae23a2fb017359248f5fb82c547c3ecd860c992770228afb",
"url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_x64_mac_hotspot_8u272b10.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_mac_hotspot_8u282b08.tar.gz",
"version": "8.0.272" "version": "8.0.282"
} }
}, },
"openj9": { "openj9": {
"packageType": "jre", "packageType": "jre",
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "10", "build": "8",
"sha256": "4d90e85240113189d897a86731e672b37a6e345c056f35c7719cb27f3d08385b", "sha256": "884aa20b3aaed504b18ee21575c8da20838f80fb96036e78e70ff6ef613a5283",
"url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10.1_openj9-0.23.0/OpenJDK8U-jre_x64_mac_openj9_8u272b10_openj9-0.23.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_mac_openj9_8u282b08_openj9-0.24.0.tar.gz",
"version": "8.0.272" "version": "8.0.282"
} }
} }
} }

4
pkgs/development/compilers/factor-lang/default.nix
View file

@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
./fuel-dir.patch ./fuel-dir.patch
]; ];
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper unzip ];
buildInputs = with xorg; [ git rlwrap curl pkg-config perl buildInputs = with xorg; [ git rlwrap curl pkg-config perl
libX11 pango cairo gtk2 gdk-pixbuf gtkglext libX11 pango cairo gtk2 gdk-pixbuf gtkglext
mesa libXmu libXt libICE libSM openssl unzip ]; mesa libXmu libXt libICE libSM openssl ];
buildPhase = '' buildPhase = ''
sed -ie '4i GIT_LABEL = heads/master-${rev}' GNUmakefile sed -ie '4i GIT_LABEL = heads/master-${rev}' GNUmakefile

2
pkgs/development/compilers/graalvm/default.nix
View file

@ -89,7 +89,7 @@ let
makeMxCache = list: makeMxCache = list:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "mx-cache"; name = "mx-cache";
buildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];
buildCommand = with lib; '' buildCommand = with lib; ''
mkdir $out mkdir $out
${lib.concatMapStrings ${lib.concatMapStrings

2
pkgs/development/compilers/gwt/2.4.0.nix
View file

@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1gvyg00vx7fdqgfl2w7nhql78clg3abs6fxxy7m03pprdm5qmm17"; sha256 = "1gvyg00vx7fdqgfl2w7nhql78clg3abs6fxxy7m03pprdm5qmm17";
}; };
buildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out

3
pkgs/development/compilers/kotlin/default.nix
View file

@ -12,8 +12,7 @@ in stdenv.mkDerivation {
}; };
propagatedBuildInputs = [ jre ] ; propagatedBuildInputs = [ jre ] ;
buildInputs = [ unzip ] ; nativeBuildInputs = [ makeWrapper unzip ];
nativeBuildInputs = [ makeWrapper ];
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out

4
pkgs/development/compilers/ocaml/generic.nix
View file

@ -66,6 +66,10 @@ stdenv.mkDerivation (args // {
preConfigure = optionalString (!lib.versionAtLeast version "4.04") '' preConfigure = optionalString (!lib.versionAtLeast version "4.04") ''
CAT=$(type -tp cat) CAT=$(type -tp cat)
sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
'' + optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
# Do what upstream does by default now: https://github.com/ocaml/ocaml/pull/10176
# This is required for aarch64-darwin, everything else works as is.
AS="${stdenv.cc}/bin/cc -c" ASPP="${stdenv.cc}/bin/cc -c"
''; '';
postBuild = '' postBuild = ''
mkdir -p $out/include mkdir -p $out/include

4
pkgs/development/compilers/openjdk/11.nix
View file

@ -25,9 +25,9 @@ let
sha256 = "06pm3hpz4ggiqwvkgzxr39y9kga7vk4flakfznz5979bvgb926vw"; sha256 = "06pm3hpz4ggiqwvkgzxr39y9kga7vk4flakfznz5979bvgb926vw";
}; };
nativeBuildInputs = [ pkg-config autoconf ]; nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [ buildInputs = [
cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk11-bootstrap libXi libXinerama libXcursor libXrandr fontconfig openjdk11-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [ ] ++ lib.optionals (!headless && enableGnome2) [

4
pkgs/development/compilers/openjdk/12.nix
View file

@ -22,9 +22,9 @@ let
sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7"; sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7";
}; };
nativeBuildInputs = [ pkg-config autoconf ]; nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [ buildInputs = [
cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk11 libXi libXinerama libXcursor libXrandr fontconfig openjdk11
] ++ lib.optionals (!headless && enableGnome2) [ ] ++ lib.optionals (!headless && enableGnome2) [

4
pkgs/development/compilers/openjdk/13.nix
View file

@ -22,9 +22,9 @@ let
sha256 = "1871ziss7ny19rw8f7bay5vznmhpqbfi4ihn3yygs06wyxhm0zmv"; sha256 = "1871ziss7ny19rw8f7bay5vznmhpqbfi4ihn3yygs06wyxhm0zmv";
}; };
nativeBuildInputs = [ pkg-config autoconf ]; nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [ buildInputs = [
cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk13-bootstrap libXi libXinerama libXcursor libXrandr fontconfig openjdk13-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [ ] ++ lib.optionals (!headless && enableGnome2) [

4
pkgs/development/compilers/openjdk/14.nix
View file

@ -22,9 +22,9 @@ let
sha256 = "1s1pc6ihzf0awp4hbaqfxmbica0hnrg8nr7s0yd2hfn7nan8xmf3"; sha256 = "1s1pc6ihzf0awp4hbaqfxmbica0hnrg8nr7s0yd2hfn7nan8xmf3";
}; };
nativeBuildInputs = [ pkg-config autoconf ]; nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [ buildInputs = [
cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk14-bootstrap libXi libXinerama libXcursor libXrandr fontconfig openjdk14-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [ ] ++ lib.optionals (!headless && enableGnome2) [

4
pkgs/development/compilers/openjdk/8.nix
View file

@ -83,9 +83,9 @@ let
outputs = [ "out" "jre" ]; outputs = [ "out" "jre" ];
nativeBuildInputs = [ pkg-config lndir ]; nativeBuildInputs = [ pkg-config lndir unzip ];
buildInputs = [ buildInputs = [
cpio file which unzip zip perl openjdk8-bootstrap zlib cups freetype alsaLib cpio file which zip perl openjdk8-bootstrap zlib cups freetype alsaLib
libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig libXi libXinerama libXcursor libXrandr fontconfig
] ++ lib.optionals (!headless && enableGnome2) [ ] ++ lib.optionals (!headless && enableGnome2) [

3
pkgs/development/compilers/openjdk/darwin/11.nix
View file

@ -15,7 +15,8 @@ let
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-mac/"; curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-mac/";
}; };
buildInputs = [ unzip freetype ]; nativeBuildInputs = [ unzip ];
buildInputs = [ freetype ];
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out

3
pkgs/development/compilers/openjdk/darwin/8.nix
View file

@ -18,7 +18,8 @@ let
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/"; curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/";
}; };
buildInputs = [ unzip freetype ]; nativeBuildInputs = [ unzip ];
buildInputs = [ freetype ];
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out

3
pkgs/development/compilers/openjdk/darwin/default.nix
View file

@ -15,7 +15,8 @@ let
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";
}; };
buildInputs = [ unzip freetype ]; nativeBuildInputs = [ unzip ];
buildInputs = [ freetype ];
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out

Some files were not shown because too many files have changed in this diff Show more