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

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2021-07-06 00:02:03 +00:00 committed by GitHub
parent 99b12a99be 310e7759a5
commit 3ddb8d5a79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
89 changed files with 1207 additions and 601 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
doc/stdenv/stdenv.chapter.md
View file

@ -1125,9 +1125,13 @@ There are flags available to harden packages at compile or link-time. These can
Both parameters take a list of flags as strings. The special `"all"` flag can be passed to `hardeningDisable` to turn off all hardening. These flags can also be used as environment variables for testing or development purposes. Both parameters take a list of flags as strings. The special `"all"` flag can be passed to `hardeningDisable` to turn off all hardening. These flags can also be used as environment variables for testing or development purposes.
For more in-depth information on these hardening flags and hardening in general, refer to the [Debian Wiki](https://wiki.debian.org/Hardening), [Ubuntu Wiki](https://wiki.ubuntu.com/Security/Features), [Gentoo Wiki](https://wiki.gentoo.org/wiki/Project:Hardened), and the [Arch Wiki](https://wiki.archlinux.org/title/Security).
### Hardening flags enabled by default {#sec-hardening-flags-enabled-by-default}
The following flags are enabled by default and might require disabling with `hardeningDisable` if the program to package is incompatible. The following flags are enabled by default and might require disabling with `hardeningDisable` if the program to package is incompatible.
### `format` {#format} #### `format` {#format}
Adds the `-Wformat -Wformat-security -Werror=format-security` compiler options. At present, this warns about calls to `printf` and `scanf` functions where the format string is not a string literal and there are no format arguments, as in `printf(foo);`. This may be a security hole if the format string came from untrusted input and contains `%n`. Adds the `-Wformat -Wformat-security -Werror=format-security` compiler options. At present, this warns about calls to `printf` and `scanf` functions where the format string is not a string literal and there are no format arguments, as in `printf(foo);`. This may be a security hole if the format string came from untrusted input and contains `%n`.
@ -1140,7 +1144,7 @@ This needs to be turned off or fixed for errors similar to:
cc1plus: some warnings being treated as errors cc1plus: some warnings being treated as errors
``` ```
### `stackprotector` {#stackprotector} #### `stackprotector` {#stackprotector}
Adds the `-fstack-protector-strong --param ssp-buffer-size=4` compiler options. This adds safety checks against stack overwrites rendering many potential code injection attacks into aborting situations. In the best case this turns code injection vulnerabilities into denial of service or into non-issues (depending on the application). Adds the `-fstack-protector-strong --param ssp-buffer-size=4` compiler options. This adds safety checks against stack overwrites rendering many potential code injection attacks into aborting situations. In the best case this turns code injection vulnerabilities into denial of service or into non-issues (depending on the application).
@ -1151,7 +1155,7 @@ bin/blib.a(bios_console.o): In function `bios_handle_cup':
/tmp/nix-build-ipxe-20141124-5cbdc41.drv-0/ipxe-5cbdc41/src/arch/i386/firmware/pcbios/bios_console.c:86: undefined reference to `__stack_chk_fail' /tmp/nix-build-ipxe-20141124-5cbdc41.drv-0/ipxe-5cbdc41/src/arch/i386/firmware/pcbios/bios_console.c:86: undefined reference to `__stack_chk_fail'
``` ```
### `fortify` {#fortify} #### `fortify` {#fortify}
Adds the `-O2 -D_FORTIFY_SOURCE=2` compiler options. During code generation the compiler knows a great deal of information about buffer sizes (where possible), and attempts to replace insecure unlimited length buffer function calls with length-limited ones. This is especially useful for old, crufty code. Additionally, format strings in writable memory that contain `%n` are blocked. If an application depends on such a format string, it will need to be worked around. Adds the `-O2 -D_FORTIFY_SOURCE=2` compiler options. During code generation the compiler knows a great deal of information about buffer sizes (where possible), and attempts to replace insecure unlimited length buffer function calls with length-limited ones. This is especially useful for old, crufty code. Additionally, format strings in writable memory that contain `%n` are blocked. If an application depends on such a format string, it will need to be worked around.
@ -1172,7 +1176,7 @@ installwatch.c:3751:5: error: conflicting types for '__open_2'
fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute error: open with O_CREAT or O_TMPFILE in second argument needs 3 arguments fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute error: open with O_CREAT or O_TMPFILE in second argument needs 3 arguments
``` ```
### `pic` {#pic} #### `pic` {#pic}
Adds the `-fPIC` compiler options. This options adds support for position independent code in shared libraries and thus making ASLR possible. Adds the `-fPIC` compiler options. This options adds support for position independent code in shared libraries and thus making ASLR possible.
@ -1185,19 +1189,19 @@ ccbLfRgg.s: Assembler messages:
ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_len@GOTOFF' ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_len@GOTOFF'
``` ```
### `strictoverflow` {#strictoverflow} #### `strictoverflow` {#strictoverflow}
Signed integer overflow is undefined behaviour according to the C standard. If it happens, it is an error in the program as it should check for overflow before it can happen, not afterwards. GCC provides built-in functions to perform arithmetic with overflow checking, which are correct and faster than any custom implementation. As a workaround, the option `-fno-strict-overflow` makes gcc behave as if signed integer overflows were defined. Signed integer overflow is undefined behaviour according to the C standard. If it happens, it is an error in the program as it should check for overflow before it can happen, not afterwards. GCC provides built-in functions to perform arithmetic with overflow checking, which are correct and faster than any custom implementation. As a workaround, the option `-fno-strict-overflow` makes gcc behave as if signed integer overflows were defined.
This flag should not trigger any build or runtime errors. This flag should not trigger any build or runtime errors.
### `relro` {#relro} #### `relro` {#relro}
Adds the `-z relro` linker option. During program load, several ELF memory sections need to be written to by the linker, but can be turned read-only before turning over control to the program. This prevents some GOT (and .dtors) overwrite attacks, but at least the part of the GOT used by the dynamic linker (.got.plt) is still vulnerable. Adds the `-z relro` linker option. During program load, several ELF memory sections need to be written to by the linker, but can be turned read-only before turning over control to the program. This prevents some GOT (and .dtors) overwrite attacks, but at least the part of the GOT used by the dynamic linker (.got.plt) is still vulnerable.
This flag can break dynamic shared object loading. For instance, the module systems of Xorg and OpenCV are incompatible with this flag. In almost all cases the `bindnow` flag must also be disabled and incompatible programs typically fail with similar errors at runtime. This flag can break dynamic shared object loading. For instance, the module systems of Xorg and OpenCV are incompatible with this flag. In almost all cases the `bindnow` flag must also be disabled and incompatible programs typically fail with similar errors at runtime.
### `bindnow` {#bindnow} #### `bindnow` {#bindnow}
Adds the `-z bindnow` linker option. During program load, all dynamic symbols are resolved, allowing for the complete GOT to be marked read-only (due to `relro`). This prevents GOT overwrite attacks. For very large applications, this can incur some performance loss during initial load while symbols are resolved, but this shouldn’t be an issue for daemons. Adds the `-z bindnow` linker option. During program load, all dynamic symbols are resolved, allowing for the complete GOT to be marked read-only (due to `relro`). This prevents GOT overwrite attacks. For very large applications, this can incur some performance loss during initial load while symbols are resolved, but this shouldn’t be an issue for daemons.
@ -1207,13 +1211,18 @@ This flag can break dynamic shared object loading. For instance, the module syst
intel_drv.so: undefined symbol: vgaHWFreeHWRec intel_drv.so: undefined symbol: vgaHWFreeHWRec
``` ```
### Hardening flags disabled by default {#sec-hardening-flags-disabled-by-default}
The following flags are disabled by default and should be enabled with `hardeningEnable` for packages that take untrusted input like network services. The following flags are disabled by default and should be enabled with `hardeningEnable` for packages that take untrusted input like network services.
### `pie` {#pie} #### `pie` {#pie}
This flag is disabled by default for normal `glibc` based NixOS package builds, but enabled by default for `musl` based package builds.
Adds the `-fPIE` compiler and `-pie` linker options. Position Independent Executables are needed to take advantage of Address Space Layout Randomization, supported by modern kernel versions. While ASLR can already be enforced for data areas in the stack and heap (brk and mmap), the code areas must be compiled as position-independent. Shared libraries already do this with the `pic` flag, so they gain ASLR automatically, but binary .text regions need to be build with `pie` to gain ASLR. When this happens, ROP attacks are much harder since there are no static locations to bounce off of during a memory corruption attack. Adds the `-fPIE` compiler and `-pie` linker options. Position Independent Executables are needed to take advantage of Address Space Layout Randomization, supported by modern kernel versions. While ASLR can already be enforced for data areas in the stack and heap (brk and mmap), the code areas must be compiled as position-independent. Shared libraries already do this with the `pic` flag, so they gain ASLR automatically, but binary .text regions need to be build with `pie` to gain ASLR. When this happens, ROP attacks are much harder since there are no static locations to bounce off of during a memory corruption attack.
For more in-depth information on these hardening flags and hardening in general, refer to the [Debian Wiki](https://wiki.debian.org/Hardening), [Ubuntu Wiki](https://wiki.ubuntu.com/Security/Features), [Gentoo Wiki](https://wiki.gentoo.org/wiki/Project:Hardened), and the [Arch Wiki](https://wiki.archlinux.org/index.php/DeveloperWiki:Security). Static libraries need to be compiled with `-fPIE` so that executables can link them in with the `-pie` linker option.
If the libraries lack `-fPIE`, you will get the error `recompile with -fPIE`.
[^footnote-stdenv-ignored-build-platform]: The build platform is ignored because it is a mere implementation detail of the package satisfying the dependency: As a general programming principle, dependencies are always *specified* as interfaces, not concrete implementation. [^footnote-stdenv-ignored-build-platform]: The build platform is ignored because it is a mere implementation detail of the package satisfying the dependency: As a general programming principle, dependencies are always *specified* as interfaces, not concrete implementation.
[^footnote-stdenv-native-dependencies-in-path]: Currently, this means for native builds all dependencies are put on the `PATH`. But in the future that may not be the case for sake of matching cross: the platforms would be assumed to be unique for native and cross builds alike, so only the `depsBuild*` and `nativeBuildInputs` would be added to the `PATH`. [^footnote-stdenv-native-dependencies-in-path]: Currently, this means for native builds all dependencies are put on the `PATH`. But in the future that may not be the case for sake of matching cross: the platforms would be assumed to be unique for native and cross builds alike, so only the `depsBuild*` and `nativeBuildInputs` would be added to the `PATH`.

20
maintainers/maintainer-list.nix
View file

@ -1915,6 +1915,16 @@
githubId = 3956062; githubId = 3956062;
name = "Simon Lackerbauer"; name = "Simon Lackerbauer";
}; };
citadelcore = {
email = "alex@arctarus.co.uk";
github = "citadelcore";
githubId = 5567402;
name = "Alex Zero";
keys = [{
longkeyid = "rsa4096/0xA51550EDB450302C";
fingerprint = "A0AA 4646 B8F6 9D45 4553 5A88 A515 50ED B450 302C";
}];
};
cizra = { cizra = {
email = "todurov+nix@gmail.com"; email = "todurov+nix@gmail.com";
github = "cizra"; github = "cizra";
@ -5428,6 +5438,16 @@
githubId = 788813; githubId = 788813;
name = "Bryan Gardiner"; name = "Bryan Gardiner";
}; };
khushraj = {
email = "khushraj.rathod@gmail.com";
github = "KhushrajRathod";
githubId = 44947946;
name = "Khushraj Rathod";
keys = [{
longkeyid = "rsa2048/0xB77B2A40E7702F19";
fingerprint = "1988 3FD8 EA2E B4EC 0A93 1E22 B77B 2A40 E770 2F19";
}];
};
KibaFox = { KibaFox = {
email = "kiba.fox@foxypossibilities.com"; email = "kiba.fox@foxypossibilities.com";
github = "KibaFox"; github = "KibaFox";

3
nixos/modules/programs/ssmtp.nix
View file

@ -124,7 +124,8 @@ in
example = "/run/keys/ssmtp-authpass"; example = "/run/keys/ssmtp-authpass";
description = '' description = ''
Path to a file that contains the password used for SMTP auth. The file Path to a file that contains the password used for SMTP auth. The file
should not contain a trailing newline, if the password does not contain one. should not contain a trailing newline, if the password does not contain one
(e.g. use <command>echo -n "password" > file</command>).
This file should be readable by the users that need to execute ssmtp. This file should be readable by the users that need to execute ssmtp.
''; '';
}; };

3
nixos/modules/virtualisation/oci-containers.nix
View file

@ -262,9 +262,6 @@ let
postStop = "${cfg.backend} rm -f ${name} || true"; postStop = "${cfg.backend} rm -f ${name} || true";
serviceConfig = { serviceConfig = {
StandardOutput = "null";
StandardError = "null";
### There is no generalized way of supporting `reload` for docker ### There is no generalized way of supporting `reload` for docker
### containers. Some containers may respond well to SIGHUP sent to their ### containers. Some containers may respond well to SIGHUP sent to their
### init process, but it is not guaranteed; some apps have other reload ### init process, but it is not guaranteed; some apps have other reload

13
pkgs/applications/audio/mousai/default.nix
View file

@ -1,7 +1,6 @@
{ lib { lib
, python3 , python3
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, appstream-glib , appstream-glib
, desktop-file-utils , desktop-file-utils
, gettext , gettext
@ -19,7 +18,7 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "mousai"; pname = "mousai";
version = "0.4.1"; version = "0.4.2";
format = "other"; format = "other";
@ -27,17 +26,9 @@ python3.pkgs.buildPythonApplication rec {
owner = "SeaDve"; owner = "SeaDve";
repo = "Mousai"; repo = "Mousai";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-AfR5n1dIm9X5OoPiikQEhHBFQq0rmQH4h7cCJ2yXoXI="; sha256 = "sha256-zH++GGFIz3oxkKOYB4zhY6yL3vENEXxtrv8mZZ+41kU=";
}; };
patches = [
(fetchpatch {
name = "fix-ABI-breakage-from-libadwaita.patch";
url = "https://github.com/SeaDve/Mousai/commit/e3db2d9d1949300f49399209b56d667746e539df.patch";
sha256 = "078kvmyhw4jd1m2npai0yl00lwh47jys2n03pkgxp6jf873y83vs";
})
];
postPatch = '' postPatch = ''
patchShebangs build-aux/meson patchShebangs build-aux/meson
''; '';

6
pkgs/applications/audio/plexamp/default.nix
View file

@ -2,13 +2,13 @@
let let
pname = "plexamp"; pname = "plexamp";
version = "3.4.7"; version = "3.5.0";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
name="${pname}-${version}.AppImage"; name="${pname}-${version}.AppImage";
sha512 = "+jmx4X9KiK1Tv2Cjb/445MY9G2b7pLdKxFtBFMaQwRhqTItA33MfHqKBwmytmbEhxhy0LDTU2woJvEMPQCmnvg=="; sha512 = "NjhrtGQsIbNDmGPEDmEbaHSfvUTFb1e7yPorF/BzWTfwVoFZEJiNzP/1k+zTJ4Yfd4mG0W0GYx0jh8m/micWIg==";
}; };
appimageContents = appimageTools.extractType2 { appimageContents = appimageTools.extractType2 {
@ -34,7 +34,7 @@ in appimageTools.wrapType2 {
meta = with lib; { meta = with lib; {
description = "A beautiful Plex music player for audiophiles, curators, and hipsters"; description = "A beautiful Plex music player for audiophiles, curators, and hipsters";
homepage = "https://plexamp.com/"; homepage = "https://plexamp.com/";
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/29"; changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/30";
license = licenses.unfree; license = licenses.unfree;
maintainers = with maintainers; [ killercup synthetica ]; maintainers = with maintainers; [ killercup synthetica ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];

60
pkgs/applications/audio/tonelib-jam/default.nix Normal file
View file

@ -0,0 +1,60 @@
{ stdenv
, dpkg
, lib
, autoPatchelfHook
, fetchurl
, gtk3
, glib
, desktop-file-utils
, alsa-lib
, libjack2
, harfbuzz
, fribidi
, pango
, freetype
}:
stdenv.mkDerivation rec {
pname = "tonelib-jam";
version = "4.6.6";
src = fetchurl {
url = "https://www.tonelib.net/download/0509/ToneLib-Jam-amd64.deb";
sha256 = "sha256-cizIQgO35CQSLme/LKQqP+WzB/jCTk+fS5Z+EtF7wnQ=";
};
buildInputs = [
dpkg
gtk3
glib
desktop-file-utils
alsa-lib
libjack2
harfbuzz
fribidi
pango
freetype
];
nativeBuildInputs = [
autoPatchelfHook
];
unpackPhase = ''
mkdir -p $TMP/ $out/
dpkg -x $src $TMP
'';
installPhase = ''
cp -R $TMP/usr/* $out/
mv $out/bin/ToneLib-Jam $out/bin/tonelib-jam
'';
meta = with lib; {
description = "ToneLib Jam – the learning and practice software for guitar players";
homepage = "https://tonelib.net/";
license = licenses.unfree;
maintainers = with maintainers; [ dan4ik605743 ];
platforms = platforms.linux;
};
}

48
pkgs/applications/audio/tonelib-zoom/default.nix Normal file
View file

@ -0,0 +1,48 @@
{ stdenv
, dpkg
, lib
, autoPatchelfHook
, fetchurl
, webkitgtk
, libjack2
, alsa-lib
}:
stdenv.mkDerivation rec {
pname = "tonelib-zoom";
version = "4.3.1";
src = fetchurl {
url = "https://www.tonelib.net/download/0129/ToneLib-Zoom-amd64.deb";
sha256 = "sha256-4q2vM0/q7o/FracnO2xxnr27opqfVQoN7fsqTD9Tr/c=";
};
buildInputs = [
dpkg
webkitgtk
libjack2
alsa-lib
];
nativeBuildInputs = [
autoPatchelfHook
];
unpackPhase = ''
mkdir -p $TMP/ $out/
dpkg -x $src $TMP
'';
installPhase = ''
cp -R $TMP/usr/* $out/
mv $out/bin/ToneLib-Zoom $out/bin/tonelib-zoom
'';
meta = with lib; {
description = "ToneLib Zoom – change and save all the settings in your Zoom(r) guitar pedal";
homepage = "https://tonelib.net/";
license = licenses.unfree;
maintainers = with maintainers; [ dan4ik605743 ];
platforms = platforms.linux;
};
}

107
pkgs/applications/editors/quartus-prime/default.nix
View file

@ -1,99 +1,9 @@
{ buildFHSUserEnv, makeDesktopItem, writeScript, stdenv, lib, requireFile, unstick, { stdenv, lib, buildFHSUserEnv, callPackage, makeDesktopItem, writeScript
supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] }: , supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ]
, unwrapped ? callPackage ./quartus.nix { inherit supportedDevices; }
}:
let let
deviceIds = {
"Arria II" = "arria_lite";
"Cyclone V" = "cyclonev";
"Cyclone IV" = "cyclone";
"Cyclone 10 LP" = "cyclone10lp";
"MAX II/V" = "max";
"MAX 10 FPGA" = "max10";
};
supportedDeviceIds =
assert lib.assertMsg (lib.all (name: lib.hasAttr name deviceIds) supportedDevices)
"Supported devices are: ${lib.concatStringsSep ", " (lib.attrNames deviceIds)}";
lib.listToAttrs (map (name: {
inherit name;
value = deviceIds.${name};
}) supportedDevices);
unsupportedDeviceIds = lib.filterAttrs (name: value:
!(lib.hasAttr name supportedDeviceIds)
) deviceIds;
quartus = stdenv.mkDerivation rec {
version = "20.1.0.711";
pname = "quartus-prime-lite-unwrapped";
src = let
require = {name, sha256}: requireFile {
inherit name sha256;
url = "${meta.homepage}/${lib.versions.majorMinor version}/?edition=lite&platform=linux";
};
hashes = {
"arria_lite" = "09g2knq23h3vj0s5y7hsdnqbbkr3pnv53dzpqcw2lq9mb5zfs9r0";
"cyclonev" = "05hrpysasyfb7xhxg68spdffxyvxcx0iagibd5jz643b7n6aalpa";
"cyclone" = "1x3rnwsvzrb5kwdz35sbcabxmcvj8xxpnjlpcjwfc69ybiyr6sgz";
"cyclone10lp" = "1x6d4hm697mjgzaxixrw5va8anr6ihhx96x2524r6axpwqf6wcja";
"max" = "060b7v0xh86kkjyiix7akfkzhx2kl1b3q117kp7xibnz6yrzwmy3";
"max10" = "05840l9pmqa4i1b3ajfaxkqz1hppls556vbq16a42acz2qs2g578";
};
devicePackages = map (id: {
name = "${id}-${version}.qdz";
sha256 = lib.getAttr id hashes;
}) (lib.attrValues supportedDeviceIds);
in map require ([{
name = "QuartusLiteSetup-${version}-linux.run";
sha256 = "07ssrv8p8kacal6xd80n4h7l5xz13aw1m1gfqqaxig0ivsj971z5";
} {
name = "ModelSimSetup-${version}-linux.run";
sha256 = "0smxasrmr1c8k6hy378knskpjmz4cgpgb35v5jclns0kx68y3c42";
}] ++ devicePackages);
nativeBuildInputs = [ unstick ];
buildCommand = let
installers = lib.sublist 0 2 src;
components = lib.sublist 2 ((lib.length src) - 2) src;
copyInstaller = installer: ''
# `$(cat $NIX_CC/nix-support/dynamic-linker) $src[0]` often segfaults, so cp + patchelf
cp ${installer} $TEMP/${installer.name}
chmod u+w,+x $TEMP/${installer.name}
patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $TEMP/${installer.name}
'';
copyComponent = component: "cp ${component} $TEMP/${component.name}";
# leaves enabled: quartus, modelsim_ase, devinfo
disabledComponents = [
"quartus_help"
"quartus_update"
# not modelsim_ase
"modelsim_ae"
] ++ (lib.attrValues unsupportedDeviceIds);
in ''
${lib.concatMapStringsSep "\n" copyInstaller installers}
${lib.concatMapStringsSep "\n" copyComponent components}
unstick $TEMP/${(builtins.head installers).name} \
--disable-components ${lib.concatStringsSep "," disabledComponents} \
--mode unattended --installdir $out --accept_eula 1
rm -r $out/uninstall $out/logs
'';
meta = {
homepage = "https://fpgasoftware.intel.com";
description = "FPGA design and simulation software";
license = lib.licenses.unfree;
platforms = lib.platforms.linux;
hydraPlatforms = [ ]; # requireFile srcs cannot be fetched by hydra, ignore
maintainers = with lib.maintainers; [ kwohlfahrt ];
};
};
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "quartus-prime-lite"; name = "quartus-prime-lite";
exec = "quartus"; exec = "quartus";
@ -102,7 +12,6 @@ let
genericName = "Quartus Prime"; genericName = "Quartus Prime";
categories = "Development;"; categories = "Development;";
}; };
# I think modelsim_ase/linux/vlm checksums itself, so use FHSUserEnv instead of `patchelf` # I think modelsim_ase/linux/vlm checksums itself, so use FHSUserEnv instead of `patchelf`
in buildFHSUserEnv rec { in buildFHSUserEnv rec {
name = "quartus-prime-lite"; # wrapped name = "quartus-prime-lite"; # wrapped
@ -136,9 +45,7 @@ in buildFHSUserEnv rec {
xorg.libXrender xorg.libXrender
]; ];
passthru = { passthru = { inherit unwrapped; };
unwrapped = quartus;
};
extraInstallCommands = let extraInstallCommands = let
quartusExecutables = (map (c: "quartus/bin/quartus_${c}") [ quartusExecutables = (map (c: "quartus/bin/quartus_${c}") [
@ -156,14 +63,14 @@ in buildFHSUserEnv rec {
in '' in ''
mkdir -p $out/share/applications $out/share/icons/128x128 mkdir -p $out/share/applications $out/share/icons/128x128
ln -s ${desktopItem}/share/applications/* $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications
ln -s ${quartus}/licenses/images/dc_quartus_panel_logo.png $out/share/icons/128x128/quartus.png ln -s ${unwrapped}/licenses/images/dc_quartus_panel_logo.png $out/share/icons/128x128/quartus.png
mkdir -p $out/quartus/bin $out/quartus/sopc_builder/bin $out/modelsim_ase/bin mkdir -p $out/quartus/bin $out/quartus/sopc_builder/bin $out/modelsim_ase/bin
WRAPPER=$out/bin/${name} WRAPPER=$out/bin/${name}
EXECUTABLES="${lib.concatStringsSep " " (quartusExecutables ++ qsysExecutables ++ modelsimExecutables)}" EXECUTABLES="${lib.concatStringsSep " " (quartusExecutables ++ qsysExecutables ++ modelsimExecutables)}"
for executable in $EXECUTABLES; do for executable in $EXECUTABLES; do
echo "#!${stdenv.shell}" >> $out/$executable echo "#!${stdenv.shell}" >> $out/$executable
echo "$WRAPPER ${quartus}/$executable \$@" >> $out/$executable echo "$WRAPPER ${unwrapped}/$executable \$@" >> $out/$executable
done done
cd $out cd $out

97
pkgs/applications/editors/quartus-prime/quartus.nix Normal file
View file

@ -0,0 +1,97 @@
{ stdenv, lib, unstick, requireFile
, supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ]
}:
let
deviceIds = {
"Arria II" = "arria_lite";
"Cyclone V" = "cyclonev";
"Cyclone IV" = "cyclone";
"Cyclone 10 LP" = "cyclone10lp";
"MAX II/V" = "max";
"MAX 10 FPGA" = "max10";
};
supportedDeviceIds =
assert lib.assertMsg (lib.all (name: lib.hasAttr name deviceIds) supportedDevices)
"Supported devices are: ${lib.concatStringsSep ", " (lib.attrNames deviceIds)}";
lib.listToAttrs (map (name: {
inherit name;
value = deviceIds.${name};
}) supportedDevices);
unsupportedDeviceIds = lib.filterAttrs (name: value:
!(lib.hasAttr name supportedDeviceIds)
) deviceIds;
componentHashes = {
"arria_lite" = "140jqnb97vrxx6398cpgpw35zrrx3z5kv1x5gr9is1xdbnf4fqhy";
"cyclone" = "116kf69ryqcmlc2k8ra0v32jy7nrk7w4s5z3yll7h3c3r68xcsfr";
"cyclone10lp" = "07wpgx9bap6rlr5bcmr9lpsxi3cy4yar4n3pxfghazclzqfi2cyl";
"cyclonev" = "11baa9zpmmfkmyv33w1r57ipf490gnd3dpi2daripf38wld8lgak";
"max" = "1zy2d42dqmn97fwmv4x6pmihh4m23jypv3nd830m1mj7jkjx9kcq";
"max10" = "1hvi9cpcjgbih3l6nh8x1vsp0lky5ax85jb2yqmzla80n7dl9ahs";
};
version = "20.1.1.720";
homepage = "https://fpgasoftware.intel.com";
require = {name, sha256}: requireFile {
inherit name sha256;
url = "${homepage}/${lib.versions.majorMinor version}/?edition=lite&platform=linux";
};
in stdenv.mkDerivation rec {
inherit version;
pname = "quartus-prime-lite-unwrapped";
src = map require ([{
name = "QuartusLiteSetup-${version}-linux.run";
sha256 = "0mjp1rg312dipr7q95pb4nf4b8fwvxgflnd1vafi3g9cshbb1c3k";
} {
name = "ModelSimSetup-${version}-linux.run";
sha256 = "1cqgv8x6vqga8s4v19yhmgrr886rb6p7sbx80528df5n4rpr2k4i";
}] ++ (map (id: {
name = "${id}-${version}.qdz";
sha256 = lib.getAttr id componentHashes;
}) (lib.attrValues supportedDeviceIds)));
nativeBuildInputs = [ unstick ];
buildCommand = let
installers = lib.sublist 0 2 src;
components = lib.sublist 2 ((lib.length src) - 2) src;
copyInstaller = installer: ''
# `$(cat $NIX_CC/nix-support/dynamic-linker) $src[0]` often segfaults, so cp + patchelf
cp ${installer} $TEMP/${installer.name}
chmod u+w,+x $TEMP/${installer.name}
patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $TEMP/${installer.name}
'';
copyComponent = component: "cp ${component} $TEMP/${component.name}";
# leaves enabled: quartus, modelsim_ase, devinfo
disabledComponents = [
"quartus_help"
"quartus_update"
# not modelsim_ase
"modelsim_ae"
] ++ (lib.attrValues unsupportedDeviceIds);
in ''
${lib.concatMapStringsSep "\n" copyInstaller installers}
${lib.concatMapStringsSep "\n" copyComponent components}
unstick $TEMP/${(builtins.head installers).name} \
--disable-components ${lib.concatStringsSep "," disabledComponents} \
--mode unattended --installdir $out --accept_eula 1
rm -r $out/uninstall $out/logs
'';
meta = with lib; {
inherit homepage;
description = "FPGA design and simulation software";
license = licenses.unfree;
platforms = platforms.linux;
hydraPlatforms = [ ]; # requireFile srcs cannot be fetched by hydra, ignore
maintainers = with maintainers; [ kwohlfahrt ];
};
}

47
pkgs/applications/misc/kanjidraw/default.nix Normal file
View file

@ -0,0 +1,47 @@
{ lib
, fetchFromGitHub
, python3
, bash
}:
python3.pkgs.buildPythonApplication rec {
pname = "kanjidraw";
version = "0.2.3";
src = fetchFromGitHub {
owner = "obfusk";
repo = "kanjidraw";
rev = "v${version}";
sha256 = "03ag8vkbf85qww857ii8hcnn8bh5qa7rsmhka0v9vfxk272ifbyq";
};
propagatedBuildInputs = with python3.pkgs; [ tkinter ];
postPatch = ''
substituteInPlace Makefile --replace /bin/bash ${bash}/bin/bash
'';
checkPhase = ''
make test
'';
meta = with lib; {
description = "Handwritten kanji recognition";
longDescription = ''
kanjidraw is a simple Python library + GUI for matching (the strokes of a)
handwritten kanji against its database.
You can use the GUI to draw and subsequently select a kanji from the list of
probable matches, which will then be copied to the clipboard.
The database is based on KanjiVG and the algorithms are based on the
Kanji draw Android app.
'';
homepage = "https://github.com/obfusk/kanjidraw";
license = with licenses; [
agpl3Plus # code
cc-by-sa-30 # data.json
];
maintainers = [ maintainers.obfusk ];
};
}

30
pkgs/applications/misc/kiln/default.nix Normal file
View file

@ -0,0 +1,30 @@
{ lib, buildGoModule, fetchFromSourcehut, scdoc }:
buildGoModule rec {
pname = "kiln";
version = "0.2.1";
src = fetchFromSourcehut {
owner = "~adnano";
repo = pname;
rev = version;
hash = "sha256-c6ed62Nn++qw+U/DCiYeGwF77YsBxexWKZ7UQ3LE4fI=";
};
nativeBuildInputs = [ scdoc ];
vendorSha256 = "sha256-bMpzebwbVHAbBtw0uuGyWd4wnM9z6tlsEQN4S/iucgk=";
installPhase = ''
runHook preInstall
make PREFIX=$out install
runHook postInstall
'';
meta = with lib; {
description = "A simple static site generator for Gemini";
homepage = "https://git.sr.ht/~adnano/kiln";
license = licenses.mit;
maintainers = with maintainers; [ sikmir ];
};
}

44
pkgs/applications/misc/kjv/default.nix
View file

@ -1,43 +1,41 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch }: { lib, stdenv, fetchFromGitHub, fetchpatch, readline }:
let let
patchPrefix = "https://github.com/samuelgrf/kjv/commit/";
patch-base = "https://github.com/LukeSmithxyz/kjv/commit/"; add-apocrypha = fetchpatch {
url = patchPrefix + "0856fa0d37b45de0d6b47d163b5ea9a0b7f2c061.patch";
add-apocrypha = fetchpatch { sha256 = "1jkajdg4wvpbbwc5mn37i4c8nfis4z0pv5rl7gqs0laj0gpj7jn8";
url = patch-base + "b92b7622285d10464f9274f11e740bef90705bbc.patch"; };
sha256 = "0n4sj8p9m10fcair4msc129jxkkx5whqzhjbr5k4lfgp6nb1zk8k";
};
add-install-target = fetchpatch {
url = patch-base + "f4ad73539eb73f1890f4b791d8d38dd95900a4a4.patch";
sha256 = "1yzj72i5fkzn2i4wl09q6jx7nwn2h4jwm49fc23nxfwchzar9m1q";
};
add-install-target = fetchpatch {
url = patchPrefix + "50a83256ee45430fb06b7aea1945dd91c6813bc3.patch";
sha256 = "0bv9yma67jdj496a6vn6y007c9gwjpg3rzld1i9m9y9xmlzq4yzv";
};
in in
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "kjv"; pname = "kjv";
version = "unstable-2018-12-25"; version = "unstable-2021-03-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bontibon"; owner = "bontibon";
repo = pname; repo = "kjv";
rev = "fda81a610e4be0e7c5cf242de655868762dda1d4"; rev = "108595dcbb9bb12d40e0309f029b6fb3ccd81309";
sha256 = "1favfcjvd3pzz1ywwv3pbbxdg7v37s8vplgsz8ag016xqf5ykqqf"; hash = "sha256-Z6myd9Xn23pYizG+IZVDrP988pYU06QIcpqXtWTcPiw=";
}; };
patches = [ add-apocrypha add-install-target ]; patches = [ add-apocrypha add-install-target ];
makeFlags = [ buildInputs = [ readline ];
"PREFIX=${placeholder "out"}"
]; makeFlags = [ "PREFIX=${placeholder "out"}" ];
meta = with lib; { meta = with lib; {
description = "The Bible, King James Version"; description = "The Bible, King James Version";
homepage = "https://github.com/bontibon/kjv"; homepage = "https://github.com/bontibon/kjv";
license = licenses.publicDomain; license = licenses.unlicense;
maintainers = [ maintainers.jtobin ]; maintainers = with maintainers; [ jtobin samuelgrf ];
mainProgram = "kjv";
}; };
} }

5
pkgs/applications/misc/makeself/default.nix
View file

@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "07cq7q71bv3fwddkp2863ylry2ivds00f8sjy8npjpdbkailxm21"; sha256 = "07cq7q71bv3fwddkp2863ylry2ivds00f8sjy8npjpdbkailxm21";
}; };
patchPhase = "patchShebangs test"; patches = [ ./tests-use-better-shell.patch ];
postPatch = "patchShebangs test";
doCheck = true; doCheck = true;
checkTarget = "test"; checkTarget = "test";
@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
''; '';
meta = with lib; { meta = with lib; {
homepage = "http://megastep.org/makeself"; homepage = "https://makeself.io";
description = "Utility to create self-extracting packages"; description = "Utility to create self-extracting packages";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = [ maintainers.wmertens ]; maintainers = [ maintainers.wmertens ];

10
pkgs/applications/misc/makeself/tests-use-better-shell.patch Normal file
View file

@ -0,0 +1,10 @@
Use full bash's sh in tests instead of /bin/sh, as that would be
too minimalist in the build sandbox. See issue:
https://github.com/NixOS/nixpkgs/issues/110149#issuecomment-874258128
diff --git a/test/extracttest b/test/extracttest
--- a/test/extracttest
+++ b/test/extracttest
@@ -9,2 +9,3 @@ setupTests() {
$SUT $* archive makeself-test.run "Test $*" echo Testing
+ sed "1s|/bin|$(dirname "$SHELL")|" -i ./makeself-test.run
}

6
pkgs/applications/networking/cluster/linkerd/default.nix
View file

@ -64,8 +64,8 @@ in
}; };
edge = generic { edge = generic {
channel = "edge"; channel = "edge";
version = "21.6.3"; version = "21.7.1";
sha256 = "sha256-NgfbkeVRl0AGNkZSS2nSAHp4eZ49QNSEYMuFe1G5iBY="; sha256 = "sha256-VLq776A0H2IZLBeYjXpYzFixcydw/OcYsvKFxeLuewo=";
vendorSha256 = "sha256-rq/MHo5MG2EKZ3d937TIDXFCoWnLlQO3C/fo1bhRxCA="; vendorSha256 = "sha256-xSOPMFHfyCmG+yTzBfKR7F5KYV0gcKRNM0UrxpGBpE4=";
}; };
} }

6
pkgs/applications/networking/cluster/terragrunt/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "terragrunt"; pname = "terragrunt";
version = "0.30.7"; version = "0.31.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gruntwork-io"; owner = "gruntwork-io";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-zcb2bdIvUeHEto2NeY0Zwj7jIB+ipVXpnb7q97IkvmA="; sha256 = "sha256-JRIwPOExPbwLS7ps4pJpvIRaZ9jZZjVK+POaUHAmiPI=";
}; };
vendorSha256 = "sha256-OgNNq1qRhCufcWemLxh50pzs432RxZpWWcyBB7xeiOs="; vendorSha256 = "sha256-lck4nabDhFA8N0lo+cIKiJjlg2TGx3qMExbblHQwbvQ=";
doCheck = false; doCheck = false;

6
pkgs/applications/networking/cluster/waypoint/default.nix
View file

@ -2,17 +2,17 @@
buildGoModule rec { buildGoModule rec {
pname = "waypoint"; pname = "waypoint";
version = "0.4.0"; version = "0.4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hashicorp"; owner = "hashicorp";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-yeD7XtcB/2ph6cCnOcv0yFQqvAMPDLXMrUWWkgmBUaA="; sha256 = "sha256-JB/0nU/05Agh4fWFeSfrUHFtR8cQjxdXW0QHAoH0dDc=";
}; };
deleteVendor = true; deleteVendor = true;
vendorSha256 = "sha256-xZGYPh3Yp3g22GraYfMESVpp7j5fOZASUEvN4YaDd1g="; vendorSha256 = "sha256-2YrCRdpRk+gPHN8flahgWb2sbK5dYL5ivVqeJSsiy8Y=";
nativeBuildInputs = [ go-bindata installShellFiles ]; nativeBuildInputs = [ go-bindata installShellFiles ];

26
pkgs/applications/networking/irc/weechat/scripts/buffer_autoset/default.nix Normal file
View file

@ -0,0 +1,26 @@
{ lib, stdenv, fetchurl, weechat }:
stdenv.mkDerivation {
pname = "buffer_autoset";
version = "1.2";
src = fetchurl {
url = "https://raw.githubusercontent.com/weechat/scripts/2b308b44df39ba6563d02b2bcd40c384ec2777dc/python/buffer_autoset.py";
sha256 = "0csl3sfpijdbq1j6wabx347lvn91a24a2jfx5b5pspfxz7gixli1";
};
dontUnpack = true;
passthru.scripts = [ "buffer_autoset.py" ];
installPhase = ''
install -D $src $out/share/buffer_autoset.py
'';
meta = with lib; {
inherit (weechat.meta) platforms;
description = "buffer_autoset.py is a weechat script which auto-set buffer properties when a buffer is opened.";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ govanify ];
};
}

2
pkgs/applications/networking/irc/weechat/scripts/default.nix
View file

@ -22,4 +22,6 @@
weechat-otr = callPackage ./weechat-otr { }; weechat-otr = callPackage ./weechat-otr { };
weechat-go = callPackage ./weechat-go { }; weechat-go = callPackage ./weechat-go { };
buffer_autoset = callPackage ./buffer_autoset { };
} }

25
pkgs/applications/networking/juju/default.nix Normal file
View file

@ -0,0 +1,25 @@
{ lib, fetchFromGitHub, buildGoModule }:
buildGoModule rec {
pname = "juju";
version = "2.8.7";
src = fetchFromGitHub {
owner = "juju";
repo = "juju";
rev = "juju-${version}";
sha256 = "sha256-ZiG+LMeQboFxaLIBSHjRNe5tt8bEguYXQp3nhkoMpek=";
};
vendorSha256 = "sha256-5R3TmwOzHgdEQhS4B4Bb0InghaEhUVxDSl7oZl3aNZ4=";
# Disable tests because it attempts to use a mongodb instance
doCheck = false;
meta = with lib; {
description = "Open source modelling tool for operating software in the cloud";
homepage = "https://juju.is";
license = licenses.mit;
maintainers = with maintainers; [ citadelcore ];
};
}

9
pkgs/applications/science/math/sage/sage-src.nix
View file

@ -126,6 +126,15 @@ stdenv.mkDerivation rec {
rev = "bc84af8c795b7da433d2000afc3626ee65ba28b8"; rev = "bc84af8c795b7da433d2000afc3626ee65ba28b8";
sha256 = "sha256-5Kvs9jarC8xRIU1rdmvIWxQLC25ehiTLJpg5skh8WNM="; sha256 = "sha256-5Kvs9jarC8xRIU1rdmvIWxQLC25ehiTLJpg5skh8WNM=";
}) })
# eclib 20210625 update
# https://trac.sagemath.org/ticket/31443
(fetchSageDiff {
base = "9.4.beta3";
name = "eclib-20210625.patch";
rev = "789550ca04c94acfb1e803251538996a34962038";
sha256 = "sha256-VlyEn5hg3joG8t/GwiRfq9TzJ54AoHxLolsNQ3shc2c=";
})
]; ];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;

4
pkgs/data/fonts/sarasa-gothic/default.nix
View file

@ -1,12 +1,12 @@
{ lib, fetchurl, libarchive }: { lib, fetchurl, libarchive }:
let let
version = "0.12.11"; version = "0.32.9";
in fetchurl { in fetchurl {
name = "sarasa-gothic-${version}"; name = "sarasa-gothic-${version}";
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
sha256 = "0vcp8583by7pfqinq8p2jx2bn4dqq816x4bxgv05k0kb9ziwj7aj"; sha256 = "0mwaj9dq26f36ddywjm7m0is1jml2kpmqm46b16c8avvr97c65z5";
recursiveHash = true; recursiveHash = true;
downloadToTemp = true; downloadToTemp = true;

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

@ -5,45 +5,45 @@
"hotspot": { "hotspot": {
"aarch64": { "aarch64": {
"build": "9", "build": "9",
"sha256": "420c5d1e5dc66b2ed7dedd30a7bdf94bfaed10d5e1b07dc579722bf60a8114a9", "sha256": "4966b0df9406b7041e14316e04c9579806832fafa02c5d3bd1842163b7f2353a",
"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", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.11_9.tar.gz",
"version": "11.0.10" "version": "11.0.11"
}, },
"armv6l": { "armv6l": {
"build": "9", "build": "9",
"sha256": "34908da9c200f5ef71b8766398b79fd166f8be44d87f97510667698b456c8d44", "sha256": "2d7aba0b9ea287145ad437d4b3035fc84f7508e78c6fec99be4ff59fe1b6fc0d",
"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", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.11_9.tar.gz",
"version": "11.0.10" "version": "11.0.11"
}, },
"armv7l": { "armv7l": {
"build": "9", "build": "9",
"sha256": "34908da9c200f5ef71b8766398b79fd166f8be44d87f97510667698b456c8d44", "sha256": "2d7aba0b9ea287145ad437d4b3035fc84f7508e78c6fec99be4ff59fe1b6fc0d",
"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", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.11_9.tar.gz",
"version": "11.0.10" "version": "11.0.11"
}, },
"packageType": "jdk", "packageType": "jdk",
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "9", "build": "9",
"sha256": "ae78aa45f84642545c01e8ef786dfd700d2226f8b12881c844d6a1f71789cb99", "sha256": "e99b98f851541202ab64401594901e583b764e368814320eba442095251e78cb",
"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", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz",
"version": "11.0.10" "version": "11.0.11"
} }
}, },
"openj9": { "openj9": {
"aarch64": { "aarch64": {
"build": "9", "build": "9",
"sha256": "0ce9a8c38d154540610dfe03e59389734deb91c5cb9258408404c5026d4afa41", "sha256": "31242e10bb826679aae3ed303be17ad3ef3c2551afbbd19f031ada87dd73258f",
"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", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_aarch64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz",
"version": "11.0.10-ea" "version": "11.0.11-ea"
}, },
"packageType": "jdk", "packageType": "jdk",
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "9", "build": "9",
"sha256": "941d5df125d2ad426391340f539408b13d61d00ed31dd79142ff1ac84864a79f", "sha256": "a605ab06f76533d44ce0828bd96836cc9c0e71ec3df3f8672052ea98dcbcca22",
"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", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz",
"version": "11.0.10" "version": "11.0.11"
} }
} }
}, },
@ -51,45 +51,45 @@
"hotspot": { "hotspot": {
"aarch64": { "aarch64": {
"build": "9", "build": "9",
"sha256": "5f9a894bd694f598f2befa4a605169685ac8bcb8ec68d25e587e8db4d2307b74", "sha256": "fde6b29df23b6e7ed6e16a237a0f44273fb9e267fdfbd0b3de5add98e55649f6",
"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", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.11_9.tar.gz",
"version": "11.0.10" "version": "11.0.11"
}, },
"armv6l": { "armv6l": {
"build": "9", "build": "9",
"sha256": "2f2da2149c089c84f00b0eda63c31b77c8b51a1c080e18a70ecb5a78ba40d8c6", "sha256": "ad02656f800fd64c2b090b23ad24a099d9cd1054948ecb0e9851bc39c51c8be8",
"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", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.11_9.tar.gz",
"version": "11.0.10" "version": "11.0.11"
}, },
"armv7l": { "armv7l": {
"build": "9", "build": "9",
"sha256": "2f2da2149c089c84f00b0eda63c31b77c8b51a1c080e18a70ecb5a78ba40d8c6", "sha256": "ad02656f800fd64c2b090b23ad24a099d9cd1054948ecb0e9851bc39c51c8be8",
"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", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.11_9.tar.gz",
"version": "11.0.10" "version": "11.0.11"
}, },
"packageType": "jre", "packageType": "jre",
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "9", "build": "9",
"sha256": "25fdcf9427095ac27c8bdfc82096ad2e615693a3f6ea06c700fca7ffb271131a", "sha256": "144f2c6bcf64faa32016f2474b6c01031be75d25325e9c3097aed6589bc5d548",
"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", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz",
"version": "11.0.10" "version": "11.0.11"
} }
}, },
"openj9": { "openj9": {
"aarch64": { "aarch64": {
"build": "9", "build": "9",
"sha256": "c48d2b19bf7040c74dfdcac9e395ba7b8f937522ee756c820465f2e8e3dffec2", "sha256": "434219d233bdb8f1bee024b1ca5accfc3f1f832320b5221ded715eed101e705f",
"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", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_aarch64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz",
"version": "11.0.10-ea" "version": "11.0.11-ea"
}, },
"packageType": "jre", "packageType": "jre",
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "9", "build": "9",
"sha256": "7e5f97071f8b86c22c36ddfd7f821c3e8ec531c1128e2e6c931b2e64118a517a", "sha256": "152bf992d965ed018e9e1c3c2eb2c1771f92e0b6485b9a1f2c6d84d282117715",
"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", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz",
"version": "11.0.10" "version": "11.0.11"
} }
} }
} }
@ -101,9 +101,9 @@
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "9", "build": "9",
"sha256": "ee7c98c9d79689aca6e717965747b8bf4eec5413e89d5444cc2bd6dbd59e3811", "sha256": "d851a220e77473a4b483d8bd6b6570e04fd83fdd48d6584b58b041f5997186c2",
"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", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.11_9.tar.gz",
"version": "11.0.10" "version": "11.0.11"
} }
}, },
"openj9": { "openj9": {
@ -111,9 +111,9 @@
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "9", "build": "9",
"sha256": "58f931dc30160b04da2d94af32e0dfa384f4b2cf92b7217c0937fd057e668d54", "sha256": "797cee6b9f6e18bcc026ee9dcebbce81d62ca897038402d247630b25d41efe15",
"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", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.11_9_openj9-0.26.0.tar.gz",
"version": "11.0.10" "version": "11.0.11"
} }
} }
}, },
@ -123,9 +123,9 @@
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "9", "build": "9",
"sha256": "215e94323d7c74fe31e5383261e3bfc8e9ca3dc03212738c48d29868b02fe875", "sha256": "ccb38c0b73bd0ba7006d00234a51eee9504ec8108c835e1f1763191806374707",
"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", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.11_9.tar.gz",
"version": "11.0.10" "version": "11.0.11"
} }
}, },
"openj9": { "openj9": {
@ -133,9 +133,9 @@
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "9", "build": "9",
"sha256": "6e353f0b38a7192ad3e0522009065c7c24356e0d9329899477b21e39d2a7a8da", "sha256": "80a0c03f0b603d6008e29c651f884878743fcaa90fc05aef15f3411749da94e7",
"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", "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_x64_mac_openj9_11.0.11_9_openj9-0.26.0.tar.gz",
"version": "11.0.10" "version": "11.0.11"
} }
} }
} }
@ -536,92 +536,92 @@
"jdk": { "jdk": {
"hotspot": { "hotspot": {
"aarch64": { "aarch64": {
"build": "36", "build": "9",
"sha256": "7217a9f9be3b0c8dfc78538f95fd2deb493eb651152d975062920566492b2574", "sha256": "3447ec27a6dbd4f3a6180a0d4371bb09aa428c16eea9983e515a7400cc9f5c85",
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_aarch64_linux_hotspot_16_36.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.1_9.tar.gz",
"version": "16.0.0" "version": "16.0.1"
}, },
"armv6l": { "armv6l": {
"build": "36", "build": "9",
"sha256": "f1d32ba01a40c98889f31368c0e987d6bbda65a7c50b8c088623b48e3a90104a", "sha256": "20fc395d8ea2659e6407cd4ec233dc4399f61b7610f3a16495deb23c1e3b81df",
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_arm_linux_hotspot_16_36.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_arm_linux_hotspot_16.0.1_9.tar.gz",
"version": "16.0.0" "version": "16.0.1"
}, },
"armv7l": { "armv7l": {
"build": "36", "build": "9",
"sha256": "f1d32ba01a40c98889f31368c0e987d6bbda65a7c50b8c088623b48e3a90104a", "sha256": "20fc395d8ea2659e6407cd4ec233dc4399f61b7610f3a16495deb23c1e3b81df",
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_arm_linux_hotspot_16_36.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_arm_linux_hotspot_16.0.1_9.tar.gz",
"version": "16.0.0" "version": "16.0.1"
}, },
"packageType": "jdk", "packageType": "jdk",
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "36", "build": "9",
"sha256": "2e031cf37018161c9e59b45fa4b98ff2ce4ce9297b824c512989d579a70f8422", "sha256": "7fdda042207efcedd30cd76d6295ed56b9c2e248cb3682c50898a560d4aa1c6f",
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz",
"version": "16.0.0" "version": "16.0.1"
} }
}, },
"openj9": { "openj9": {
"aarch64": { "aarch64": {
"build": "36", "build": "9",
"sha256": "f4d4e0c0e9e0a4d0f14172878cee5e1a0ae73170058e1c183a452f8d97331ac0", "sha256": "abc56cd266b4acc96cc700b166ad016907dac97d7a593bd5c369d54efc4b4acd",
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_aarch64_linux_openj9_16_36_openj9-0.25.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_aarch64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz",
"version": "16.0.0-ea" "version": "16.0.1-ea"
}, },
"packageType": "jdk", "packageType": "jdk",
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "36", "build": "9",
"sha256": "9f9b327d08cbc71b32f28004ae9d9c2c84ff9bc335cac3068c5a5737bfa4606f", "sha256": "7395aaa479a7410bbe5bd5efc43d2669718c61ba146b06657315dbd467b98bf1",
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz",
"version": "16.0.0" "version": "16.0.1"
} }
} }
}, },
"jre": { "jre": {
"hotspot": { "hotspot": {
"aarch64": { "aarch64": {
"build": "36", "build": "9",
"sha256": "947b02342513b085946b2e7c376cc1f1cfe89600bc3d30455160f88d41da3509", "sha256": "4e47f1cbf46190727be74cd73445ec2b693f5ba4a74542c554d6b3285811cab5",
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_aarch64_linux_hotspot_16_36.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_aarch64_linux_hotspot_16.0.1_9.tar.gz",
"version": "16.0.0" "version": "16.0.1"
}, },
"armv6l": { "armv6l": {
"build": "36", "build": "9",
"sha256": "4d3f351a161792779417ee2730413a976258c4cc5f323526f1fbc0cca82aca6e", "sha256": "c1f88f3ce955cb2e9a4236a916cc6660ef55231d29c4390b1a4398ebbca358b7",
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_arm_linux_hotspot_16_36.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_arm_linux_hotspot_16.0.1_9.tar.gz",
"version": "16.0.0" "version": "16.0.1"
}, },
"armv7l": { "armv7l": {
"build": "36", "build": "9",
"sha256": "4d3f351a161792779417ee2730413a976258c4cc5f323526f1fbc0cca82aca6e", "sha256": "c1f88f3ce955cb2e9a4236a916cc6660ef55231d29c4390b1a4398ebbca358b7",
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_arm_linux_hotspot_16_36.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_arm_linux_hotspot_16.0.1_9.tar.gz",
"version": "16.0.0" "version": "16.0.1"
}, },
"packageType": "jre", "packageType": "jre",
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "36", "build": "9",
"sha256": "4aa99cbe5a6838c3ed29fa7aa7bee95c39ddd41e3f7544178dcd257b15a9359e", "sha256": "5eca19d406c6d130e9c3a4b932b9cb0a6e9cd45932450668c3e911bded4bcf40",
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_linux_hotspot_16_36.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_linux_hotspot_16.0.1_9.tar.gz",
"version": "16.0.0" "version": "16.0.1"
} }
}, },
"openj9": { "openj9": {
"aarch64": { "aarch64": {
"build": "36", "build": "9",
"sha256": "13ae42f5040d4e5d97b8809e27ebfdf8f7326604771963d85b2c1385abe13742", "sha256": "01d8337d1069b8bfdcdf096b30cc24d1df42ffeede676da99fed77bef2670454",
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_aarch64_linux_openj9_16_36_openj9-0.25.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_aarch64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz",
"version": "16.0.0-ea" "version": "16.0.1-ea"
}, },
"packageType": "jre", "packageType": "jre",
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "36", "build": "9",
"sha256": "302b8b9bba4f51d0a9ac087ed91929dbd3ae52cf5a5b6c150373563012db60d9", "sha256": "fab572dd1a2ef00fd18ad4f5a4c373d0cf140045e61f9104cd5b8dbf6b3a517d",
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz",
"version": "16.0.0" "version": "16.0.1"
} }
} }
} }
@ -632,20 +632,20 @@
"packageType": "jdk", "packageType": "jdk",
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "36", "build": "9",
"sha256": "b66761b55fd493ed2a5f4df35a32b338ec34a9e0a1244439e3156561ab27c511", "sha256": "3be78eb2b0bf0a6edef2a8f543958d6e249a70c71e4d7347f9edb831135a16b8",
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_mac_hotspot_16_36.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_mac_hotspot_16.0.1_9.tar.gz",
"version": "16.0.0" "version": "16.0.1"
} }
}, },
"openj9": { "openj9": {
"packageType": "jdk", "packageType": "jdk",
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "36", "build": "9",
"sha256": "e6075cbe939b4de165cc8b4b91352f8885d549873f5cd419e75eba737502542e", "sha256": "6d4241c6ede2167fb71bd57f7a770a74564ee007c06bcae98e1abc3c1de4756f",
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_mac_openj9_16_36_openj9-0.25.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_x64_mac_openj9_16.0.1_9_openj9-0.26.0.tar.gz",
"version": "16.0.0" "version": "16.0.1"
} }
} }
}, },
@ -654,20 +654,20 @@
"packageType": "jre", "packageType": "jre",
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "36", "build": "9",
"sha256": "92cb07e9e9d075996d1a9e0ccfc1d35e6f97f7e188e9bb78088ee1066062a428", "sha256": "33eeccbeea75e70b09610ba12e9591386a0e42248525b8358c9ae683bce82779",
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_mac_hotspot_16_36.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_mac_hotspot_16.0.1_9.tar.gz",
"version": "16.0.0" "version": "16.0.1"
} }
}, },
"openj9": { "openj9": {
"packageType": "jre", "packageType": "jre",
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "36", "build": "9",
"sha256": "9e5c31582778ca5c08fc221e185dc0f4dbce2091cbc69966a1e2617344b722f1", "sha256": "f57a6f04cf21a8470bb6f9488c57031d89db73c8b24997d74812855372f4e6b8",
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_mac_openj9_16_36_openj9-0.25.0.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_x64_mac_openj9_16.0.1_9_openj9-0.26.0.tar.gz",
"version": "16.0.0" "version": "16.0.1"
} }
} }
} }
@ -678,92 +678,92 @@
"jdk": { "jdk": {
"hotspot": { "hotspot": {
"aarch64": { "aarch64": {
"build": "8", "build": "10",
"sha256": "9c07cf2099bbc6c850c46fd870bd243f5fcb6635181eabb312bdffe43ffc5080", "sha256": "a29edaf66221f7a51353d3f28e1ecf4221268848260417bc562d797e514082a8",
"url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz",
"version": "8.0.282" "version": "8.0.292"
}, },
"armv6l": { "armv6l": {
"build": "1", "build": "10",
"sha256": "e2e41a8705061dfcc766bfb6b7edd4c699e94aac68e4deeb28c8e76734a46fb7", "sha256": "0de107b7df38314c1daab78571383b8b39fdc506790aaef5d870b3e70048881b",
"url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jdk_arm_linux_hotspot_8u275b01.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u292b10.tar.gz",
"version": "8.0.275" "version": "8.0.292"
}, },
"armv7l": { "armv7l": {
"build": "1", "build": "10",
"sha256": "e2e41a8705061dfcc766bfb6b7edd4c699e94aac68e4deeb28c8e76734a46fb7", "sha256": "0de107b7df38314c1daab78571383b8b39fdc506790aaef5d870b3e70048881b",
"url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jdk_arm_linux_hotspot_8u275b01.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u292b10.tar.gz",
"version": "8.0.275" "version": "8.0.292"
}, },
"packageType": "jdk", "packageType": "jdk",
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "8", "build": "10",
"sha256": "e6e6e0356649b9696fa5082cfcb0663d4bef159fc22d406e3a012e71fce83a5c", "sha256": "0949505fcf42a1765558048451bb2a22e84b3635b1a31dd6191780eeccaa4ada",
"url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz",
"version": "8.0.282" "version": "8.0.292"
} }
}, },
"openj9": { "openj9": {
"aarch64": { "aarch64": {
"build": "8", "build": "10",
"sha256": "e107d3b8092f71ee042284b0fc0f0430ef214916812ce02aa6d549aa81b6dc70", "sha256": "b168245ddc18b85135c15ed6baea5cbcc06192b49af04dcfa698458373efc061",
"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", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_aarch64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz",
"version": "8.0.282-ea" "version": "8.0.292-ea"
}, },
"packageType": "jdk", "packageType": "jdk",
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "8", "build": "10",
"sha256": "ef10c776dccdff02da6222002a3c023c1cc47d50dd1f6f81314da3d1fe28d13e", "sha256": "06d6c9421778575cf59d50f69b7ac6a7bb237485b3a3c2f89cfb61a056c7b2de",
"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", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz",
"version": "8.0.282" "version": "8.0.292"
} }
} }
}, },
"jre": { "jre": {
"hotspot": { "hotspot": {
"aarch64": { "aarch64": {
"build": "8", "build": "10",
"sha256": "5ffa116636b90bac486faba2882a2121aca1398a5426ef3e4ad0d913985e680d", "sha256": "b062ec775e6c2961532d9afeae4027fe3ac2cf4344cbc912a401be5bfb6ca221",
"url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_aarch64_linux_hotspot_jdk8u282-b08.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_aarch64_linux_hotspot_8u292b10.tar.gz",
"version": "8.0.282" "version": "8.0.292"
}, },
"armv6l": { "armv6l": {
"build": "1", "build": "10",
"sha256": "2e228d39d00ba8d974fd8ccdaaee0225833e79594251b64c724485c4fc94870f", "sha256": "7f7707a7a3998737d2221080ea65d50ea96f5dde5226961ebcebd3ec99a82a32",
"url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jre_arm_linux_hotspot_8u275b01.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_arm_linux_hotspot_8u292b10.tar.gz",
"version": "8.0.275" "version": "8.0.292"
}, },
"armv7l": { "armv7l": {
"build": "1", "build": "10",
"sha256": "2e228d39d00ba8d974fd8ccdaaee0225833e79594251b64c724485c4fc94870f", "sha256": "7f7707a7a3998737d2221080ea65d50ea96f5dde5226961ebcebd3ec99a82a32",
"url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jre_arm_linux_hotspot_8u275b01.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_arm_linux_hotspot_8u292b10.tar.gz",
"version": "8.0.275" "version": "8.0.292"
}, },
"packageType": "jre", "packageType": "jre",
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "8", "build": "10",
"sha256": "3b2e2c6ad3ee04a58ffb8d629e3e242b0ae87b38cfd06425e4446b1f9490f521", "sha256": "cad66f48f90167ed19030c71f8f0580702c43cce5ce5a0d76833f7a5ae7c402a",
"url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_linux_hotspot_8u282b08.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_x64_linux_hotspot_8u292b10.tar.gz",
"version": "8.0.282" "version": "8.0.292"
} }
}, },
"openj9": { "openj9": {
"aarch64": { "aarch64": {
"build": "8", "build": "10",
"sha256": "1ffc7ac14546ee5e16e0efd616073baaf1b80f55abf61257095f132ded9da1e5", "sha256": "f87f90673e25c3ce9e868e96a6059b22665f12d05e389813f75dfbc95d970393",
"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", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_aarch64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz",
"version": "8.0.282-ea" "version": "8.0.292-ea"
}, },
"packageType": "jre", "packageType": "jre",
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "8", "build": "10",
"sha256": "4fad259c32eb23ec98925c8b2cf28aaacbdb55e034db74c31a7636e75b6af08d", "sha256": "6d5b67979e0935febe893895b622647bf8a59df6093ae57074db11d2ac9373ea",
"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", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz",
"version": "8.0.282" "version": "8.0.292"
} }
} }
} }
@ -774,20 +774,20 @@
"packageType": "jdk", "packageType": "jdk",
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "8", "build": "10",
"sha256": "1766d756f6e4a5d41b539f2ecf83e5a33e9336bd75f1602e8f4b4afbb8f47aaa", "sha256": "5646fbe9e4138c902c910bb7014d41463976598097ad03919e4848634c7e8007",
"url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_mac_hotspot_8u282b08.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_mac_hotspot_8u292b10.tar.gz",
"version": "8.0.282" "version": "8.0.292"
} }
}, },
"openj9": { "openj9": {
"packageType": "jdk", "packageType": "jdk",
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "8", "build": "10",
"sha256": "265d4fb01b61ed7a3a9fae6a50bcf6322687b5f08de8598d8e42263cbd8b5772", "sha256": "d262bc226895e80b7e80d61905e65fe043ca0a3e3b930f7b88ddfacb8835e939",
"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", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_x64_mac_openj9_8u292b10_openj9-0.26.0.tar.gz",
"version": "8.0.282" "version": "8.0.292"
} }
} }
}, },
@ -796,20 +796,20 @@
"packageType": "jre", "packageType": "jre",
"vmType": "hotspot", "vmType": "hotspot",
"x86_64": { "x86_64": {
"build": "8", "build": "10",
"sha256": "9e7a40d570d5151aae23a2fb017359248f5fb82c547c3ecd860c992770228afb", "sha256": "bfe1cecf686b4d129594916b0f10d98b71c8d2caec1b96bbbee7f40aa053f1c8",
"url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_mac_hotspot_8u282b08.tar.gz", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_x64_mac_hotspot_8u292b10.tar.gz",
"version": "8.0.282" "version": "8.0.292"
} }
}, },
"openj9": { "openj9": {
"packageType": "jre", "packageType": "jre",
"vmType": "openj9", "vmType": "openj9",
"x86_64": { "x86_64": {
"build": "8", "build": "10",
"sha256": "884aa20b3aaed504b18ee21575c8da20838f80fb96036e78e70ff6ef613a5283", "sha256": "50cbc5ef48d0167d649d3ba2c2b8d71553541bffb98914418f4a26e0c5f69aca",
"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", "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_mac_openj9_8u292b10_openj9-0.26.0.tar.gz",
"version": "8.0.282" "version": "8.0.292"
} }
} }
} }

6
pkgs/development/compilers/jrsonnet/default.nix
View file

@ -2,20 +2,20 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "jrsonnet"; pname = "jrsonnet";
version = "0.3.8"; version = "0.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "CertainLach"; owner = "CertainLach";
repo = "jrsonnet"; repo = "jrsonnet";
sha256 = "sha256-u6P/j7j6S7iPQQh00YFtp2G9Kt4xdWJGsxbuBjvHHZ4="; sha256 = "sha256-+kvdbUw+lQ/BKJwcBzho1OWg/6y0YDRkLE+SAe8hLQQ=";
}; };
postInstall = '' postInstall = ''
ln -s $out/bin/jrsonnet $out/bin/jsonnet ln -s $out/bin/jrsonnet $out/bin/jsonnet
''; '';
cargoSha256 = "sha256-KGQ3n3BBgLCT3ITIM8p9AxNa62ek4GHymqoD0eQSVKQ="; cargoSha256 = "sha256-0soXOxp4Kr1DdmVERl8/sqwltqYLDwkVJZHFnYeHs+c=";
meta = { meta = {
description = "Purely-functional configuration language that helps you define JSON data"; description = "Purely-functional configuration language that helps you define JSON data";

4
pkgs/development/go-modules/generic/default.nix
View file

@ -214,7 +214,7 @@ let
runHook preCheck runHook preCheck
for pkg in $(getGoDirs test); do for pkg in $(getGoDirs test); do
buildGoDir test "$pkg" buildGoDir test $checkFlags "$pkg"
done done
runHook postCheck runHook postCheck
@ -236,6 +236,8 @@ let
passthru = passthru // { inherit go go-modules vendorSha256 ; }; passthru = passthru // { inherit go go-modules vendorSha256 ; };
enableParallelBuilding = enableParallelBuilding;
meta = { meta = {
# Add default meta information # Add default meta information
platforms = go.meta.platforms or lib.platforms.all; platforms = go.meta.platforms or lib.platforms.all;

2
pkgs/development/go-packages/generic/default.nix
View file

@ -210,7 +210,7 @@ let
runHook preCheck runHook preCheck
for pkg in $(getGoDirs test); do for pkg in $(getGoDirs test); do
buildGoDir test "$pkg" buildGoDir test $checkFlags "$pkg"
done done
runHook postCheck runHook postCheck

20
pkgs/development/libraries/eclib/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv { lib, stdenv
, fetchFromGitHub , fetchurl
, autoreconfHook , autoreconfHook
, pari , pari
, ntl , ntl
@ -14,16 +14,22 @@ assert withFlint -> flint != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "eclib"; pname = "eclib";
version = "20190909"; # upgrade might break the sage interface version = "20210625"; # upgrade might break the sage interface
# sage tests to run: # sage tests to run:
# src/sage/interfaces/mwrank.py # src/sage/interfaces/mwrank.py
# src/sage/libs/eclib # src/sage/libs/eclib
# ping @timokau for more info # ping @timokau for more info
src = fetchFromGitHub { src = fetchurl {
owner = "JohnCremona"; # all releases for this project appear on its GitHub releases page
repo = pname; # by definition! other distros sometimes update whenever they see
rev = "v${version}"; # a version bump in configure.ac or a new tag (and this might show
sha256 = "0y1vdi4120gdw56gg2dn3wh625yr9wpyk3wpbsd25w4lv83qq5da"; # up on repology). however, a version bump or a new tag may not
# represent a new release, and a new release might not be tagged.
#
# see https://github.com/JohnCremona/eclib/issues/64#issuecomment-789788561
# for upstream's explanation of the above
url = "https://github.com/JohnCremona/eclib/releases/download/${version}/eclib-${version}.tar.bz2";
sha256 = "sha256-fA3MPz/L+Q39sA8wxAYOUowlHRcgOd8VF4tpsBGI6BA=";
}; };
buildInputs = [ buildInputs = [
pari pari

5
pkgs/development/libraries/libnbd/default.nix
View file

@ -11,11 +11,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libnbd"; pname = "libnbd";
version = "1.7.7"; version = "1.9.2";
src = fetchurl { src = fetchurl {
url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-development/${pname}-${version}.tar.gz"; url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-development/${pname}-${version}.tar.gz";
hash = "sha256-fNeu1qx+EbKitv2I8nJAmGMF5jxN2RZGPR/LJYnOjG8="; hash = "sha256-UDLH5IMuKI6mAO/9VNmI8pCbxv94tCCQYRKZn2DBclg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
pkg-config pkg-config
perl perl
]; ];
buildInputs = [ buildInputs = [
fuse fuse
gnutls gnutls

14
pkgs/development/libraries/science/math/p4est-sc/default.nix
View file

@ -42,12 +42,18 @@ stdenv.mkDerivation {
++ lib.optional mpiSupport "--enable-mpi" ++ lib.optional mpiSupport "--enable-mpi"
; ;
makeFlags = [ "V=0" ];
checkFlags = lib.optional isOpenmpi "-j1";
dontDisableStatic = true; dontDisableStatic = true;
enableParallelBuilding = true; enableParallelBuilding = true;
doCheck = !stdenv.isAarch64 && stdenv.hostPlatform == stdenv.buildPlatform; makeFlags = [ "V=0" ];
preCheck = ''
export OMPI_MCA_rmaps_base_oversubscribe=1
export HYDRA_IFACE=lo
'';
# disallow Darwin checks due to prototype incompatibility of qsort_r
# to be fixed in a future version of the source code
doCheck = !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform;
meta = { meta = {
branch = "prev3-develop"; branch = "prev3-develop";

2
pkgs/development/libraries/science/math/p4est/default.nix
View file

@ -40,7 +40,7 @@ stdenv.mkDerivation {
++ lib.optional withMetis "--with-metis" ++ lib.optional withMetis "--with-metis"
; ;
inherit (p4est-sc) makeFlags checkFlags dontDisableStatic enableParallelBuilding doCheck; inherit (p4est-sc) makeFlags dontDisableStatic enableParallelBuilding preCheck doCheck;
meta = { meta = {
branch = "prev3-develop"; branch = "prev3-develop";

11
pkgs/development/python-modules/aiolifx-effects/default.nix
View file

@ -7,20 +7,21 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiolifx-effects"; pname = "aiolifx-effects";
version = "0.2.1"; version = "0.2.2";
disabled = !isPy3k;
src = fetchPypi { src = fetchPypi {
inherit version; inherit version;
pname = "aiolifx_effects"; pname = "aiolifx_effects";
sha256 = "cb4ac52deeb220783fc6449251cf40833fcffa28648270be64b1b3e83e06b503"; sha256 = "sha256-qkXJDYdJ+QyQWn/u7g6t4QJG1uSqle+a5RhTkPPsHKo=";
}; };
propagatedBuildInputs = [ aiolifx ];
# tests are not implemented # tests are not implemented
doCheck = false; doCheck = false;
disabled = !isPy3k; pythonImportsCheck = [ "aiolifx_effects" ];
propagatedBuildInputs = [ aiolifx ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/amelchio/aiolifx_effects"; homepage = "https://github.com/amelchio/aiolifx_effects";

4
pkgs/development/python-modules/aiopylgtv/default.nix
View file

@ -9,14 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiopylgtv"; pname = "aiopylgtv";
version = "0.4.0"; version = "0.4.1";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bendavid"; owner = "bendavid";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0x0xcnlz42arsp53zlq5wyv9pwif1in8j2pv48gh0pkdnz9s86b6"; sha256 = "sha256-NkWJGy5QUrhpbARoscrXy/ilCjAz01YxeVTH0I+IjNM=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/anyio/default.nix
View file

@ -19,7 +19,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "anyio"; pname = "anyio";
version = "3.2.0"; version = "3.2.1";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "agronholm"; owner = "agronholm";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-zQiSAQN7cp1s+8hDTvYaMkHUXV1ccNwIsl2IOztH7J8="; sha256 = "0fiqzsgr9c0yicsh1pwhyc6z4qyr2ng42dakyy4a81w9cff38had";
}; };
preBuild = '' preBuild = ''

11
pkgs/development/python-modules/asdf/default.nix
View file

@ -2,6 +2,8 @@
, astropy , astropy
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, importlib-resources
, jmespath
, jsonschema , jsonschema
, numpy , numpy
, packaging , packaging
@ -15,23 +17,26 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "asdf"; pname = "asdf";
version = "2.7.3"; version = "2.8.1";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
format = "pyproject"; format = "pyproject";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "11dyr295wn5m2pcynlwj7kgw9xr66msfvwn1m6a5vv13vzj19spp"; sha256 = "sha256-bp3fME3FTa5vcj7qUoUEGqvuI2uwSpI13zDcFgWvbJw=";
}; };
nativeBuildInputs = [ setuptools-scm ]; nativeBuildInputs = [ setuptools-scm ];
propagatedBuildInputs = [ propagatedBuildInputs = [
jmespath
jsonschema jsonschema
numpy numpy
packaging packaging
pyyaml pyyaml
semantic-version semantic-version
] ++ lib.optionals (pythonOlder "3.9") [
importlib-resources
]; ];
checkInputs = [ checkInputs = [
@ -50,6 +55,6 @@ buildPythonPackage rec {
description = "Python tools to handle ASDF files"; description = "Python tools to handle ASDF files";
homepage = "https://github.com/spacetelescope/asdf"; homepage = "https://github.com/spacetelescope/asdf";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = [ maintainers.costrouc ]; maintainers = with maintainers; [ costrouc ];
}; };
} }

6
pkgs/development/python-modules/ase/default.nix
View file

@ -12,12 +12,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ase"; pname = "ase";
version = "3.21.1"; version = "3.22.0";
disabled = isPy27; disabled = isPy27;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "78b01d88529d5f604e76bc64be102d48f058ca50faad72ac740d717545711c7b"; sha256 = "sha256-5gJZx7UIZ7HLgXyvk4/MHtODcCQT320uGv5+oH9lrO4=";
}; };
propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ]; propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ];
@ -29,6 +29,8 @@ buildPythonPackage rec {
# tests just hang most likely due to something with subprocesses and cli # tests just hang most likely due to something with subprocesses and cli
doCheck = false; doCheck = false;
pythonImportsCheck = [ "ase" ];
meta = with lib; { meta = with lib; {
description = "Atomic Simulation Environment"; description = "Atomic Simulation Environment";
homepage = "https://wiki.fysik.dtu.dk/ase/"; homepage = "https://wiki.fysik.dtu.dk/ase/";

15
pkgs/development/python-modules/asteval/default.nix
View file

@ -3,21 +3,30 @@
, fetchFromGitHub , fetchFromGitHub
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
, setuptools-scm
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "asteval"; pname = "asteval";
version = "0.9.23"; version = "0.9.25";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "newville"; owner = "newville";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-9Zxb2EzB6nxDQHdlryFiwyNW+76VvysLUB78bXKzfv0="; sha256 = "sha256-Jy+4NifItCGI1Jj25VakwoJcrpZw0Ng4cArf2M31WGs=";
}; };
checkInputs = [ pytestCheckHook ]; SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools-scm
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "asteval" ]; pythonImportsCheck = [ "asteval" ];

71
pkgs/development/python-modules/asyncssh/default.nix
View file

@ -1,18 +1,49 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder { lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, cryptography , cryptography
, bcrypt, gssapi, libnacl, libsodium, nettle, pyopenssl , bcrypt
, openssl, openssh, pytestCheckHook }: , gssapi
, fido2
, libnacl
, libsodium
, nettle
, python-pkcs11
, pyopenssl
, openssl
, openssh
, pytestCheckHook
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "asyncssh"; pname = "asyncssh";
version = "2.6.0"; version = "2.7.0";
disabled = pythonOlder "3.4"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "20f0ef553a1e64a7d38db86ba3a2f3907e72f1e81f3dfec5edb191383783c7d1"; sha256 = "sha256-GFAT2OZ3R8PA8BtyQWuL14QX2h30jHH3baU8YH71QbY=";
}; };
propagatedBuildInputs = [
bcrypt
cryptography
fido2
gssapi
libnacl
libsodium
nettle
python-pkcs11
pyopenssl
];
checkInputs = [
openssh
openssl
pytestCheckHook
];
patches = [ patches = [
# Reverts https://github.com/ronf/asyncssh/commit/4b3dec994b3aa821dba4db507030b569c3a32730 # Reverts https://github.com/ronf/asyncssh/commit/4b3dec994b3aa821dba4db507030b569c3a32730
# #
@ -23,32 +54,16 @@ buildPythonPackage rec {
./fix-sftp-chmod-test-nixos.patch ./fix-sftp-chmod-test-nixos.patch
]; ];
# Disables windows specific test (specifically the GSSAPI wrapper for Windows) disabledTestPaths = [
postPatch = '' # Disables windows specific test (specifically the GSSAPI wrapper for Windows)
rm tests/sspi_stub.py "tests/sspi_stub.py"
'';
propagatedBuildInputs = [
bcrypt
cryptography
gssapi
libnacl
libsodium
nettle
pyopenssl
]; ];
checkInputs = [ pythonImportsCheck = [ "asyncssh" ];
openssh
openssl
pytestCheckHook
];
disabledTests = [ "test_expired_root" "test_confirm" ];
meta = with lib; { meta = with lib; {
description = "Provides an asynchronous client and server implementation of the SSHv2 protocol on top of the Python asyncio framework"; description = "Asynchronous SSHv2 Python client and server library";
homepage = "https://asyncssh.readthedocs.io/en/latest"; homepage = "https://asyncssh.readthedocs.io/";
license = licenses.epl20; license = licenses.epl20;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
}; };

4
pkgs/development/python-modules/bleak/default.nix
View file

@ -4,13 +4,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "bleak"; pname = "bleak";
version = "0.11.0"; version = "0.12.0";
disabled = !isPy3k; disabled = !isPy3k;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1zs5lz3r17a2xn19i4na132iccyjsl9navj0d3v7gks7hlcad5kp"; sha256 = "sha256-pNHz24YjB6FB9ZLC3LoXS+2qzhforflNXzG6OWFqCvk=";
}; };
postPatch = '' postPatch = ''

25
pkgs/development/python-modules/bt-proximity/default.nix
View file

@ -1,19 +1,22 @@
{ lib, buildPythonPackage, fetchFromGitHub { lib
, pybluez }: , buildPythonPackage
, fetchPypi
, pybluez
}:
buildPythonPackage { buildPythonPackage rec {
pname = "bt-proximity"; pname = "bt-proximity";
version = "0.2"; version = "0.2.1";
# pypi only has a pre-compiled wheel and no sources src = fetchPypi {
src = fetchFromGitHub { pname = "bt_proximity";
owner = "FrederikBolding"; inherit version;
repo = "bluetooth-proximity"; sha256 = "0xlif91vblbz065531yjf8nmlcahrl4q5pz52bc1jmzz7iv9hpgq";
rev = "463bade8a9080b47f09bf4a47830b31c69c5dffd";
sha256 = "0anfh90cj3c2g7zqrjvq0d6dzpb4hjl6gk8zw0r349j2zw9i4h7y";
}; };
propagatedBuildInputs = [ pybluez ]; propagatedBuildInputs = [
pybluez
];
# there are no tests # there are no tests
doCheck = false; doCheck = false;

34
pkgs/development/python-modules/certifi/python2.nix Normal file
View file

@ -0,0 +1,34 @@
{ lib
, fetchPypi
, buildPythonPackage
, python3
}:
let
inherit (python3.pkgs) certifi;
in buildPythonPackage rec {
pname = "certifi";
version = "2019.11.28";
src = fetchPypi {
inherit pname version;
sha256 = "25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f";
};
postPatch = ''
cp ${certifi.src}/certifi/cacert.pem certifi/cacert.pem
'';
pythonImportsCheck = [ "certifi" ];
# no tests implemented
doCheck = false;
meta = with lib; {
homepage = "https://certifi.io/";
description = "Python package for providing Mozilla's CA Bundle";
license = licenses.isc;
maintainers = with maintainers; [ ]; # NixOps team
};
}

6
pkgs/development/python-modules/clvm-rs/default.nix
View file

@ -9,20 +9,20 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "clvm_rs"; pname = "clvm_rs";
version = "0.1.7"; version = "0.1.8";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Chia-Network"; owner = "Chia-Network";
repo = "clvm_rs"; repo = "clvm_rs";
rev = version; rev = version;
sha256 = "sha256-ves23q1uQ3lexwK9l1xGRss05jYObJDi/aY9Yvp4aPU="; sha256 = "sha256-YQfcVF+/eEgSLhq0EIFjMlVUT/4w2S5C1/rbkNpKszo=";
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit src; inherit src;
name = "${pname}-${version}"; name = "${pname}-${version}";
hash = "sha256-3kPzM2EX61ZvU6VKXY1OG/ic+9FU3Et4RuKp+3QYzSo="; sha256 = "000vkyqlbq35fg6k4c05qh52iw8m4xbzyh94y038zr9p0yjlr019";
}; };
format = "pyproject"; format = "pyproject";

4
pkgs/development/python-modules/clvm/default.nix
View file

@ -9,14 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "clvm"; pname = "clvm";
version = "0.9.6"; version = "0.9.7";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Chia-Network"; owner = "Chia-Network";
repo = "clvm"; repo = "clvm";
rev = version; rev = version;
sha256 = "sha256-XBQEilDFhx0kT9bEMD4jX+SDk3cAC1BUCWhbtpgrLcA="; sha256 = "sha256-kTmuiy0IbTGjDokZjxp3p8lr/0uVxG/0pRN2hETLBtA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

31
pkgs/development/python-modules/coloredlogs/default.nix
View file

@ -5,14 +5,14 @@
, humanfriendly , humanfriendly
, verboselogs , verboselogs
, capturer , capturer
, pytest , pytestCheckHook
, mock , mock
, util-linux , util-linux
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "coloredlogs"; pname = "coloredlogs";
version = "15.0"; version = "15.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xolox"; owner = "xolox";
@ -21,19 +21,34 @@ buildPythonPackage rec {
sha256 = "sha256-C1Eo+XrrL3bwhT49KyOE6xjbAHJxn9Qy4s1RR5ERVtA="; sha256 = "sha256-C1Eo+XrrL3bwhT49KyOE6xjbAHJxn9Qy4s1RR5ERVtA=";
}; };
propagatedBuildInputs = [
humanfriendly
];
checkInputs = [
pytestCheckHook
mock
util-linux
verboselogs
capturer
];
# capturer is broken on darwin / py38, so we skip the test until a fix for # capturer is broken on darwin / py38, so we skip the test until a fix for
# https://github.com/xolox/python-capturer/issues/10 is released. # https://github.com/xolox/python-capturer/issues/10 is released.
doCheck = !stdenv.isDarwin; doCheck = !stdenv.isDarwin;
checkPhase = ''
PATH=$PATH:$out/bin pytest . -k "not test_plain_text_output_format \ preCheck = ''
and not test_auto_install" # Required for the CLI test
PATH=$PATH:$out/bin
''; '';
checkInputs = [ pytest mock util-linux verboselogs capturer ];
disabledTests = [
"test_plain_text_output_format"
"test_auto_install"
];
pythonImportsCheck = [ "coloredlogs" ]; pythonImportsCheck = [ "coloredlogs" ];
propagatedBuildInputs = [ humanfriendly ];
meta = with lib; { meta = with lib; {
description = "Colored stream handler for Python's logging module"; description = "Colored stream handler for Python's logging module";
homepage = "https://github.com/xolox/python-coloredlogs"; homepage = "https://github.com/xolox/python-coloredlogs";

4
pkgs/development/python-modules/croniter/default.nix
View file

@ -10,11 +10,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "croniter"; pname = "croniter";
version = "1.0.13"; version = "1.0.15";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-V/Nt9PWhwxu/ULv/o1UWEsGfYVarHoji5CNCzLufm5o="; sha256 = "06c2smrjskd9di8lcpymcxmygncxr14932qjhslc37yyaafzq3d7";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/datasets/default.nix
View file

@ -16,13 +16,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "datasets"; pname = "datasets";
version = "1.4.1"; version = "1.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "huggingface"; owner = "huggingface";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-is8TS84varARWyfeDTbQH0pcYFTk0PcEyK183emB4GE="; sha256 = "sha256-is8TS84varARWyfeDTbQH0pcYFTk0PcEyK183emB4GE=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

37
pkgs/development/python-modules/datrie/default.nix
View file

@ -1,36 +1,39 @@
{ lib, buildPythonPackage, fetchPypi, fetchpatch { lib
, cython, pytest, pytestrunner, hypothesis }: , buildPythonPackage
, fetchPypi
, cython
, pytestCheckHook
, hypothesis
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "datrie"; pname = "datrie";
version = "0.7.1"; version = "0.8.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "08r0if7dry2q7p34gf7ffyrlnf4bdvnprxgydlfxgfnvq8f3f4bs"; sha256 = "sha256-UlsI9jjVz2EV32zNgY5aASmM0jCy2skcj/LmSZ0Ydl0=";
}; };
patches = [ nativeBuildInputs = [
# fix tests against recent hypothesis cython
(fetchpatch {
url = "https://github.com/pytries/datrie/commit/9b24b4c02783cdb703ac3f6c6d7d881db93166e0.diff";
sha256 = "1ql7jcf57q3x3fcbddl26y9kmnbnj2dv6ga8mwq94l4a3213j2iy";
})
]; ];
nativeBuildInputs = [ cython ]; buildInputs = [
buildInputs = [ pytest pytestrunner hypothesis ]; hypothesis
pytestCheckHook
];
# recompile pxd and pyx for python37 postPatch = ''
# https://github.com/pytries/datrie/issues/52 substituteInPlace setup.py --replace '"pytest-runner", ' ""
preBuild = ''
./update_c.sh
''; '';
pythonImportsCheck = [ "datrie" ];
meta = with lib; { meta = with lib; {
description = "Super-fast, efficiently stored Trie for Python"; description = "Super-fast, efficiently stored Trie for Python";
homepage = "https://github.com/kmike/datrie"; homepage = "https://github.com/kmike/datrie";
license = licenses.lgpl2; license = licenses.lgpl21Plus;
maintainers = with maintainers; [ lewo ]; maintainers = with maintainers; [ lewo ];
}; };
} }

21
pkgs/development/python-modules/diofant/default.nix
View file

@ -1,39 +1,42 @@
{ lib { lib
, isPy3k
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, pytestrunner , gmpy2
, setuptools-scm
, isort , isort
, mpmath , mpmath
, strategies , numpy
, pythonOlder
, scipy
, setuptools-scm
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "diofant"; pname = "diofant";
version = "0.10.0"; version = "0.12.0";
disabled = pythonOlder "3.9";
src = fetchPypi { src = fetchPypi {
inherit version; inherit version;
pname = "Diofant"; pname = "Diofant";
sha256 = "0qjg0mmz2cqxryr610mppx3virf1gslzrsk24304502588z53v8w"; sha256 = "sha256-G0CTSoDSduiWxlrk5XjnX5ldNZ9f7yxaJeUPO3ezJgo=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
isort isort
pytestrunner
setuptools-scm setuptools-scm
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
gmpy2
mpmath mpmath
strategies numpy
scipy
]; ];
# tests take ~1h # tests take ~1h
doCheck = false; doCheck = false;
disabled = !isPy3k; pythonImportsCheck = [ "diofant" ];
meta = with lib; { meta = with lib; {
description = "A Python CAS library"; description = "A Python CAS library";

32
pkgs/development/python-modules/dugong/default.nix
View file

@ -1,14 +1,32 @@
{ buildPythonPackage, fetchPypi, pythonOlder }: { lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, pytestCheckHook
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "dugong"; pname = "dugong";
version = "3.7.5"; version = "3.8.1";
disabled = pythonOlder "3.3";
disabled = pythonOlder "3.3"; # Library does not support versions older than 3.3 src = fetchFromGitHub {
owner = "python-dugong";
repo = "python-dugong";
rev = "release-${version}";
sha256 = "1063c1779idc5nrjzfv5w1xqvyy3crapb2a2xll9y6xphxclnkjc";
};
src = fetchPypi { checkInputs = [
inherit pname version; pytestCheckHook
extension = "tar.bz2"; ];
sha256 = "10vjdp21m0gzm096lgl84z184s5l9iz69ppj6acgsc125037dl6h";
pythonImportsCheck = [ "dugong" ];
meta = with lib; {
description = "HTTP 1.1 client designed for REST-ful APIs";
homepage = "https://github.com/python-dugong/python-dugong/";
license = with licenses; [ psfl asl20 ];
maintainers = with maintainers; [ ];
}; };
} }

28
pkgs/development/python-modules/ephem/default.nix
View file

@ -1,26 +1,36 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k { lib
, glibcLocales, pytest }: , buildPythonPackage
, fetchPypi
, isPy3k
, glibcLocales
, pytest
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "ephem"; pname = "ephem";
version = "3.7.7.1"; version = "4.0.0.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "36b51a8dc7cfdeb456dd6b8ab811accab8341b2d562ee3c6f4c86f6d3dbb984e"; sha256 = "sha256-0D3nPr9qkWgdWX61tdQ7z28MZ+KSu6L5qXRzS08VdX4=";
}; };
patchFlags = [ "-p0" ]; checkInputs = [
checkInputs = [ pytest glibcLocales ]; glibcLocales
pytest
];
# JPLTest uses assets not distributed in package # JPLTest uses assets not distributed in package
checkPhase = '' checkPhase = ''
LC_ALL="en_US.UTF-8" py.test --pyargs ephem.tests -k "not JPLTest" LC_ALL="en_US.UTF-8" pytest --pyargs ephem.tests -k "not JPLTest"
''; '';
pythonImportsCheck = [ "ephem" ];
meta = with lib; { meta = with lib; {
description = "Compute positions of the planets and stars"; description = "Compute positions of the planets and stars";
homepage = "https://pypi.python.org/pypi/ephem/"; homepage = "https://github.com/brandon-rhodes/pyephem";
license = licenses.lgpl3; license = licenses.mit;
maintainers = with maintainers; [ chrisrosset ]; maintainers = with maintainers; [ chrisrosset ];
}; };
} }

12
pkgs/development/python-modules/ipfshttpclient/default.nix
View file

@ -20,15 +20,15 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ipfshttpclient"; pname = "ipfshttpclient";
version = "0.7.0"; version = "0.8.0a2";
format = "flit"; format = "flit";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ipfs-shipyard"; owner = "ipfs-shipyard";
repo = "py-ipfs-http-client"; repo = "py-ipfs-http-client";
rev = version; rev = version;
sha256 = "sha256-0lMoZo/9kZUXkaKvD9ZAZDQdGX7eNLzJVszZdlM/3Qs="; sha256 = "sha256-OmC67pN2BbuGwM43xNDKlsLhwVeUbpvfOazyIDvoMEA=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -51,11 +51,7 @@ buildPythonPackage rec {
]; ];
postPatch = '' postPatch = ''
# Remove when the package supports the latest IPFS version by default # This can be removed for the 0.8.0 release
substituteInPlace ipfshttpclient/client/__init__.py \
--replace 'VERSION_MAXIMUM = "0.8.0"' \
'VERSION_MAXIMUM = "0.9.0"'
# Use pytest-order instead of pytest-ordering since the latter is unmaintained and broken # Use pytest-order instead of pytest-ordering since the latter is unmaintained and broken
substituteInPlace test/run-tests.py \ substituteInPlace test/run-tests.py \
--replace 'pytest_ordering' 'pytest_order' --replace 'pytest_ordering' 'pytest_order'

8
pkgs/development/python-modules/md-toc/default.nix
View file

@ -8,14 +8,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "md-toc"; pname = "md-toc";
version = "7.2.0"; version = "8.0.0";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "frnmst"; owner = "frnmst";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1v74iddfk5d6170frg89vzrkz9xrycl1f50g59imc7x7g50i6c2x"; sha256 = "sha256-w5/oIeA9POth8bMszPH53RK1FM9PhmPdn4w9wxlqQ+g=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -26,10 +26,6 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
postPatch = ''
substituteInPlace setup.py --replace "fpyutils>=1.2,<1.3" "fpyutils>=1.2"
'';
pytestFlagsArray = [ "md_toc/tests/*.py" ]; pytestFlagsArray = [ "md_toc/tests/*.py" ];
pythonImportsCheck = [ "md_toc" ]; pythonImportsCheck = [ "md_toc" ];

6
pkgs/development/python-modules/millheater/default.nix
View file

@ -2,25 +2,27 @@
, aiohttp , aiohttp
, async-timeout , async-timeout
, buildPythonPackage , buildPythonPackage
, cryptography
, fetchFromGitHub , fetchFromGitHub
, pythonOlder , pythonOlder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "millheater"; pname = "millheater";
version = "0.4.2"; version = "0.5.0";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Danielhiversen"; owner = "Danielhiversen";
repo = "pymill"; repo = "pymill";
rev = version; rev = version;
sha256 = "sha256-B9/nxlPHAPZzbOMQj81CxTEjI03JQxfH8F8vy1E4HIQ="; sha256 = "sha256-uMvCpXz+amb5mR9ebkAit21UFYpsTkjkZRXtmcvWt8k=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
aiohttp aiohttp
async-timeout async-timeout
cryptography
]; ];
# Project has no tests # Project has no tests

4
pkgs/development/python-modules/pyatmo/default.nix
View file

@ -15,14 +15,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyatmo"; pname = "pyatmo";
version = "5.1.0"; version = "5.2.0";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jabesq"; owner = "jabesq";
repo = "pyatmo"; repo = "pyatmo";
rev = "v${version}"; rev = "v${version}";
sha256 = "0szk3wjcrllzvpix66iq3li54pw0c1knlx8wn1z9kqhkrb8r200x"; sha256 = "sha256-P9c9tm2RcF/4r0OYBoAQxQbMBaFAsaHg/stg9rrYHNM=";
}; };
postPatch = '' postPatch = ''

6
pkgs/development/python-modules/pydaikin/default.nix
View file

@ -12,14 +12,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pydaikin"; pname = "pydaikin";
version = "2.4.3"; version = "2.4.4";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromBitbucket { src = fetchFromBitbucket {
owner = "mustang51"; owner = "mustang51";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0i013ma2fs6an3izak6zbs9lbr4l7b5x54d0xagw6gqf5n8dsclq"; sha256 = "sha256-G7SShq2zjd9KGM7t1KsAMehqm2onB5cYdcOO3k8Sb30=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -28,7 +28,7 @@ buildPythonPackage rec {
urllib3 urllib3
]; ];
# while they have tests, they do not run them in their CI and they fail as of 2.4.3 # while they have tests, they do not run them in their CI and they fail as of 2.4.4
# AttributeError: 'DaikinBRP069' object has no attribute 'last_hour_cool_energy_consumption' # AttributeError: 'DaikinBRP069' object has no attribute 'last_hour_cool_energy_consumption'
doCheck = false; doCheck = false;

44
pkgs/development/python-modules/python-pkcs11/default.nix Normal file
View file

@ -0,0 +1,44 @@
{ lib
, asn1crypto
, buildPythonPackage
, cached-property
, cython
, fetchFromGitHub
, setuptools-scm
}:
buildPythonPackage rec {
pname = "python-pkcs11";
version = "0.7.0";
src = fetchFromGitHub {
owner = "danni";
repo = pname;
rev = "v${version}";
sha256 = "0kncbipfpsb7m7mhv5s5b9wk604h1j08i2j26fn90pklgqll0xhv";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
cython
setuptools-scm
];
propagatedBuildInputs = [
cached-property
asn1crypto
];
# Test require additional setup
doCheck = false;
pythonImportsCheck = [ "pkcs11" ];
meta = with lib; {
description = "PKCS#11/Cryptoki support for Python";
homepage = "https://github.com/danni/python-pkcs11";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/sacn/default.nix
View file

@ -6,12 +6,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "sacn"; pname = "sacn";
version = "1.6.4"; version = "1.7.0";
disabled = isPy27; disabled = isPy27;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1abkalzpy8bj2hpx563bxii5h0gv9v89f0yp9clc1l76amyf6dj2"; sha256 = "136gw09av7r2y02q7aam4chhivpbwkdskwwavrl5v0zn34y0axwp";
}; };
# no tests # no tests

10
pkgs/development/python-modules/sunpy/default.nix
View file

@ -31,12 +31,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "sunpy"; pname = "sunpy";
version = "3.0.0"; version = "3.0.1";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-N/DAvnO+S9E4tndEWpiG84P3FCFwxYNdGFxbxUVsTx8="; sha256 = "sha256-WpqkCAwDYb6L+W4VTC/1auGVbblnNYwBxbk+tZbAiBw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -75,11 +75,13 @@ buildPythonPackage rec {
# darwin has write permission issues # darwin has write permission issues
doCheck = stdenv.isLinux; doCheck = stdenv.isLinux;
# ignore documentation tests # ignore documentation tests and ignore tests with schema issues
checkPhase = '' checkPhase = ''
PY_IGNORE_IMPORTMISMATCH=1 HOME=$(mktemp -d) pytest sunpy -k 'not rst' \ PY_IGNORE_IMPORTMISMATCH=1 HOME=$(mktemp -d) pytest sunpy -k 'not rst' \
--deselect=sunpy/tests/tests/test_self_test.py::test_main_nonexisting_module \ --deselect=sunpy/tests/tests/test_self_test.py::test_main_nonexisting_module \
--deselect=sunpy/tests/tests/test_self_test.py::test_main_stdlib_module --deselect=sunpy/tests/tests/test_self_test.py::test_main_stdlib_module \
--ignore=sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/heliocentric-1.0.0.yaml \
--ignore=sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/helioprojective-1.0.0.yaml
''; '';
meta = with lib; { meta = with lib; {

4
pkgs/development/python-modules/xknx/default.nix
View file

@ -11,14 +11,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "xknx"; pname = "xknx";
version = "0.18.7"; version = "0.18.8";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "XKNX"; owner = "XKNX";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "17w6a4ci4w6ggxpa99197f84awd116ygzd3fa5cvn1a7221dvdj4"; sha256 = "sha256-Y+SHZd/E72eR7gANqHHutZt1a4G4R1oHC8uV0hpJ/J0=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

6
pkgs/development/tools/build-managers/gradle/default.nix
View file

@ -64,9 +64,9 @@ in rec {
gradle_latest = gradle_7; gradle_latest = gradle_7;
gradle_7 = gradleGen (gradleSpec { gradle_7 = gradleGen (gradleSpec {
version = "7.0"; version = "7.1";
nativeVersion = "0.22-milestone-11"; nativeVersion = "0.22-milestone-16";
sha256 = "01f3bjn8pbpni8kmxvx1dpwpf4zz04vj7cpm6025n0k188c8k2zb"; sha256 = "0yyqksq3zza7r9ls389ha81l3s768j7dfdqiwk3846qy4wcyxsrd";
}); });
gradle_6_8 = gradleGen (gradleSpec { gradle_6_8 = gradleGen (gradleSpec {

30
pkgs/development/tools/dprint/default.nix Normal file
View file

@ -0,0 +1,30 @@
{ lib, fetchCrate, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "dprint";
version = "0.15.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-1DUGp+HiiY03fyZ+b8hNUBIfuQV5Z/gEcOxc/vG3YiA=";
};
cargoSha256 = "sha256-twFXA8A+vP1n6IFJO78fKNs+FC2ui46rj1JmJ/eq3wc=";
# Tests fail because they expect a test WASM plugin. Tests already run for
# every commit upstream on GitHub Actions
doCheck = false;
meta = with lib; {
description = "Code formatting platform written in Rust";
longDescription = ''
dprint is a pluggable and configurable code formatting platform written in Rust.
It offers multiple WASM plugins to support various languages. It's written in
Rust, so it’s small, fast, and portable.
'';
changelog = "https://github.com/dprint/dprint/releases/tag/${version}";
homepage = "https://dprint.dev";
license = licenses.mit;
maintainers = with maintainers; [ khushraj ];
};
}

50
pkgs/development/tools/elkhound/default.nix Normal file
View file

@ -0,0 +1,50 @@
{ stdenv
, lib
, fetchFromGitHub
, bison
, cmake
, flex
, perl
}:
stdenv.mkDerivation rec {
pname = "elkhound";
version = "unstable-2020-04-13";
src = fetchFromGitHub {
owner = "WeiDUorg";
repo = pname;
rev = "a7eb4bb2151c00cc080613a770d37560f62a285c";
sha256 = "sha256-Y96OFpBNrD3vrKoEZ4KdJuI1Q4RmYANsu7H3ZzfaA6g=";
};
postPatch = ''
patchShebangs scripts
'';
sourceRoot = "source/src";
nativeBuildInputs = [ bison cmake flex perl ];
installPhase = ''
runHook preInstall
install -Dm555 -t $out/bin ast/astgen elkhound/elkhound
for d in ast elkhound smbase; do
install -Dm444 -t $out/lib $d/*.a
install -Dm444 -t $out/include/$d $src/src/$d/*.h
done
install -Dm444 -t $out/share/doc/${pname} $src/src/elkhound/*.txt
runHook postInstall
'';
meta = with lib; {
description = "A parser generator which emits GLR parsers, either in OCaml or C++";
homepage = "https://scottmcpeak.com/elkhound/";
license = licenses.bsd3;
maintainers = with maintainers; [ peterhoeg ];
# possibly works on Darwin
platforms = platforms.linux;
};
}

4
pkgs/development/tools/go-task/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "go-task"; pname = "go-task";
version = "3.4.3"; version = "3.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = "task"; repo = "task";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-hI6x3DOB7pP+umnEFqL0sIx+6qN74sooLdkR2pC74D8="; sha256 = "sha256-oXr98guqEvE/rpRJF5NMjQYZtzbrh1F/neXYbLaCGUg=";
}; };
vendorSha256 = "sha256-bsVzV2M31BA7X6aq8na7v56uGYgne4OwR5kz/utmQHI="; vendorSha256 = "sha256-bsVzV2M31BA7X6aq8na7v56uGYgne4OwR5kz/utmQHI=";

10
pkgs/development/tools/misc/terraform-ls/default.nix
View file

@ -2,19 +2,17 @@
buildGoModule rec { buildGoModule rec {
pname = "terraform-ls"; pname = "terraform-ls";
version = "0.18.1"; version = "0.18.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hashicorp"; owner = "hashicorp";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-68Hs9kwv7GTGnYtoJh61ubaggPKbxFwz7qDwYaJ74c8="; sha256 = "sha256-d/dn77pV9qxzAm6NVOM5KhFxYi2/xEK02zMl2TTB5rA=";
}; };
vendorSha256 = "sha256-NgOpnCe0uGQVDVKYUIULqPTfvfkDtxIUQiCVwiE7nuc="; vendorSha256 = "sha256-0PcMxotUEys+jGDFEEz6owbtTGAac+RwoBWEHP5ifKQ=";
preBuild = '' ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ];
buildFlagsArray+=("-ldflags" "-s -w -X main.version=v${version} -X main.prerelease=")
'';
preCheck = '' preCheck = ''
# Remove tests that requires networking # Remove tests that requires networking

8
pkgs/development/tools/vala-language-server/default.nix
View file

@ -16,13 +16,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "vala-language-server"; pname = "vala-language-server";
version = "0.48.2"; version = "0.48.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "benwaffle"; owner = "Prince781";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-vtb2l4su+zuwGbS9F+Sv0tDInQMH4Uw6GjT+s7fHIio="; sha256 = "sha256-MhVwK4RtEAJcwcJe71ganCaXQHa9jzxyknzc9kJi274=";
}; };
passthru = { passthru = {
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Code Intelligence for Vala & Genie"; description = "Code Intelligence for Vala & Genie";
homepage = "https://github.com/benwaffle/vala-language-server"; homepage = "https://github.com/Prince781/vala-language-server";
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
maintainers = with maintainers; [ andreasfelix ]; maintainers = with maintainers; [ andreasfelix ];
platforms = platforms.linux; platforms = platforms.linux;

23
pkgs/games/cataclysm-dda/common.nix
View file

@ -13,17 +13,15 @@ let
tilesDeps = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf freetype ] tilesDeps = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf freetype ]
++ optionals stdenv.isDarwin [ Cocoa ]; ++ optionals stdenv.isDarwin [ Cocoa ];
installXDGAppLauncher = '' patchDesktopFile = ''
launcher="$out/share/applications/cataclysm-dda.desktop" substituteInPlace $out/share/applications/org.cataclysmdda.CataclysmDDA.desktop \
install -D -m 444 data/xdg/*cataclysm-dda.desktop -T "$launcher" --replace "Exec=cataclysm-tiles" "Exec=$out/bin/cataclysm-tiles"
sed -i "$launcher" -e "s,\(Exec=\)\(cataclysm-tiles\),\1$out/bin/\2,"
install -D -m 444 data/xdg/cataclysm-dda.svg -t $out/share/icons/hicolor/scalable/apps
''; '';
installMacOSAppLauncher = '' installMacOSAppLauncher = ''
app=$out/Applications/Cataclysm.app app=$out/Applications/Cataclysm.app
install -D -m 444 data/osx/Info.plist -t $app/Contents install -D -m 444 build-data/osx/Info.plist -t $app/Contents
install -D -m 444 data/osx/AppIcon.icns -t $app/Contents/Resources install -D -m 444 build-data/osx/AppIcon.icns -t $app/Contents/Resources
mkdir $app/Contents/MacOS mkdir $app/Contents/MacOS
launcher=$app/Contents/MacOS/Cataclysm.sh launcher=$app/Contents/MacOS/Cataclysm.sh
cat << EOF > $launcher cat << EOF > $launcher
@ -58,22 +56,19 @@ stdenv.mkDerivation {
] ++ optionals tiles [ ] ++ optionals tiles [
"TILES=1" "SOUND=1" "TILES=1" "SOUND=1"
] ++ optionals stdenv.isDarwin [ ] ++ optionals stdenv.isDarwin [
"NATIVE=osx" "CLANG=1" "NATIVE=osx"
"CLANG=1"
"OSX_MIN=${stdenv.targetPlatform.darwinMinVersion}"
]; ];
postInstall = optionalString tiles postInstall = optionalString tiles
( if !stdenv.isDarwin ( if !stdenv.isDarwin
then installXDGAppLauncher then patchDesktopFile
else installMacOSAppLauncher else installMacOSAppLauncher
); );
dontStrip = debug; dontStrip = debug;
# https://hydra.nixos.org/build/65193254
# src/weather_data.cpp:203:1: fatal error: opening dependency file obj/tiles/weather_data.d: No such file or directory
# make: *** [Makefile:687: obj/tiles/weather_data.o] Error 1
enableParallelBuilding = false;
passthru = { passthru = {
isTiles = tiles; isTiles = tiles;
isCurses = !tiles; isCurses = !tiles;

6
pkgs/games/cataclysm-dda/git.nix
View file

@ -2,9 +2,9 @@
, tiles ? true, Cocoa , tiles ? true, Cocoa
, debug ? false , debug ? false
, useXdgDir ? false , useXdgDir ? false
, version ? "2020-12-09" , version ? "2021-07-03"
, rev ? "cb02195d9fb5ba71f35a105be4104c3d8883065c" , rev ? "9017808252e1e149446c8f8bd7a6582ce0f95285"
, sha256 ? "108cs6vp99qmqqfnmczad0xjgcl82bypm5xszwnlfcswdsrfs4da" , sha256 ? "0qrvkbyg098jb9hv69sg5093b1vj8f4n75p73v01jnmyxlz3ax28"
}: }:
let let

4
pkgs/games/cataclysm-dda/stable.nix
View file

@ -10,13 +10,13 @@ let
}; };
self = common.overrideAttrs (common: rec { self = common.overrideAttrs (common: rec {
version = "0.E-3"; version = "0.F";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "CleverRaven"; owner = "CleverRaven";
repo = "Cataclysm-DDA"; repo = "Cataclysm-DDA";
rev = version; rev = version;
sha256 = "qhHtsm5cM0ct/7qXev0SiLInO2jqs2odxhWndLfRDIE="; sha256 = "1jid8lcl04y768b3psj1ifhx96lmd6fn1j2wzxhl4ic7ra66p2z3";
}; };
meta = common.meta // { meta = common.meta // {

30
pkgs/os-specific/linux/kernel/hardened/patches.json
View file

@ -1,32 +1,32 @@
{ {
"4.14": { "4.14": {
"extra": "-hardened1", "extra": "-hardened1",
"name": "linux-hardened-4.14.237-hardened1.patch", "name": "linux-hardened-4.14.238-hardened1.patch",
"sha256": "0iz7q29dazp11ii1f2kcffkpi14765w0ryrn6dsb8mlqcsw639lc", "sha256": "13wld3dm9ymwcsk5f06l64z9q49ff7rh7dqfqxxhkngdx2i1h566",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.237-hardened1/linux-hardened-4.14.237-hardened1.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.238-hardened1/linux-hardened-4.14.238-hardened1.patch"
}, },
"4.19": { "4.19": {
"extra": "-hardened1", "extra": "-hardened1",
"name": "linux-hardened-4.19.195-hardened1.patch", "name": "linux-hardened-4.19.196-hardened1.patch",
"sha256": "1h8v28kscaz4y2samww3vxpq4xvkbdvsnr0hybimn0ygwphshpqq", "sha256": "1wna5j1g1703gl4xw4x5z8dmc8gjqg879zq4xnmlyc0vryqjrxyq",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.195-hardened1/linux-hardened-4.19.195-hardened1.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.196-hardened1/linux-hardened-4.19.196-hardened1.patch"
}, },
"5.10": { "5.10": {
"extra": "-hardened1", "extra": "-hardened1",
"name": "linux-hardened-5.10.45-hardened1.patch", "name": "linux-hardened-5.10.47-hardened1.patch",
"sha256": "1382dflkv31b9apf3l0b5wcq8hyi69jm03139z3m0vbxi93pk44z", "sha256": "0qkwz3d83p2l5p7lhj3imfx8cr17smciw76xhj00zv171vc3q7xm",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.45-hardened1/linux-hardened-5.10.45-hardened1.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.47-hardened1/linux-hardened-5.10.47-hardened1.patch"
}, },
"5.12": { "5.12": {
"extra": "-hardened1", "extra": "-hardened1",
"name": "linux-hardened-5.12.12-hardened1.patch", "name": "linux-hardened-5.12.14-hardened1.patch",
"sha256": "10923kjxhfphsh1wr0zjj3lk16bxkq9ana4hyy8af7cn2k30k4iw", "sha256": "0c5zi03j5bjhr706wad1qf5kr4nv0s2bzkx4z5mr6wqgra5dg22v",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.12-hardened1/linux-hardened-5.12.12-hardened1.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.14-hardened1/linux-hardened-5.12.14-hardened1.patch"
}, },
"5.4": { "5.4": {
"extra": "-hardened1", "extra": "-hardened1",
"name": "linux-hardened-5.4.127-hardened1.patch", "name": "linux-hardened-5.4.129-hardened1.patch",
"sha256": "1qsz5cnm0ny138pbd9f7j5avvz69g51db7dgr1q4farrjml3nshy", "sha256": "0b16w4jm22mlhwfvbzbg8bw9z7hp13r1bl5g5rk42vmz07ahknga",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.127-hardened1/linux-hardened-5.4.127-hardened1.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.129-hardened1/linux-hardened-5.4.129-hardened1.patch"
} }
} }

4
pkgs/os-specific/linux/kernel/linux-4.14.nix
View file

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "4.14.237"; version = "4.14.238";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0kib9p61hhwjbr8zhir9aw86qik7k6bm95503n3k09ayyachajpq"; sha256 = "1phjgm1fhyfpm2h9b2bngcbh91v2qrxcm7vma86q7pdqrcbh1fih";
}; };
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ];

4
pkgs/os-specific/linux/kernel/linux-4.19.nix
View file

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "4.19.195"; version = "4.19.196";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "02rdy5mdmwxli0cin5n7ab492y9fs01hhqxrjq6b4idwv5baa42m"; sha256 = "0liapgaczv6lq7223wnq2cbwfb6w93iw14dv1xidcb3bnakm4h5f";
}; };
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ];

4
pkgs/os-specific/linux/kernel/linux-4.4.nix
View file

@ -1,13 +1,13 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec { buildLinux (args // rec {
version = "4.4.273"; version = "4.4.274";
extraMeta.branch = "4.4"; extraMeta.branch = "4.4";
extraMeta.broken = stdenv.isAarch64; extraMeta.broken = stdenv.isAarch64;
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1pd39cak0zhda3m9nvn9yxgd070wxvckaha5wl8pi7c8i6jfpclb"; sha256 = "1n4wawk8fi5s22177994vq9hzay49cackdabl9r1x8y2i9jcqmg4";
}; };
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ];

4
pkgs/os-specific/linux/kernel/linux-4.9.nix
View file

@ -1,13 +1,13 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec { buildLinux (args // rec {
version = "4.9.273"; version = "4.9.274";
extraMeta.branch = "4.9"; extraMeta.branch = "4.9";
extraMeta.broken = stdenv.isAarch64; extraMeta.broken = stdenv.isAarch64;
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0jjarv3xfkc21j1xhgch53w8wm6rq3xw1i03rjw9fv5i9k4x6qsw"; sha256 = "0xdi33f25lbpplx36cz7chdsn7a6xdjvwxgvnmvrw7b2y0g45m95";
}; };
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ];

4
pkgs/os-specific/linux/kernel/linux-5.10.nix
View file

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.10.45"; version = "5.10.47";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "01rmw5rnxyybr8sh0v9rgamrg71ign2nr7m0ilrq9704k6dj9dzj"; sha256 = "1ig1kb10729xyawm2zqzx8slpdbylgwms7b5vkhw3q6iwqpjmd9h";
}; };
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ];

4
pkgs/os-specific/linux/kernel/linux-5.12.nix
View file

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.12.12"; version = "5.12.14";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1a1ymbgkp8ngrkf7cfjrn56zb9qz1mm1j1pmd60g85ln7nyb4ai1"; sha256 = "1b3xnb62n53vm6larkvv2vzd9w7cjnqh8zh6jzq9lpcg12c3pjlh";
}; };
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ];

4
pkgs/os-specific/linux/kernel/linux-5.4.nix
View file

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.4.127"; version = "5.4.129";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1gr89x1ymxaslp9fqcchaa7939yvhxy67z3pgskmx6z2vrd9pgd0"; sha256 = "1ps64gx85lmbriq445hd2hcv4g4b1d1cwf4r3nd90x6i2cj4c9j4";
}; };
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ];

9
pkgs/os-specific/linux/kernel/patches.nix
View file

@ -102,13 +102,4 @@
name = "mac_nvme_t2"; name = "mac_nvme_t2";
patch = ./mac-nvme-t2.patch; patch = ./mac-nvme-t2.patch;
}; };
rtnetlink_fix_regression_in_bridge_vlan_configuration = rec {
name = "rtnetlink_fix_regression_in_bridge_vlan_configuration";
patch = fetchpatch {
name = name + ".patch";
url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=d2e381c4963663bca6f30c3b996fa4dbafe8fcb5";
sha256 = "0ragdi13yh5ypp9x49vrdjqx8ddh7sq7i1qjp8fyrbk3n0jdaac3";
};
};
} }

15
pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
View file

@ -1,19 +1,22 @@
{ lib, buildGoPackage, fetchFromGitHub }: { lib, buildGoModule, fetchFromGitHub }:
buildGoPackage rec { buildGoModule rec {
pname = "mysqld_exporter"; pname = "mysqld_exporter";
version = "0.12.1"; version = "0.13.0";
rev = "v${version}"; rev = "v${version}";
goPackagePath = "github.com/prometheus/mysqld_exporter";
src = fetchFromGitHub { src = fetchFromGitHub {
inherit rev; inherit rev;
owner = "prometheus"; owner = "prometheus";
repo = "mysqld_exporter"; repo = "mysqld_exporter";
sha256 = "0nzbfzx4dzs3cagdid1fqddrqimgr8x6r8gmmxglrss05c8srgs8"; sha256 = "05gb6p65a0ys356qnanwc40klz1izrib37rz5yzyg2ysvamlvmys";
}; };
vendorSha256 = "19785rfzlx8h0h8vmg0ghd40h3p4y6ikhgf8rd2qfj5f6qxfhrgv";
# skips tests with external dependencies, e.g. on mysqld
checkFlags = [ "-short" ];
meta = with lib; { meta = with lib; {
description = "Prometheus exporter for MySQL server metrics"; description = "Prometheus exporter for MySQL server metrics";
homepage = "https://github.com/prometheus/mysqld_exporter"; homepage = "https://github.com/prometheus/mysqld_exporter";

4
pkgs/stdenv/generic/make-derivation.nix
View file

@ -110,7 +110,9 @@ in rec {
++ depsTargetTarget ++ depsTargetTargetPropagated) == 0; ++ depsTargetTarget ++ depsTargetTargetPropagated) == 0;
dontAddHostSuffix = attrs ? outputHash && !noNonNativeDeps || !stdenv.hasCC; dontAddHostSuffix = attrs ? outputHash && !noNonNativeDeps || !stdenv.hasCC;
supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ]; supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ];
# Musl-based platforms will keep "pie", other platforms will not. # Musl-based platforms will keep "pie", other platforms will not.
# If you change this, make sure to update section `{#sec-hardening-in-nixpkgs}`
# in the nixpkgs manual to inform users about the defaults.
defaultHardeningFlags = if stdenv.hostPlatform.isMusl && defaultHardeningFlags = if stdenv.hostPlatform.isMusl &&
# Except when: # Except when:
# - static aarch64, where compilation works, but produces segfaulting dynamically linked binaries. # - static aarch64, where compilation works, but produces segfaulting dynamically linked binaries.

65
pkgs/tools/games/weidu/default.nix Normal file
View file

@ -0,0 +1,65 @@
{ stdenv
, lib
, fetchFromGitHub
, elkhound
, ocaml-ng
, perl
, which
}:
let
# 1. Needs ocaml >= 4.04 and <= 4.11
# 2. ocaml 4.10 defaults to safe (immutable) strings so we need a version with
# that disabled as weidu is strongly dependent on mutable strings
ocaml' = ocaml-ng.ocamlPackages_4_10.ocaml.overrideAttrs (old: {
configureFlags = old.configureFlags ++ [
# https://github.com/WeiDUorg/weidu/issues/197
"--disable-force-safe-string"
];
});
in
stdenv.mkDerivation rec {
pname = "weidu";
version = "247.00";
src = fetchFromGitHub {
owner = "WeiDUorg";
repo = pname;
rev = "v${version}";
sha256 = "sha256-vAIIYn0urQnnL82mdfwJtahrS3uWPFferm+0F13TKcw=";
};
postPatch = ''
substitute sample.Configuration Configuration \
--replace /usr/bin ${lib.makeBinPath [ ocaml' ]} \
--replace elkhound ${elkhound}/bin/elkhound
mkdir -p obj/{.depend,x86_LINUX}
'';
nativeBuildInputs = [ elkhound ocaml' perl which ];
buildFlags = [ "weidu" "weinstall" "tolower" ];
installPhase = ''
runHook preInstall
for b in tolower weidu weinstall; do
install -Dm555 $b.asm.exe $out/bin/$b
done
install -Dm444 -t $out/share/doc/weidu README* COPYING
runHook postInstall
'';
meta = with lib; {
description = "InfinityEngine Modding Engine";
homepage = "https://weidu.org";
license = licenses.gpl2Only;
maintainers = with maintainers; [ peterhoeg ];
# should work fine on both Darwin and Windows
platforms = platforms.linux;
};
}

4
pkgs/tools/misc/latex2html/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "latex2html"; pname = "latex2html";
version = "2021"; version = "2021.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-n7VbK/S9EkWxb4fbIXp3tIfX7N+9bvZ/odBylqTuzUU="; sha256 = "sha256-WxMB70TeN53S6PNYDUVZ7lBKw7DvKnJDiHek9/GUYcA=";
}; };
buildInputs = [ ghostscript netpbm perl ]; buildInputs = [ ghostscript netpbm perl ];

4
pkgs/tools/security/chkrootkit/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "chkrootkit"; pname = "chkrootkit";
version = "0.54"; version = "0.55";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.pangeia.com.br/pub/seg/pac/${pname}-${version}.tar.gz"; url = "ftp://ftp.pangeia.com.br/pub/seg/pac/${pname}-${version}.tar.gz";
sha256 = "01snj54hhgiqzs72hzabq6abcn46m1yckjx7503vcggm45lr4k0m"; sha256 = "sha256-qBwChuxEkxP5U3ASAqAOgbIE/Cz0PieFhaEcEqXgJYs=";
}; };
# TODO: a lazy work-around for linux build failure ... # TODO: a lazy work-around for linux build failure ...

4
pkgs/tools/security/sipvicious/default.nix
View file

@ -5,13 +5,13 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "sipvicious"; pname = "sipvicious";
version = "0.3.3"; version = "0.3.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "EnableSecurity"; owner = "EnableSecurity";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "17f6w7qh33zvlhqwf22y9y7skha0xjs46yk66q8xm4brsv4lfxxa"; sha256 = "sha256-O8/9Vz/u8BoF1dfGceOJdzPPYLfkdBp2DkwA5WQ3dgo=";
}; };
# Project has no tests # Project has no tests

4
pkgs/tools/system/stress-ng/default.nix
View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "stress-ng"; pname = "stress-ng";
version = "0.12.04"; version = "0.12.11";
src = fetchurl { src = fetchurl {
url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz";
sha256 = "sha256-tONL2o207TfjO3qGG8Bq13y70jTWMjbaLLWPAuPzIY4="; sha256 = "sha256-lxOTB1Mhwkw9V2ms+rtwWRHR9BHO1ZN7fP6lhSjBtOY=";
}; };
postPatch = '' postPatch = ''

15
pkgs/tools/text/mdcat/default.nix
View file

@ -1,4 +1,5 @@
{ lib, stdenv { lib
, stdenv
, fetchFromGitHub , fetchFromGitHub
, rustPlatform , rustPlatform
, pkg-config , pkg-config
@ -11,19 +12,20 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "mdcat"; pname = "mdcat";
version = "0.22.2"; version = "0.23.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lunaryorn"; owner = "lunaryorn";
repo = pname; repo = pname;
rev = "mdcat-${version}"; rev = "mdcat-${version}";
hash = "sha256-i36MYTMkbSuWxxlWUDsyYMay/4Mg7M5jEFhHM60UrkM="; hash = "sha256-bGXuYGQyrXa9gUEQfB7BF9K04z88r1UoM8R5gpL2nRM=";
}; };
nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ];
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; buildInputs = [ openssl ]
++ lib.optional stdenv.isDarwin Security;
cargoSha256 = "sha256-y9yg4EQDL+RcD6NI7n6W/Hi6Tw4Wr1Kf6hbcIuidIf4="; cargoSha256 = "sha256-hmv4LNk7NEYjT/5XXUpMd+xGS19KHOW+HIgsiFEWeig=";
checkInputs = [ ansi2html ]; checkInputs = [ ansi2html ];
# Skip tests that use the network and that include files. # Skip tests that use the network and that include files.
@ -32,6 +34,7 @@ rustPlatform.buildRustPackage rec {
"--skip magic::tests::detect_mimetype_of_magic_param_bytes_max_length" "--skip magic::tests::detect_mimetype_of_magic_param_bytes_max_length"
"--skip magic::tests::detect_mimetype_of_png_image" "--skip magic::tests::detect_mimetype_of_png_image"
"--skip magic::tests::detect_mimetype_of_svg_image" "--skip magic::tests::detect_mimetype_of_svg_image"
"--skip resources::tests::read_url_with_http_url_fails_when_size_limit_is_exceeded"
"--skip resources::tests::read_url_with_http_url_fails_when_status_404" "--skip resources::tests::read_url_with_http_url_fails_when_status_404"
"--skip resources::tests::read_url_with_http_url_returns_content_when_status_200" "--skip resources::tests::read_url_with_http_url_returns_content_when_status_200"
"--skip iterm2_tests_render_md_samples_images_md" "--skip iterm2_tests_render_md_samples_images_md"
@ -48,6 +51,6 @@ rustPlatform.buildRustPackage rec {
description = "cat for markdown"; description = "cat for markdown";
homepage = "https://github.com/lunaryorn/mdcat"; homepage = "https://github.com/lunaryorn/mdcat";
license = with licenses; [ asl20 ]; license = with licenses; [ asl20 ];
maintainers = with maintainers; [ davidtwco ]; maintainers = with maintainers; [ davidtwco SuperSandro2000 ];
}; };
} }

19
pkgs/top-level/all-packages.nix
View file

@ -873,6 +873,10 @@ in
libgamemode32 = pkgsi686Linux.gamemode.lib; libgamemode32 = pkgsi686Linux.gamemode.lib;
}; };
elkhound = callPackage ../development/tools/elkhound { };
weidu = callPackage ../tools/games/weidu { };
gfshare = callPackage ../tools/security/gfshare { }; gfshare = callPackage ../tools/security/gfshare { };
gobgp = callPackage ../tools/networking/gobgp { }; gobgp = callPackage ../tools/networking/gobgp { };
@ -2890,6 +2894,8 @@ in
jiten = callPackage ../applications/misc/jiten { }; jiten = callPackage ../applications/misc/jiten { };
kanjidraw = callPackage ../applications/misc/kanjidraw { };
jotta-cli = callPackage ../applications/misc/jotta-cli { }; jotta-cli = callPackage ../applications/misc/jotta-cli { };
joycond = callPackage ../os-specific/linux/joycond { }; joycond = callPackage ../os-specific/linux/joycond { };
@ -13300,6 +13306,8 @@ in
inherit (llvmPackages_11) llvm libclang; inherit (llvmPackages_11) llvm libclang;
}; };
dprint = callPackage ../development/tools/dprint { };
libcxx = llvmPackages.libcxx; libcxx = llvmPackages.libcxx;
libcxxabi = llvmPackages.libcxxabi; libcxxabi = llvmPackages.libcxxabi;
@ -20610,6 +20618,8 @@ in
jool-cli = callPackage ../os-specific/linux/jool/cli.nix { }; jool-cli = callPackage ../os-specific/linux/jool/cli.nix { };
juju = callPackage ../applications/networking/juju { };
jujuutils = callPackage ../os-specific/linux/jujuutils { }; jujuutils = callPackage ../os-specific/linux/jujuutils { };
kbd = callPackage ../os-specific/linux/kbd { }; kbd = callPackage ../os-specific/linux/kbd { };
@ -20760,7 +20770,6 @@ in
kernelPatches.bridge_stp_helper kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper kernelPatches.request_key_helper
kernelPatches.rtl8761b_support kernelPatches.rtl8761b_support
kernelPatches.rtnetlink_fix_regression_in_bridge_vlan_configuration
]; ];
}; };
@ -20775,7 +20784,6 @@ in
kernelPatches = [ kernelPatches = [
kernelPatches.bridge_stp_helper kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper kernelPatches.request_key_helper
kernelPatches.rtnetlink_fix_regression_in_bridge_vlan_configuration
]; ];
}; };
@ -20783,7 +20791,6 @@ in
kernelPatches = [ kernelPatches = [
kernelPatches.bridge_stp_helper kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper kernelPatches.request_key_helper
kernelPatches.rtnetlink_fix_regression_in_bridge_vlan_configuration
]; ];
}; };
@ -25090,6 +25097,8 @@ in
kile-wl = callPackage ../applications/misc/kile-wl { }; kile-wl = callPackage ../applications/misc/kile-wl { };
kiln = callPackage ../applications/misc/kiln { };
kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; kubernetes-helm = callPackage ../applications/networking/cluster/helm { };
wrapHelm = callPackage ../applications/networking/cluster/helm/wrapper.nix { }; wrapHelm = callPackage ../applications/networking/cluster/helm/wrapper.nix { };
@ -27250,6 +27259,10 @@ in
tonelib-gfx = callPackage ../applications/audio/tonelib-gfx { }; tonelib-gfx = callPackage ../applications/audio/tonelib-gfx { };
tonelib-jam = callPackage ../applications/audio/tonelib-jam { };
tonelib-zoom = callPackage ../applications/audio/tonelib-zoom { };
tony = libsForQt514.callPackage ../applications/audio/tony { }; tony = libsForQt514.callPackage ../applications/audio/tony { };
toot = callPackage ../applications/misc/toot { }; toot = callPackage ../applications/misc/toot { };

1
pkgs/top-level/python-aliases.nix
View file

@ -63,4 +63,5 @@ mapAliases ({
topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22
tvnamer = throw "python3Packages.tvnamer was moved to tvnamer"; # 2021-07-05 tvnamer = throw "python3Packages.tvnamer was moved to tvnamer"; # 2021-07-05
websocket_client = websocket-client; websocket_client = websocket-client;
bt_proximity = bt-proximity; # added 2021-07-02
}) })

4
pkgs/top-level/python-packages.nix
View file

@ -1220,7 +1220,7 @@ in {
btchip = callPackage ../development/python-modules/btchip { }; btchip = callPackage ../development/python-modules/btchip { };
bt_proximity = callPackage ../development/python-modules/bt-proximity { }; bt-proximity = callPackage ../development/python-modules/bt-proximity { };
BTrees = callPackage ../development/python-modules/btrees { }; BTrees = callPackage ../development/python-modules/btrees { };
@ -7065,6 +7065,8 @@ in {
python-pipedrive = callPackage ../development/python-modules/python-pipedrive { }; python-pipedrive = callPackage ../development/python-modules/python-pipedrive { };
python-pkcs11 = callPackage ../development/python-modules/python-pkcs11 { };
python-prctl = callPackage ../development/python-modules/python-prctl { }; python-prctl = callPackage ../development/python-modules/python-prctl { };
python-ptrace = callPackage ../development/python-modules/python-ptrace { }; python-ptrace = callPackage ../development/python-modules/python-ptrace { };

2
pkgs/top-level/python2-packages.nix
View file

@ -46,6 +46,8 @@ with self; with super; {
cdecimal = callPackage ../development/python-modules/cdecimal { }; cdecimal = callPackage ../development/python-modules/cdecimal { };
certifi = callPackage ../development/python-modules/certifi/python2.nix { };
chardet = callPackage ../development/python-modules/chardet/2.nix { }; chardet = callPackage ../development/python-modules/chardet/2.nix { };
cheetah = callPackage ../development/python-modules/cheetah { }; cheetah = callPackage ../development/python-modules/cheetah { };