gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot]
2023-07-03 00:15:12 +00:00
committed by GitHub
parent c244ddfaa1 60fa9e3f4f
commit 0f9bc0e775
195 changed files with 6685 additions and 1468 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/licenses.nix
+7
View File
@@ -650,6 +650,13 @@ in mkLicense lset) ({
free = true;
};
fairsource09 = {
fullName = "Fair Source License, version 0.9";
url = "https://fair.io/v0.9.txt";
free = false;
redistributable = true;
};
issl = {
fullName = "Intel Simplified Software License";
url = "https://software.intel.com/en-us/license/intel-simplified-software-license";
maintainers/maintainer-list.nix
+16
View File
@@ -10247,6 +10247,15 @@
githubId = 95194;
name = "Mauricio Scheffer";
};
mawis = {
email = "m@tthias.eu";
github = "mawis";
githubId = 2042030;
name = "Matthias Wimmer";
keys = [{
fingerprint = "CAEC A12D CE23 37A6 6DFD 17B0 7AC7 631D 70D6 C898";
}];
};
maxbrunet = {
email = "max@brnt.mx";
github = "maxbrunet";
@@ -15999,6 +16008,13 @@
githubId = 1755789;
name = "Robert Irelan";
};
tengkuizdihar = {
name = "Tengku Izdihar";
email = "tengkuizdihar@gmail.com";
matrix = "@tengkuizdihar:matrix.org";
github = "tengkuizdihar";
githubId = 22078730;
};
tennox = {
email = "tennox+nix@txlab.io";
github = "tennox";
nixos/doc/manual/release-notes/rl-2311.section.md
+3 -1
View File
@@ -6,7 +6,7 @@
## New Services {#sec-release-23.11-new-services}
- Create the first release note entry in this section!
- [MCHPRS](https://github.com/MCHPR/MCHPRS), a multithreaded Minecraft server built for redstone. Available as [services.mchprs](#opt-services.mchprs.enable).
- [acme-dns](https://github.com/joohoi/acme-dns), a limited DNS server to handle ACME DNS challenges easily and securely. Available as [services.acme-dns](#opt-services.acme-dns.enable).
@@ -82,6 +82,8 @@
- DocBook option documentation is no longer supported, all module documentation now uses markdown.
- `services.fail2ban.jails` can now be configured with attribute sets defining settings and filters instead of lines. The stringed options `daemonConfig` and `extraSettings` have respectively been replaced by `daemonSettings` and `jails.DEFAULT.settings` which use attribute sets.
- `services.nginx` gained a `defaultListen` option at server-level with support for PROXY protocol listeners, also `proxyProtocol` is now exposed in `services.nginx.virtualHosts.<name>.listen` option. It is now possible to run PROXY listeners and non-PROXY listeners at a server-level, see [#213510](https://github.com/NixOS/nixpkgs/pull/213510/) for more details.
- `services.prometheus.exporters` has a new exporter to monitor electrical power consumption based on PowercapRAPL sensor called [Scaphandre](https://github.com/hubblo-org/scaphandre), see [#239803](https://github.com/NixOS/nixpkgs/pull/239803) for more details.
nixos/modules/module-list.nix
+1
View File
@@ -476,6 +476,7 @@
./services/games/deliantra-server.nix
./services/games/factorio.nix
./services/games/freeciv.nix
./services/games/mchprs.nix
./services/games/minecraft-server.nix
./services/games/minetest-server.nix
./services/games/openarena.nix
nixos/modules/services/continuous-integration/jenkins/job-builder.nix
+11 -16
View File
@@ -9,25 +9,20 @@ let
in {
options = {
services.jenkins.jobBuilder = {
enable = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Whether or not to enable the Jenkins Job Builder (JJB) service. It
allows defining jobs for Jenkins in a declarative manner.
enable = mkEnableOption (mdDoc ''
the Jenkins Job Builder (JJB) service. It
allows defining jobs for Jenkins in a declarative manner.
Jobs managed through the Jenkins WebUI (or by other means) are left
unchanged.
Jobs managed through the Jenkins WebUI (or by other means) are left
unchanged.
Note that it really is declarative configuration; if you remove a
previously defined job, the corresponding job directory will be
deleted.
Note that it really is declarative configuration; if you remove a
previously defined job, the corresponding job directory will be
deleted.
Please see the Jenkins Job Builder documentation for more info:
[
http://docs.openstack.org/infra/jenkins-job-builder/](http://docs.openstack.org/infra/jenkins-job-builder/)
'';
};
Please see the Jenkins Job Builder documentation for more info:
<https://jenkins-job-builder.readthedocs.io/>
'');
accessUser = mkOption {
default = "admin";
nixos/modules/services/games/mchprs.nix
+341
View File
@@ -0,0 +1,341 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.mchprs;
settingsFormat = pkgs.formats.toml { };
whitelistFile = pkgs.writeText "whitelist.json"
(builtins.toJSON
(mapAttrsToList (n: v: { name = n; uuid = v; }) cfg.whitelist.list));
configToml =
(removeAttrs cfg.settings [ "address" "port" ]) //
{
bind_address = cfg.settings.address + ":" + toString cfg.settings.port;
whitelist = cfg.whitelist.enable;
};
configTomlFile = settingsFormat.generate "Config.toml" configToml;
in
{
options = {
services.mchprs = {
enable = mkEnableOption "MCHPRS";
declarativeSettings = mkOption {
type = types.bool;
default = false;
description = mdDoc ''
Whether to use a declarative configuration for MCHPRS.
'';
};
declarativeWhitelist = mkOption {
type = types.bool;
default = false;
description = mdDoc ''
Whether to use a declarative whitelist.
The options {option}`services.mchprs.whitelist.list`
will be applied if and only if set to `true`.
'';
};
dataDir = mkOption {
type = types.path;
default = "/var/lib/mchprs";
description = mdDoc ''
Directory to store MCHPRS database and other state/data files.
'';
};
openFirewall = mkOption {
type = types.bool;
default = false;
description = mdDoc ''
Whether to open ports in the firewall for the server.
Only has effect when
{option}`services.mchprs.declarativeSettings` is `true`.
'';
};
maxRuntime = mkOption {
type = types.str;
default = "infinity";
example = "7d";
description = mdDoc ''
Automatically restart the server after
{option}`services.mchprs.maxRuntime`.
The time span format is described here:
https://www.freedesktop.org/software/systemd/man/systemd.time.html#Parsing%20Time%20Spans.
If `null`, then the server is not restarted automatically.
'';
};
package = mkOption {
type = types.package;
default = pkgs.mchprs;
defaultText = literalExpression "pkgs.mchprs";
description = mdDoc "Version of MCHPRS to run.";
};
settings = mkOption {
type = types.submodule {
freeformType = settingsFormat.type;
options = {
port = mkOption {
type = types.port;
default = 25565;
description = mdDoc ''
Port for the server.
Only has effect when
{option}`services.mchprs.declarativeSettings` is `true`.
'';
};
address = mkOption {
type = types.str;
default = "0.0.0.0";
description = mdDoc ''
Address for the server.
Please use enclosing square brackets when using ipv6.
Only has effect when
{option}`services.mchprs.declarativeSettings` is `true`.
'';
};
motd = mkOption {
type = types.str;
default = "Minecraft High Performance Redstone Server";
description = mdDoc ''
Message of the day.
Only has effect when
{option}`services.mchprs.declarativeSettings` is `true`.
'';
};
chat_format = mkOption {
type = types.str;
default = "<{username}> {message}";
description = mdDoc ''
How to format chat message interpolating `username`
and `message` with curly braces.
Only has effect when
{option}`services.mchprs.declarativeSettings` is `true`.
'';
};
max_players = mkOption {
type = types.ints.positive;
default = 99999;
description = mdDoc ''
Maximum number of simultaneous players.
Only has effect when
{option}`services.mchprs.declarativeSettings` is `true`.
'';
};
view_distance = mkOption {
type = types.ints.positive;
default = 8;
description = mdDoc ''
Maximal distance (in chunks) between players and loaded chunks.
Only has effect when
{option}`services.mchprs.declarativeSettings` is `true`.
'';
};
bungeecord = mkOption {
type = types.bool;
default = false;
description = mdDoc ''
Enable compatibility with
[BungeeCord](https://github.com/SpigotMC/BungeeCord).
Only has effect when
{option}`services.mchprs.declarativeSettings` is `true`.
'';
};
schemati = mkOption {
type = types.bool;
default = false;
description = mdDoc ''
Mimic the verification and directory layout used by the
Open Redstone Engineers
[Schemati plugin](https://github.com/OpenRedstoneEngineers/Schemati).
Only has effect when
{option}`services.mchprs.declarativeSettings` is `true`.
'';
};
block_in_hitbox = mkOption {
type = types.bool;
default = true;
description = mdDoc ''
Allow placing blocks inside of players
(hitbox logic is simplified).
Only has effect when
{option}`services.mchprs.declarativeSettings` is `true`.
'';
};
auto_redpiler = mkOption {
type = types.bool;
default = true;
description = mdDoc ''
Use redpiler automatically.
Only has effect when
{option}`services.mchprs.declarativeSettings` is `true`.
'';
};
};
};
default = { };
description = mdDoc ''
Configuration for MCHPRS via `Config.toml`.
See https://github.com/MCHPR/MCHPRS/blob/master/README.md for documentation.
'';
};
whitelist = {
enable = mkOption {
type = types.bool;
default = false;
description = mdDoc ''
Whether or not the whitelist (in `whitelist.json`) shoud be enabled.
Only has effect when {option}`services.mchprs.declarativeSettings` is `true`.
'';
};
list = mkOption {
type =
let
minecraftUUID = types.strMatching
"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" // {
description = "Minecraft UUID";
};
in
types.attrsOf minecraftUUID;
default = { };
example = literalExpression ''
{
username1 = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx";
username2 = "yyyyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy";
};
'';
description = mdDoc ''
Whitelisted players, only has an effect when
{option}`services.mchprs.declarativeWhitelist` is
`true` and the whitelist is enabled
via {option}`services.mchprs.whitelist.enable`.
This is a mapping from Minecraft usernames to UUIDs.
You can use <https://mcuuid.net/> to get a
Minecraft UUID for a username.
'';
};
};
};
};
config = mkIf cfg.enable {
users.users.mchprs = {
description = "MCHPRS service user";
home = cfg.dataDir;
createHome = true;
isSystemUser = true;
group = "mchprs";
};
users.groups.mchprs = { };
systemd.services.mchprs = {
description = "MCHPRS Service";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
serviceConfig = {
ExecStart = "${lib.getExe cfg.package}";
Restart = "always";
RuntimeMaxSec = cfg.maxRuntime;
User = "mchprs";
WorkingDirectory = cfg.dataDir;
StandardOutput = "journal";
StandardError = "journal";
# Hardening
CapabilityBoundingSet = [ "" ];
DeviceAllow = [ "" ];
LockPersonality = true;
MemoryDenyWriteExecute = true;
PrivateDevices = true;
PrivateTmp = true;
PrivateUsers = true;
ProtectClock = true;
ProtectControlGroups = true;
ProtectHome = true;
ProtectHostname = true;
ProtectKernelLogs = true;
ProtectKernelModules = true;
ProtectKernelTunables = true;
ProtectProc = "invisible";
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
RestrictNamespaces = true;
RestrictRealtime = true;
RestrictSUIDSGID = true;
SystemCallArchitectures = "native";
UMask = "0077";
};
preStart =
(if cfg.declarativeSettings then ''
if [ -e .declarativeSettings ]; then
# Settings were declarative before, no need to back up anything
cp -f ${configTomlFile} Config.toml
else
# Declarative settings for the first time, backup stateful files
cp -b --suffix=.stateful ${configTomlFile} Config.toml
echo "Autogenerated file that implies that this server configuration is managed declaratively by NixOS" \
> .declarativeSettings
fi
'' else ''
if [ -e .declarativeSettings ]; then
rm .declarativeSettings
fi
'') + (if cfg.declarativeWhitelist then ''
if [ -e .declarativeWhitelist ]; then
# Whitelist was declarative before, no need to back up anything
ln -sf ${whitelistFile} whitelist.json
else
# Declarative whitelist for the first time, backup stateful files
ln -sb --suffix=.stateful ${whitelistFile} whitelist.json
echo "Autogenerated file that implies that this server's whitelist is managed declaratively by NixOS" \
> .declarativeWhitelist
fi
'' else ''
if [ -e .declarativeWhitelist ]; then
rm .declarativeWhitelist
fi
'');
};
networking.firewall = mkIf (cfg.declarativeSettings && cfg.openFirewall) {
allowedUDPPorts = [ cfg.settings.port ];
allowedTCPPorts = [ cfg.settings.port ];
};
};
meta.maintainers = with maintainers; [ gdd ];
}
nixos/modules/services/security/fail2ban.nix
+133 -92
View File
@@ -3,23 +3,44 @@
with lib;
let
cfg = config.services.fail2ban;
fail2banConf = pkgs.writeText "fail2ban.local" cfg.daemonConfig;
settingsFormat = pkgs.formats.keyValue { };
jailConf = pkgs.writeText "jail.local" ''
[INCLUDES]
configFormat = pkgs.formats.ini {
mkKeyValue = generators.mkKeyValueDefault { } " = ";
};
before = paths-nixos.conf
mkJailConfig = name: attrs:
optionalAttrs (name != "DEFAULT") { inherit (attrs) enabled; } //
optionalAttrs (attrs.filter != null) { filter = if (builtins.isString filter) then filter else name; } //
attrs.settings;
${concatStringsSep "\n" (attrValues (flip mapAttrs cfg.jails (name: def:
optionalString (def != "")
''
[${name}]
${def}
'')))}
'';
mkFilter = name: attrs: nameValuePair "fail2ban/filter.d/${name}.conf" {
source = configFormat.generate "filter.d/${name}.conf" attrs.filter;
};
fail2banConf = configFormat.generate "fail2ban.local" cfg.daemonSettings;
strJails = filterAttrs (_: builtins.isString) cfg.jails;
attrsJails = filterAttrs (_: builtins.isAttrs) cfg.jails;
jailConf =
let
configFile = configFormat.generate "jail.local" (
{ INCLUDES.before = "paths-nixos.conf"; } // (mapAttrs mkJailConfig attrsJails)
);
extraConfig = concatStringsSep "\n" (attrValues (mapAttrs
(name: def:
optionalString (def != "")
''
[${name}]
${def}
'')
strJails));
in
pkgs.concatText "jail.local" [ configFile (pkgs.writeText "extra-jail.local" extraConfig) ];
pathsConf = pkgs.writeText "paths-nixos.conf" ''
# NixOS
@@ -32,15 +53,18 @@ let
[DEFAULT]
'';
in
{
imports = [
(mkRemovedOptionModule [ "services" "fail2ban" "daemonConfig" ] "The daemon is now configured through the attribute set `services.fail2ban.daemonSettings`.")
(mkRemovedOptionModule [ "services" "fail2ban" "extraSettings" ] "The extra default configuration can now be set using `services.fail2ban.jails.DEFAULT.settings`.")
];
###### interface
options = {
services.fail2ban = {
enable = mkOption {
default = false;
@@ -69,7 +93,7 @@ in
};
extraPackages = mkOption {
default = [];
default = [ ];
type = types.listOf types.package;
example = lib.literalExpression "[ pkgs.ipset ]";
description = lib.mdDoc ''
@@ -180,7 +204,7 @@ in
example = true;
description = lib.mdDoc ''
"bantime.overalljails" (if true) specifies the search of IP in the database will be executed
cross over all jails, if false (default), only current jail of the ban IP will be searched
cross over all jails, if false (default), only current jail of the ban IP will be searched.
'';
};
@@ -194,60 +218,75 @@ in
'';
};
daemonConfig = mkOption {
default = ''
[Definition]
logtarget = SYSLOG
socket = /run/fail2ban/fail2ban.sock
pidfile = /run/fail2ban/fail2ban.pid
dbfile = /var/lib/fail2ban/fail2ban.sqlite3
'';
type = types.lines;
description = lib.mdDoc ''
The contents of Fail2ban's main configuration file. It's
generally not necessary to change it.
'';
};
daemonSettings = mkOption {
inherit (configFormat) type;
extraSettings = mkOption {
type = with types; attrsOf (oneOf [ bool ints.positive str ]);
default = {};
description = lib.mdDoc ''
Extra default configuration for all jails (i.e. `[DEFAULT]`). See
<https://github.com/fail2ban/fail2ban/blob/master/config/jail.conf> for an overview.
'';
example = literalExpression ''
defaultText = literalExpression ''
{
findtime = "15m";
Definition = {
logtarget = "SYSLOG";
socket = "/run/fail2ban/fail2ban.sock";
pidfile = "/run/fail2ban/fail2ban.pid";
dbfile = "/var/lib/fail2ban/fail2ban.sqlite3";
};
}
'';
description = lib.mdDoc ''
The contents of Fail2ban's main configuration file.
It's generally not necessary to change it.
'';
};
jails = mkOption {
default = { };
example = literalExpression ''
{ apache-nohome-iptables = '''
# Block an IP address if it accesses a non-existent
# home directory more than 5 times in 10 minutes,
# since that indicates that it's scanning.
filter = apache-nohome
action = iptables-multiport[name=HTTP, port="http,https"]
logpath = /var/log/httpd/error_log*
backend = auto
findtime = 600
bantime = 600
maxretry = 5
''';
dovecot = '''
# block IPs which failed to log-in
# aggressive mode add blocking for aborted connections
enabled = true
filter = dovecot[mode=aggressive]
maxretry = 3
''';
}
{
apache-nohome-iptables = {
settings = {
# Block an IP address if it accesses a non-existent
# home directory more than 5 times in 10 minutes,
# since that indicates that it's scanning.
filter = "apache-nohome";
action = '''iptables-multiport[name=HTTP, port="http,https"]''';
logpath = "/var/log/httpd/error_log*";
backend = "auto";
findtime = 600;
bantime = 600;
maxretry = 5;
};
};
dovecot = {
settings = {
# block IPs which failed to log-in
# aggressive mode add blocking for aborted connections
filter = "dovecot[mode=aggressive]";
maxretry = 3;
};
};
};
'';
type = types.attrsOf types.lines;
type = with types; attrsOf (either lines (submodule ({ name, ... }: {
options = {
enabled = mkEnableOption "this jail." // {
default = true;
readOnly = name == "DEFAULT";
};
filter = mkOption {
type = nullOr (either str configFormat.type);
default = null;
description = lib.mdDoc "Content of the filter used for this jail.";
};
settings = mkOption {
inherit (settingsFormat) type;
default = { };
description = lib.mdDoc "Additional settings for this jail.";
};
};
})));
description = lib.mdDoc ''
The configuration of each Fail2ban “jail”. A jail
consists of an action (such as blocking a port using
@@ -278,7 +317,7 @@ in
config = mkIf cfg.enable {
assertions = [
{
assertion = (cfg.bantime-increment.formula == null || cfg.bantime-increment.multipliers == null);
assertion = cfg.bantime-increment.formula == null || cfg.bantime-increment.multipliers == null;
message = ''
Options `services.fail2ban.bantime-increment.formula` and `services.fail2ban.bantime-increment.multipliers` cannot be both specified.
'';
@@ -300,7 +339,7 @@ in
"fail2ban/paths-nixos.conf".source = pathsConf;
"fail2ban/action.d".source = "${cfg.package}/etc/fail2ban/action.d/*.conf";
"fail2ban/filter.d".source = "${cfg.package}/etc/fail2ban/filter.d/*.conf";
};
} // (mapAttrs' mkFilter (filterAttrs (_: v: v.filter != null && !builtins.isString v.filter) attrsJails));
systemd.packages = [ cfg.package ];
systemd.services.fail2ban = {
@@ -335,39 +374,41 @@ in
};
};
# Defaults for the daemon settings
services.fail2ban.daemonSettings.Definition = {
logtarget = mkDefault "SYSLOG";
socket = mkDefault "/run/fail2ban/fail2ban.sock";
pidfile = mkDefault "/run/fail2ban/fail2ban.pid";
dbfile = mkDefault "/var/lib/fail2ban/fail2ban.sqlite3";
};
# Add some reasonable default jails. The special "DEFAULT" jail
# sets default values for all other jails.
services.fail2ban.jails.DEFAULT = ''
# Bantime increment options
bantime.increment = ${boolToString cfg.bantime-increment.enable}
${optionalString (cfg.bantime-increment.rndtime != null) "bantime.rndtime = ${cfg.bantime-increment.rndtime}"}
${optionalString (cfg.bantime-increment.maxtime != null) "bantime.maxtime = ${cfg.bantime-increment.maxtime}"}
${optionalString (cfg.bantime-increment.factor != null) "bantime.factor = ${cfg.bantime-increment.factor}"}
${optionalString (cfg.bantime-increment.formula != null) "bantime.formula = ${cfg.bantime-increment.formula}"}
${optionalString (cfg.bantime-increment.multipliers != null) "bantime.multipliers = ${cfg.bantime-increment.multipliers}"}
${optionalString (cfg.bantime-increment.overalljails != null) "bantime.overalljails = ${boolToString cfg.bantime-increment.overalljails}"}
# Miscellaneous options
ignoreip = 127.0.0.1/8 ${optionalString config.networking.enableIPv6 "::1"} ${concatStringsSep " " cfg.ignoreIP}
${optionalString (cfg.bantime != null) ''
bantime = ${cfg.bantime}
''}
maxretry = ${toString cfg.maxretry}
backend = systemd
# Actions
banaction = ${cfg.banaction}
banaction_allports = ${cfg.banaction-allports}
${optionalString (cfg.extraSettings != {}) ''
# Extra settings
${generators.toKeyValue {} cfg.extraSettings}
''}
'';
# Block SSH if there are too many failing connection attempts.
services.fail2ban.jails = mkMerge [
{
DEFAULT.settings = (optionalAttrs cfg.bantime-increment.enable
({ "bantime.increment" = cfg.bantime-increment.enable; } // (mapAttrs'
(name: nameValuePair "bantime.${name}")
(filterAttrs (n: v: v != null && n != "enable") cfg.bantime-increment))
)
) // {
# Miscellaneous options
inherit (cfg) banaction maxretry;
ignoreip = ''127.0.0.1/8 ${optionalString config.networking.enableIPv6 "::1"} ${concatStringsSep " " cfg.ignoreIP}'';
backend = "systemd";
# Actions
banaction_allports = cfg.banaction-allports;
};
}
# Block SSH if there are too many failing connection attempts.
(mkIf config.services.openssh.enable {
sshd.settings.port = mkDefault (concatMapStringsSep "," builtins.toString config.services.openssh.ports);
})
];
# Benefits from verbose sshd logging to observe failed login attempts,
# so we set that here unless the user overrode it.
services.openssh.settings.LogLevel = lib.mkDefault "VERBOSE";
services.fail2ban.jails.sshd = mkDefault ''
enabled = true
port = ${concatMapStringsSep "," (p: toString p) config.services.openssh.ports}
'';
services.openssh.settings.LogLevel = mkDefault "VERBOSE";
};
}
nixos/tests/all-tests.nix
+1
View File
@@ -256,6 +256,7 @@ in {
etebase-server = handleTest ./etebase-server.nix {};
etesync-dav = handleTest ./etesync-dav.nix {};
evcc = handleTest ./evcc.nix {};
fail2ban = handleTest ./fail2ban.nix { };
fakeroute = handleTest ./fakeroute.nix {};
fancontrol = handleTest ./fancontrol.nix {};
fcitx5 = handleTest ./fcitx5 {};
nixos/tests/fail2ban.nix
+18
View File
@@ -0,0 +1,18 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "fail2ban";
nodes.machine = _: {
services.fail2ban = {
enable = true;
bantime-increment.enable = true;
};
services.openssh.enable = true;
};
testScript = ''
machine.wait_for_unit("multi-user.target")
machine.wait_for_unit("fail2ban")
'';
})
pkgs/applications/audio/ledfx/default.nix
+1 -2
View File
@@ -15,7 +15,6 @@ python3.pkgs.buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
--replace '"openrgb-python~=0.2.10",' "" \
--replace "'rpi-ws281x>=4.3.0; platform_system == \"Linux\"'," "" \
--replace '"sentry-sdk==1.14.0",' "" \
--replace "~=" ">="
@@ -31,7 +30,7 @@ python3.pkgs.buildPythonPackage rec {
icmplib
multidict
numpy
# openrgb-python # not packaged
openrgb-python
paho-mqtt
pillow
psutil
pkgs/applications/audio/mmlgui/default.nix
+13 -5
View File
@@ -15,14 +15,14 @@
stdenv.mkDerivation rec {
pname = "mmlgui";
version = "unstable-2023-03-19";
version = "unstable-2023-06-12";
src = fetchFromGitHub {
owner = "superctr";
repo = "mmlgui";
rev = "59ac28c0008e227c03799cce85b77f96241159b1";
rev = "d680f576aba769b0d63300fbed57a0e9e54dfa4b";
fetchSubmodules = true;
sha256 = "0CHRUizhg/WOWhDOsFqRiGu/m/U7xt5du8Uvnl7kxpU=";
hash = "sha256-BqwayGQBIa0ru22Xci8vHNYPFr9scZSdrUOlDtGBnno=";
};
postPatch = ''
@@ -31,10 +31,18 @@ stdenv.mkDerivation rec {
# Removing a pkgconf-specific option makes it work with pkg-config
substituteInPlace libvgm.mak \
--replace '--with-path=/usr/local/lib/pkgconfig' ""
# Use correct pkg-config
substituteInPlace {imgui,libvgm}.mak \
--replace 'pkg-config' "\''$(PKG_CONFIG)"
# Don't force building tests
substituteInPlace Makefile \
--replace 'all: $(MMLGUI_BIN) test' 'all: $(MMLGUI_BIN)'
'';
strictDeps = true;
nativeBuildInputs = [
pkg-config
];
@@ -51,7 +59,7 @@ stdenv.mkDerivation rec {
Cocoa
];
nativeCheckInputs = [
checkInputs = [
cppunit
];
@@ -61,7 +69,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
doCheck = true;
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
installPhase = ''
runHook preInstall
pkgs/applications/audio/ncpamixer/default.nix
+3 -3
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "ncpamixer";
version = "1.3.3.4";
version = "1.3.3.5";
src = fetchFromGitHub {
owner = "fulhax";
repo = "ncpamixer";
rev = version;
sha256 = "sha256-JvIxq9CYFR/4p03e2LeJbLn3NUNwhRNF0GlqN6aPfMo=";
sha256 = "sha256-iwwfuMZn8HwnTIEBgTuvnJNlRlPt4G+j/piXO8S7mPc=";
};
nativeBuildInputs = [ cmake pkg-config ];
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/fulhax/ncpamixer";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ StijnDW ] ++ teams.c3d2.members;
maintainers = teams.c3d2.members;
};
}
pkgs/applications/audio/rofi-pulse-select/default.nix
+1 -1
View File
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitLab {
owner = "DamienCassou";
repo = pname;
rev = "${version}";
rev = version;
sha256 = "1405v0bh2m8ip9c23l95i8iq2gfrpanc6f4dz17nysdcff2ay2p3";
};
pkgs/applications/blockchains/lndhub-go/default.nix
+1 -3
View File
@@ -1,8 +1,6 @@
{ lib
, stdenv
, buildGoModule
, fetchFromGitHub
, fetchpatch
}:
buildGoModule rec {
@@ -12,7 +10,7 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "getAlby";
repo = "lndhub.go";
rev = "${version}";
rev = version;
sha256 = "sha256-m+Sc/rsYIbvd1oOqG4OT+wPtSxlgFq8m03n28eZIWJU=";
};
pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
+2 -1
View File
@@ -106,7 +106,8 @@ in stdenv.mkDerivation {
mkdir -p $ext/{adapter,formatters}
mv -t $ext vsix-extracted/extension/*
cp -t $ext/adapter ${adapter}/{bin,lib}/* ../adapter/*.py
cp -t $ext/adapter ${adapter}/{bin,lib}/*
cp -r ../adapter/scripts $ext/adapter
wrapProgram $ext/adapter/codelldb \
--set-default LLDB_DEBUGSERVER_PATH "${lldb.out}/bin/lldb-server"
cp -t $ext/formatters ../formatters/*.py
pkgs/applications/misc/audio/sox/default.nix
+8 -3
View File
@@ -1,7 +1,7 @@
{ config
, lib
, stdenv
, fetchzip
, fetchgit
, autoreconfHook
, autoconf-archive
, pkg-config
@@ -39,8 +39,13 @@ stdenv.mkDerivation rec {
pname = "sox";
version = "unstable-2021-05-09";
src = fetchzip {
url = "https://sourceforge.net/code-snapshots/git/s/so/sox/code.git/sox-code-42b3557e13e0fe01a83465b672d89faddbe65f49.zip";
src = fetchgit {
# not really needed, but when this src was updated from `fetchurl ->
# fetchgit`, we spared the mass rebuild by changing this `name` and
# therefor merge this to `master` and not to `staging`.
name = "source";
url = "https://git.code.sf.net/p/sox/code";
rev = "42b3557e13e0fe01a83465b672d89faddbe65f49";
hash = "sha256-9cpOwio69GvzVeDq79BSmJgds9WU5kA/KUlAkHcpN5c=";
};
pkgs/applications/misc/deadd-notification-center/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ mkDerivation, haskellPackages, fetchFromGitHub, lib, writeText }:
{ mkDerivation, haskellPackages, fetchFromGitHub, lib }:
let
# deadd-notification-center.service
@@ -22,7 +22,7 @@ in mkDerivation rec {
src = fetchFromGitHub {
owner = "phuhl";
repo = "linux_notification_center";
rev = "${version}";
rev = version;
hash = "sha256-ascg31HsHeXKhvMNntiRLuZ4+T2+fokfDhZ3c8N/Gzg=";
};
pkgs/applications/misc/prusa-slicer/default.nix
+46 -32
View File
@@ -1,5 +1,8 @@
{ stdenv
, lib
, openexr
, jemalloc
, c-blosc
, binutils
, fetchFromGitHub
, cmake
@@ -21,33 +24,50 @@
, ilmbase
, libpng
, mpfr
, nanosvg
, nlopt
, opencascade-occt
, openvdb
, pcre
, qhull
, tbb
, wxGTK31
, tbb_2021_8
, wxGTK32
, xorg
, fetchpatch
, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd
}:
let
wxGTK-prusa = wxGTK31.overrideAttrs (old: rec {
wxGTK-prusa = wxGTK32.overrideAttrs (old: rec {
pname = "wxwidgets-prusa3d-patched";
version = "3.1.4";
version = "3.2.0";
configureFlags = old.configureFlags ++ [ "--disable-glcanvasegl" ];
patches = [ ./wxWidgets-Makefile.in-fix.patch ];
src = fetchFromGitHub {
owner = "prusa3d";
repo = "wxWidgets";
rev = "489f6118256853cf5b299d595868641938566cdb";
hash = "sha256-xGL5I2+bPjmZGSTYe1L7VAmvLHbwd934o/cxg9baEvQ=";
rev = "78aa2dc0ea7ce99dc19adc1140f74c3e2e3f3a26";
hash = "sha256-rYvmNmvv48JSKVT4ph9AS+JdstnLSRmcpWz1IdgBzQo=";
fetchSubmodules = true;
};
});
nanosvg-fltk = nanosvg.overrideAttrs (old: rec {
pname = "nanosvg-fltk";
version = "unstable-2022-12-22";
src = fetchFromGitHub {
owner = "fltk";
repo = "nanosvg";
rev = "abcd277ea45e9098bed752cf9c6875b533c0892f";
hash = "sha256-WNdAYu66ggpSYJ8Kt57yEA4mSTv+Rvzj9Rm1q765HpY=";
};
});
openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: rec {
buildInputs = [ openexr boost tbb_2021_8 jemalloc c-blosc ilmbase ];
});
in
stdenv.mkDerivation rec {
pname = "prusa-slicer";
version = "2.5.2";
version = "2.6.0";
nativeBuildInputs = [
cmake
@@ -72,35 +92,19 @@ stdenv.mkDerivation rec {
ilmbase
libpng
mpfr
nanosvg-fltk
nlopt
opencascade-occt
openvdb
openvdb_tbb_2021_8
pcre
tbb
qhull
tbb_2021_8
wxGTK-prusa
xorg.libX11
] ++ lib.optionals withSystemd [
systemd
] ++ nativeCheckInputs;
patches = [
# Fix detection of TBB, see https://github.com/prusa3d/PrusaSlicer/issues/6355
(fetchpatch {
url = "https://github.com/prusa3d/PrusaSlicer/commit/76f4d6fa98bda633694b30a6e16d58665a634680.patch";
sha256 = "1r806ycp704ckwzgrw1940hh1l6fpz0k1ww3p37jdk6mygv53nv6";
})
# Fix compile error with boost 1.79. See https://github.com/prusa3d/PrusaSlicer/issues/8238
# Can be removed with the next version update
(fetchpatch {
url = "https://github.com/prusa3d/PrusaSlicer/commit/408e56f0390f20aaf793e0aa0c70c4d9544401d4.patch";
sha256 = "sha256-vzEPjLE3Yy5szawPn2Yp3i7MceWewpdnLUPVu9+H3W8=";
})
(fetchpatch {
url = "https://github.com/prusa3d/PrusaSlicer/commit/926ae0471800abd1e5335e251a5934570eb8f6ff.patch";
sha256 = "sha256-tAEgubeGGKFWY7r7p/6pmI2HXUGKi2TM1X5ILVZVT20=";
})
];
doCheck = true;
nativeCheckInputs = [ gtest ];
@@ -125,10 +129,8 @@ stdenv.mkDerivation rec {
# now seems to be integrated into the main lib.
sed -i 's|nlopt_cxx|nlopt|g' cmake/modules/FindNLopt.cmake
# Disable test_voronoi.cpp as the assembler hangs during build,
# likely due to commit e682dd84cff5d2420fcc0a40508557477f6cc9d3
# See issue #185808 for details.
sed -i 's|test_voronoi.cpp||g' tests/libslic3r/CMakeLists.txt
# Disable slic3r_jobs_tests.cpp as the test fails sometimes
sed -i 's|slic3r_jobs_tests.cpp||g' tests/slic3rutils/CMakeLists.txt
# prusa-slicer expects the OCCTWrapper shared library in the same folder as
# the executable when loading STEP files. We force the loader to find it in
@@ -138,6 +140,10 @@ stdenv.mkDerivation rec {
substituteInPlace src/libslic3r/Format/STEP.cpp \
--replace 'libpath /= "OCCTWrapper.so";' 'libpath = "OCCTWrapper.so";'
fi
# https://github.com/prusa3d/PrusaSlicer/issues/9581
if [ -f "cmake/modules/FindEXPAT.cmake" ]; then
rm cmake/modules/FindEXPAT.cmake
fi
# Fix resources folder location on macOS
substituteInPlace src/PrusaSlicer.cpp \
@@ -147,10 +153,18 @@ stdenv.mkDerivation rec {
sed -i '/libslic3r/d' tests/CMakeLists.txt
'';
patches = [
# wxWidgets: CheckResizerFlags assert fix
(fetchpatch {
url = "https://github.com/prusa3d/PrusaSlicer/commit/24a5ebd65c9d25a0fd69a3716d079fd1b00eb15c.patch";
hash = "sha256-MNGtaI7THu6HEl9dMwcO1hkrCtIkscoNh4ulA2cKtZA=";
})
];
src = fetchFromGitHub {
owner = "prusa3d";
repo = "PrusaSlicer";
sha256 = "sha256-oQRBVAbA2wOYZkQiYIgbd3UcKAkXjnNXo6gB5QbPDAs=";
hash = "sha256-6AZdwNcgddHePyB0bNS7xGmpz38uzhAwUxgo48OQLuU=";
rev = "version_${version}";
};
pkgs/applications/misc/prusa-slicer/wxWidgets-Makefile.in-fix.patch
+112
View File
@@ -0,0 +1,112 @@
diff --git a/Makefile.in b/Makefile.in
index 8f33aa2ff4..39928382da 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4358,7 +4358,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \
monodll_msw_utils.o \
monodll_utilsexc.o \
monodll_fswatcher.o \
- monodll_msw_secretstore.o
+ monodll_msw_secretstore.o \
monodll_msw_uilocale.o
@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS)
@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \
@@ -5284,7 +5284,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \
monodll_uuid.o \
monodll_msw_evtloop.o \
monodll_access.o \
- monodll_dark_mode.o
+ monodll_dark_mode.o \
monodll_msw_bmpbndl.o
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS)
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS = \
@@ -6196,7 +6196,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \
monodll_uuid.o \
monodll_msw_evtloop.o \
monodll_access.o \
- monodll_dark_mode.o
+ monodll_dark_mode.o \
monodll_msw_bmpbndl.o
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1)
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \
@@ -6371,7 +6371,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \
monolib_msw_utils.o \
monolib_utilsexc.o \
monolib_fswatcher.o \
- monolib_msw_secretstore.o
+ monolib_msw_secretstore.o \
monolib_msw_uilocale.o
@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1)
@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \
@@ -7297,7 +7297,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \
monolib_uuid.o \
monolib_msw_evtloop.o \
monolib_access.o \
- monolib_dark_mode.o
+ monolib_dark_mode.o \
monolib_msw_bmpbndl.o
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2)
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \
@@ -8209,7 +8209,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \
monolib_uuid.o \
monolib_msw_evtloop.o \
monolib_access.o \
- monolib_dark_mode.o
+ monolib_dark_mode.o \
monolib_msw_bmpbndl.o
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3)
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \
@@ -8436,7 +8436,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \
basedll_msw_utils.o \
basedll_utilsexc.o \
basedll_fswatcher.o \
- basedll_msw_secretstore.o
+ basedll_msw_secretstore.o \
basedll_msw_uilocale.o
@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2)
@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \
@@ -8523,7 +8523,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \
baselib_msw_utils.o \
baselib_utilsexc.o \
baselib_fswatcher.o \
- baselib_msw_secretstore.o
+ baselib_msw_secretstore.o \
baselib_msw_uilocale.o
@COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3)
@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \
@@ -9464,7 +9464,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \
coredll_uuid.o \
coredll_msw_evtloop.o \
coredll_access.o \
- coredll_dark_mode.o
+ coredll_dark_mode.o \
coredll_msw_bmpbndl.o
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4)
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \
@@ -10376,7 +10376,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \
coredll_uuid.o \
coredll_msw_evtloop.o \
coredll_access.o \
- coredll_dark_mode.o
+ coredll_dark_mode.o \
coredll_msw_bmpbndl.o
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5)
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \
@@ -11204,7 +11204,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \
corelib_uuid.o \
corelib_msw_evtloop.o \
corelib_access.o \
- corelib_dark_mode.o
+ corelib_dark_mode.o \
corelib_msw_bmpbndl.o
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6)
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \
@@ -12116,7 +12116,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \
corelib_uuid.o \
corelib_msw_evtloop.o \
corelib_access.o \
- corelib_dark_mode.o
+ corelib_dark_mode.o \
corelib_msw_bmpbndl.o
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7)
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \
pkgs/applications/misc/somebar/default.nix
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
src = fetchFromSourcehut {
owner = "~raphi";
repo = "somebar";
rev = "${version}";
rev = version;
sha256 = "sha256-PBxCy1dZrOL1nmhVDQozvF0XL79uKMhhERGNpPPzaRU=";
};
pkgs/applications/misc/ttdl/default.nix
+3 -3
View File
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "ttdl";
version = "3.9.0";
version = "3.10.0";
src = fetchFromGitHub {
owner = "VladimirMarkelov";
repo = "ttdl";
rev = "v${version}";
sha256 = "sha256-qeMGJn3UNz9VQSn3J71DEzg0lOqO9DyPpwd21UQwXc0=";
sha256 = "sha256-46oqQaDYFxpSjqFdP2V0aBP1S6BDG+hSO/V76WwCzAQ=";
};
cargoHash = "sha256-oIiTiJC+FmiudnJdhSjmKBg6EwXNpDshRZDjeftVR0o=";
cargoHash = "sha256-Kol7pCHq91zOE9boRatv12pgh/rfra5snUe3HNho1DU=";
meta = with lib; {
description = "A CLI tool to manage todo lists in todo.txt format";
pkgs/applications/networking/cluster/arkade/default.nix
+3 -3
View File
@@ -7,20 +7,20 @@
buildGoModule rec {
pname = "arkade";
version = "0.9.22";
version = "0.9.23";
src = fetchFromGitHub {
owner = "alexellis";
repo = "arkade";
rev = version;
sha256 = "sha256-+PfJ8U/ulFaXZvz1Z5uN0/PJ+NV8dh9FdKi/d0rLb2g=";
sha256 = "sha256-opq6XurS3hWI7U3fukTy2VdxxVJAO16mCjd6CZyAJ1w=";
};
CGO_ENABLED = 0;
nativeBuildInputs = [ installShellFiles ];
vendorHash = "sha256-r3bhqTI+DXSw21sjNJkO8cNA5JJitB+UcUwm/u5I0tY=";
vendorHash = "sha256-cI/Q6eeLw3oJtEHNcFvl5nq+x4dSJUDI/BdLkMzkncs=";
# Exclude pkg/get: tests downloading of binaries which fail when sandbox=true
subPackages = [
pkgs/applications/networking/cluster/kubent/default.nix
+1 -1
View File
@@ -7,7 +7,7 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "doitintl";
repo = "kube-no-trouble";
rev = "${version}";
rev = version;
sha256 = "sha256-QIvMhKAo30gInqJBpHvhcyjgVkdRqgBKwLQ80ng/75U=";
};
pkgs/applications/networking/cluster/talosctl/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "talosctl";
version = "1.4.5";
version = "1.4.6";
src = fetchFromGitHub {
owner = "siderolabs";
repo = "talos";
rev = "v${version}";
hash = "sha256-pgWNmjIyRWsshuP+GGc/Kxd32DIoHphwYvBIx2hBWZg=";
hash = "sha256-jC502ju44seg2khHszshRIE66f7cfYTKqssNIFkDxrs=";
};
vendorHash = "sha256-Fr4yfwRdhwH1UHAb4rQ74rzAGjIyEX4+0lFujUs8Tos=";
vendorHash = "sha256-XTN8JKssj3a88B+CNF6a4rqsf+tRYkQxFbyHco9r6Y8=";
ldflags = [ "-s" "-w" ];
pkgs/applications/networking/cluster/terraform-providers/providers.json
+4 -4
View File
@@ -1,10 +1,10 @@
{
"aci": {
"hash": "sha256-EmYgUWRZoIJ+wZIe4E7MlRep+uVveCbeBNDBgG7ryr8=",
"hash": "sha256-MF1YeTzKmua4C6Ay9QQGjVzjYCEZtyGW2wrMQH5Un/k=",
"homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci",
"owner": "CiscoDevNet",
"repo": "terraform-provider-aci",
"rev": "v2.8.0",
"rev": "v2.9.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -46,11 +46,11 @@
"vendorHash": "sha256-Z7HlUJ5VuQ7rBhoprmvS6HwNZ53iUoBnfXzKTV43bzE="
},
"alicloud": {
"hash": "sha256-RtxWaEcDSC2lZX6eiqEnJJMj/spvFjqjUP1Ao0p8S2Q=",
"hash": "sha256-SYzc8mvLdSHWR75+Fy4Egn2BO8t89aowYHhZ6MlyEIU=",
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
"owner": "aliyun",
"repo": "terraform-provider-alicloud",
"rev": "v1.207.0",
"rev": "v1.207.1",
"spdx": "MPL-2.0",
"vendorHash": null
},
pkgs/applications/networking/diswall/default.nix
+3 -3
View File
@@ -5,20 +5,20 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "diswall";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitHub {
owner = "dis-works";
repo = "diswall-rs";
rev = "v${version}";
sha256 = "sha256-g5KhJlkW32b2g2ZtpYd/52TTmCezxAT5SavvgXYEJoE=";
sha256 = "sha256-uT17FJc7T2Q31E7aCjJn2QkUNHUXDqWAVB5v88why9w=";
};
buildInputs = lib.optionals stdenv.isDarwin [
Security
];
cargoHash = "sha256-SnYNp+iWqDPi2kdM3qzGIj6jsWgl0pj0x9f3gd7lbpA=";
cargoHash = "sha256-g6jxe7L4B/e+CStCudkhj0hTR+ZSA8M5EI5fb7d8f5c=";
doCheck = false;
pkgs/applications/networking/feedreaders/newsboat/default.nix
+3 -3
View File
@@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "newsboat";
version = "2.31";
version = "2.32";
src = fetchFromGitHub {
owner = "newsboat";
repo = "newsboat";
rev = "r${version}";
hash = "sha256-e06QsfcAo/iYlvtdYZ8hX0EIMCDcwRrsJGjUxCrthUo=";
hash = "sha256-ACPnCm2cu9BEpMd02t+G4mg6DZ8jCydfK4p+Ad87Hek=";
};
cargoHash = "sha256-MJkiC+UoiO4DiSvHLAklBdla+RmMYaxA/8oXNblYMF4=";
cargoHash = "sha256-HHc8HSNWoBkDR7lQgvXUML5ly8sShDn16DWNf/Jig2g=";
# TODO: Check if that's still needed
postPatch = lib.optionalString stdenv.isDarwin ''
pkgs/applications/networking/instant-messengers/revolt-desktop/default.nix
+2 -1
View File
@@ -45,7 +45,8 @@ stdenv.mkDerivation rec {
postFixup = ''
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
--add-flags $out/share/${pname}/resources/app.asar
--add-flags $out/share/${pname}/resources/app.asar \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}"
'';
meta = with lib; {
pkgs/applications/networking/stc-cli/default.nix
+1 -1
View File
@@ -7,7 +7,7 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "tenox7";
repo = pname;
rev = "${version}";
rev = version;
sha256 = "sha256-g1zn/CBpLv0oNhp32njeNhhli8aTCECgh92+zn5v+4U=";
};
pkgs/applications/networking/sync/rclone/default.nix
+4 -4
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "rclone";
version = "1.62.2";
version = "1.63.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-nG3XW6OGzfbvkBmlmeOCnVRFun3EWIVLLvMXGhOAi+4=";
hash = "sha256-ojP1Uf9iP6kOlzW8qsUx1SnMRxFZLsgkjFD4LVH0oTI=";
};
vendorSha256 = "sha256-UA6PlhKxJ9wpg3mbiJ4Mqc4npwEBa93qi6WrQR8JQSk=";
vendorSha256 = "sha256-0YenfRa5udTrajPLI1ZMV+NYDHKO++M0KvIvr4gYLLc=";
subPackages = [ "." ];
@@ -54,6 +54,6 @@ buildGoModule rec {
homepage = "https://rclone.org";
changelog = "https://github.com/rclone/rclone/blob/v${version}/docs/content/changelog.md";
license = licenses.mit;
maintainers = with maintainers; [ danielfullmer marsam SuperSandro2000 ];
maintainers = with maintainers; [ marsam SuperSandro2000 ];
};
}
pkgs/applications/science/astronomy/gprojector/default.nix
+2 -2
View File
@@ -10,11 +10,11 @@
stdenvNoCC.mkDerivation rec {
pname = "gprojector";
version = "3.0.6";
version = "3.1.0";
src = fetchzip {
url = "https://www.giss.nasa.gov/tools/gprojector/download/G.ProjectorJ-${version}.tgz";
sha256 = "sha256-aw/p6mbTJl023d46NUZV3pnP4WVdYqZTFmgGlHEKfq0=";
sha256 = "sha256-cMmjyitetXxQzfSBh5ry5tIsLWOnBaaYOD1eQg1IX+w=";
};
desktopItems = [ (makeDesktopItem {
pkgs/applications/science/biology/angsd/default.nix
+1 -1
View File
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
owner = "ANGSD";
repo = "angsd";
sha256 = "sha256-Ppxgy54pAnqJUzNX5c12NHjKTQyEEcPSpCEEVOyZ/LA=";
rev = "${version}";
rev = version;
};
buildInputs = [ htslib zlib bzip2 xz curl openssl ];
pkgs/applications/science/biology/dssp/default.nix
+28 -15
View File
@@ -1,36 +1,49 @@
{ lib, stdenv, fetchFromGitHub, cmake, libcifpp, libmcfp, zlib }:
{ lib
, stdenv
, cmake
, fetchFromGitHub
, libcifpp
, libmcfp
, zlib
}:
let
libcifpp' = libcifpp.overrideAttrs (oldAttrs: rec {
# dssp 4.2.2.1 requires specific version "5.0.8" of libcifpp
version = "5.0.8";
libcifpp' = libcifpp.overrideAttrs (oldAttrs: {
# dssp 4.3.1 requires specific version "5.1.0" of libcifpp
version = "5.1.0";
src = fetchFromGitHub {
inherit (oldAttrs.src) owner repo;
rev = "v${version}";
sha256 = "sha256-KJGcopGhCWSl+ElG3BPJjBf/kvYJowOHxto6Ci1IMco=";
inherit (oldAttrs.src) owner repo rev;
hash = "sha256-PUsi4T6huSqwaa6RnBP1Vj+0a1ePrvrHD0641Lkkc5s=";
};
});
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "dssp";
version = "4.2.2.1";
version = "4.3.1";
src = fetchFromGitHub {
owner = "PDB-REDO";
repo = pname;
rev = "v${version}";
sha256 = "sha256-vmGvC5d8LTo+pcY9sxwj0d6JvH8Lyk+QSOZo5raBci4=";
repo = "dssp";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-TE2fus3KaGd9jo7cOWmJSooHjxTbcxEldR1Mui2SGP0=";
};
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [
cmake
];
buildInputs = [ libcifpp' libmcfp zlib ];
buildInputs = [
libcifpp'
libmcfp
zlib
];
meta = with lib; {
description = "Calculate the most likely secondary structure assignment given the 3D structure of a protein";
homepage = "https://github.com/PDB-REDO/dssp";
changelog = "https://github.com/PDB-REDO/libcifpp/releases/tag/${finalAttrs.src.rev}";
license = licenses.bsd2;
maintainers = with maintainers; [ natsukium ];
platforms = platforms.unix;
};
}
})
pkgs/applications/science/biology/muscle/default.nix
+1 -1
View File
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "rcedgar";
repo = pname;
rev = "${version}";
rev = version;
hash = "sha256-NpnJziZXga/T5OavUt3nQ5np8kJ9CFcSmwyg4m6IJsk=";
};
pkgs/applications/science/chemistry/autodock-vina/default.nix
+57
View File
@@ -0,0 +1,57 @@
{ lib
, stdenv
, fetchFromGitHub
, boost
, glibc
}:
let
boost' = boost.override {
enableShared = false;
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "autodock-vina";
version = "1.2.3";
src = fetchFromGitHub {
owner = "ccsb-scripps";
repo = "autodock-vina";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-oOpwhRmpS5WfnuqxkjxGsGtrofPxUt8bH9ggzm5rrR8=";
};
sourceRoot =
if stdenv.isDarwin
then "source/build/mac/release"
else "source/build/linux/release";
buildInputs = [
boost'
] ++ lib.optionals stdenv.isLinux [
glibc.static
];
makeFlags = [
"GPP=${stdenv.cc.targetPrefix}c++"
"BASE=${boost'}"
"BOOST_INCLUDE=${lib.getDev boost'}/include"
];
installPhase = ''
runHook preInstall
install -Dm755 vina vina_split -t $out/bin/
runHook postInstall
'';
meta = with lib; {
description = "One of the fastest and most widely used open-source docking engines";
homepage = "https://vina.scripps.edu/";
changelog = "https://github.com/ccsb-scripps/AutoDock-Vina/releases/tag/v${finalAttrs.version}";
license = licenses.asl20;
maintainers = with maintainers; [ natsukium ];
platforms = platforms.unix;
mainProgram = "vina";
};
})
pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix
+56
View File
@@ -0,0 +1,56 @@
{ lib
, buildPythonPackage
, autodock-vina
, boost
, swig
, setuptools
, numpy
}:
buildPythonPackage {
inherit (autodock-vina) pname version src meta;
format = "pyproject";
sourceRoot = "source/build/python";
postPatch = ''
# wildcards are not allowed
# https://github.com/ccsb-scripps/AutoDock-Vina/issues/176
substituteInPlace setup.py \
--replace "python_requires='>=3.5.*'" "python_requires='>=3.5'"
# setupPyBuildFlags are not applied with `format = "pyproject"`
substituteInPlace setup.py \
--replace "= locate_boost()" "= '${lib.getDev boost}/include', '${boost}/lib'"
# this line attempts to delete the source code
substituteInPlace setup.py \
--replace "shutil.rmtree('src')" "..."
# np.int is deprecated
# https://github.com/ccsb-scripps/AutoDock-Vina/pull/167 and so on
substituteInPlace vina/vina.py \
--replace "np.int" "int"
'';
nativeBuildInputs = [
setuptools
swig
];
buildInputs = [
boost
];
propagatedBuildInputs = [
numpy
];
# upstrem has no tests
doCheck = false;
pythonImportsCheck = [
"vina"
];
}
pkgs/applications/science/logic/anders/default.nix
+1 -1
View File
@@ -9,7 +9,7 @@ ocamlPackages.buildDunePackage rec {
src = fetchFromGitHub {
owner = "groupoid";
repo = "anders";
rev = "${version}";
rev = version;
sha256 = "sha256-JUiZoo2rNLfgs94TlJqUNzul/7ODisCjSFAzhgSp1z4=";
};
pkgs/applications/terminal-emulators/tym/default.nix
+1 -1
View File
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "endaaman";
repo = "${pname}";
rev = "${version}";
rev = version;
sha256 = "sha256-5pXNOuMT2/G+m6XoTrwNTCGNfISLLy0wQpVPhQJzs4s=";
};
pkgs/applications/version-management/gfold/default.nix
+3 -3
View File
@@ -12,7 +12,7 @@
let
pname = "gfold";
version = "4.3.3";
version = "4.4.0";
in
rustPlatform.buildRustPackage {
inherit pname version;
@@ -21,10 +21,10 @@ rustPlatform.buildRustPackage {
owner = "nickgerace";
repo = pname;
rev = version;
sha256 = "sha256-J7D/fwXhWgS6C9iJqdBaA0Ym7ioCbqmyI9BrmZfoEjY=";
sha256 = "sha256-2rBKf7+brd2NbukJYmeRpn7skxrLbMGYC9+VLqmdFfw=";
};
cargoHash = "sha256-o7bUgm2SEDis6h+feUYE/Ew6pwbYCw/peRvb4c64TlM=";
cargoHash = "sha256-7yPKZJKJF/ISfYfqpWLMApcNHqv3aFXL1a/cGtmbMVg=";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
pkgs/applications/video/crunchy-cli/default.nix
+44
View File
@@ -0,0 +1,44 @@
{ lib
, stdenv
, clangStdenv
, darwin
, xcbuild
, openssl
, pkg-config
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
pname = "crunchy-cli";
version = "3.0.0-dev.10";
src = fetchFromGitHub {
owner = "crunchy-labs";
repo = pname;
rev = "v${version}";
hash = "sha256-uc19SmVfa5BZYDidlEgV6GNvcm9Dj0mSjdwHP5S+O4A=";
};
cargoHash = "sha256-H3D55qMUAF6t45mRbGZl+DORAl1H1a7AOe+lQP0WUUQ=";
nativeBuildInputs = [
pkg-config
] ++ lib.optionals stdenv.isDarwin [
xcbuild
];
buildInputs = [
openssl
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
meta = with lib; {
description = "A pure Rust written Crunchyroll cli client and downloader";
homepage = "https://github.com/crunchy-labs/crunchy-cli";
license = with licenses; [ gpl3 ];
maintainers = with maintainers; [ stepbrobd ];
};
}
pkgs/applications/video/davinci-resolve/default.nix
+90 -44
View File
@@ -6,6 +6,7 @@
, unzip
, appimage-run
, addOpenGLRunpath
, dbus
, libGLU
, xorg
, buildFHSEnv
@@ -17,30 +18,36 @@
, glib
, libarchive
, libxcrypt
, python2
, python3
, aprutil
, makeDesktopItem
, copyDesktopItems
}:
let
davinci = (
stdenv.mkDerivation rec {
pname = "davinci-resolve";
version = "17.4.3";
version = "18.1.4";
nativeBuildInputs = [
unzip
(appimage-run.override { buildFHSEnv = buildFHSEnvChroot; } )
addOpenGLRunpath
copyDesktopItems
unzip
];
# Pretty sure, there are missing dependencies ...
buildInputs = [ libGLU xorg.libXxf86vm ];
buildInputs = [
libGLU
xorg.libXxf86vm
];
src = runCommandLocal "${pname}-src.zip"
rec {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "0hq374n26mbcds8f1z644cvnh4h2rjdrbxxxbj4p34mx9b04ab28";
outputHash = "sha256-yUKT1x5LrzdGLDZjZDeTvNgRAzeR+rn18AGY5Mn+5As=";
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
@@ -49,7 +56,8 @@ let
# ENV VARS
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
DOWNLOADID = "5efad1a052e8471989f662338d5247f1";
# Get linux.downloadId from HTTP response on https://www.blackmagicdesign.com/products/davinciresolve
DOWNLOADID = "6449dc76e0b845bcb7399964b00a3ec4";
REFERID = "263d62f31cbb49e0868005059abcb0c9";
SITEURL = "https://www.blackmagicdesign.com/api/register/us/download/${DOWNLOADID}";
@@ -73,28 +81,28 @@ let
} ''
RESOLVEURL=$(curl \
-s \
-H 'Host: www.blackmagicdesign.com' \
-H 'Accept: application/json, text/plain, */*' \
-H 'Origin: https://www.blackmagicdesign.com' \
-H "$USERAGENT" \
-H 'Content-Type: application/json;charset=UTF-8' \
-H "Referer: https://www.blackmagicdesign.com/support/download/$REFERID/Linux" \
-H 'Accept-Encoding: gzip, deflate, br' \
-H 'Accept-Language: en-US,en;q=0.9' \
-H 'Authority: www.blackmagicdesign.com' \
-H 'Cookie: _ga=GA1.2.1849503966.1518103294; _gid=GA1.2.953840595.1518103294' \
--silent \
--header 'Host: www.blackmagicdesign.com' \
--header 'Accept: application/json, text/plain, */*' \
--header 'Origin: https://www.blackmagicdesign.com' \
--header "$USERAGENT" \
--header 'Content-Type: application/json;charset=UTF-8' \
--header "Referer: https://www.blackmagicdesign.com/support/download/$REFERID/Linux" \
--header 'Accept-Encoding: gzip, deflate, br' \
--header 'Accept-Language: en-US,en;q=0.9' \
--header 'Authority: www.blackmagicdesign.com' \
--header 'Cookie: _ga=GA1.2.1849503966.1518103294; _gid=GA1.2.953840595.1518103294' \
--data-ascii "$REQJSON" \
--compressed \
"$SITEURL")
curl \
--retry 3 --retry-delay 3 \
-H "Host: sw.blackmagicdesign.com" \
-H "Upgrade-Insecure-Requests: 1" \
-H "$USERAGENT" \
-H "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8" \
-H "Accept-Language: en-US,en;q=0.9" \
--header "Host: sw.blackmagicdesign.com" \
--header "Upgrade-Insecure-Requests: 1" \
--header "$USERAGENT" \
--header "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8" \
--header "Accept-Language: en-US,en;q=0.9" \
--compressed \
"$RESOLVEURL" \
> $out
@@ -135,38 +143,76 @@ let
done
ln -s $out/libs/libcrypto.so.1.1 $out/libs/libcrypt.so.1
'';
desktopItems = [
(makeDesktopItem {
name = "davinci-resolve";
desktopName = "Davinci Resolve";
genericName = "Video Editor";
exec = "resolve";
# icon = "DV_Resolve";
comment = "Professional video editing, color, effects and audio post-processing";
categories = [
"AudioVideo"
"AudioVideoEditing"
"Video"
"Graphics"
];
})
];
}
);
in
buildFHSEnv {
name = "davinci-resolve";
targetPkgs = pkgs: with pkgs; [
librsvg
libGLU
alsa-lib
aprutil
bzip2
davinci
dbus
expat
fontconfig
freetype
glib
libGL
libGLU
libarchive
libcap
librsvg
libtool
libuuid
libxcrypt # provides libcrypt.so.1
libxkbcommon
nspr
ocl-icd
opencl-headers
python3
python3.pkgs.numpy
udev
xdg-utils # xdg-open needed to open URLs
xorg.libICE
xorg.libSM
xorg.libX11
xorg.libXcomposite
xorg.libXcursor
xorg.libXdamage
xorg.libXext
xorg.libXfixes
xorg.libXi
xorg.libXinerama
xorg.libXrandr
xorg.libXrender
xorg.libXtst
xorg.libXxf86vm
xorg.libxcb
udev
opencl-headers
alsa-lib
xorg.libX11
xorg.libXext
expat
xorg.xcbutil
xorg.xcbutilimage
xorg.xcbutilkeysyms
xorg.xcbutilrenderutil
xorg.xcbutilwm
xorg.xkeyboardconfig
zlib
libuuid
bzip2
libtool
ocl-icd
glib
libarchive
libxcrypt # provides libcrypt.so.1
xdg-utils # xdg-open needed to open URLs
python2
# currently they want python 3.6 which is EOL
#python3
aprutil
];
runScript = "${bash}/bin/bash ${
@@ -180,8 +226,8 @@ buildFHSEnv {
}";
meta = with lib; {
description = "Professional Video Editing, Color, Effects and Audio Post";
homepage = "https://www.blackmagicdesign.com/products/davinciresolve/";
description = "Professional video editing, color, effects and audio post-processing";
homepage = "https://www.blackmagicdesign.com/products/davinciresolve";
license = licenses.unfree;
maintainers = with maintainers; [ jshcmpbll ];
platforms = platforms.linux;
pkgs/applications/video/glaxnimate/default.nix
+1 -1
View File
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitLab {
owner = "mattbas";
repo = "${pname}";
rev = "${version}";
rev = version;
sha256 = "G4ykcOvXXnVIQZUYpRIrALtDSsGqxMvDtcmobjjtlKw=";
fetchSubmodules = true;
};
pkgs/applications/video/media-downloader/default.nix
+1 -1
View File
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "mhogomchungu";
repo = pname;
rev = "${version}";
rev = version;
hash = "sha256-B+KegiU3bXZXyXDQDBYipdd/+cXrPkFFH56DBojZQbg=";
};
pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix
+1 -1
View File
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "dimtpap";
repo = pname;
rev = "${version}";
rev = version;
sha256 = "sha256-gcOH8gJuP03MxhJbgl941yTtm2XIHmqHWVwkRCVATkQ=";
};
pkgs/applications/virtualization/crosvm/default.nix
+11 -1
View File
@@ -1,4 +1,5 @@
{ lib, rustPlatform, fetchgit, pkg-config, protobuf, python3, wayland-scanner
{ lib, rustPlatform, fetchgit, fetchpatch
, pkg-config, protobuf, python3, wayland-scanner
, libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols
}:
@@ -13,6 +14,15 @@ rustPlatform.buildRustPackage rec {
fetchSubmodules = true;
};
patches = [
# Backport fix for non-Glibc.
(fetchpatch {
url = "https://chromium.googlesource.com/chromiumos/platform/crosvm/+/8afa6096aa0417ccc5de0213a241dd7ebd25ac0a%5E%21/?format=TEXT";
decode = "base64 -d";
hash = "sha256-oRwGprs/P2ZG8BM9CMzyEyM8fjuyFINQw4rjTq9rKXA=";
})
];
separateDebugInfo = true;
cargoSha256 = "EhxrtCGrwCcODCjPUONjY1glPGEXbjvk6No/g2kJzI8=";
pkgs/applications/virtualization/tart/default.nix
+46
View File
@@ -0,0 +1,46 @@
{ lib
, stdenvNoCC
, fetchurl
, makeWrapper
# Softnet support ("--net-softnet") is disabled by default as it requires
# passwordless-sudo when installed through nix. Alternatively users may install
# softnet through other means with "setuid"-bit enabled.
# See https://github.com/cirruslabs/softnet#installing
, enableSoftnet ? false, softnet
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "tart";
version = "1.6.0";
src = fetchurl {
url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart.tar.gz";
sha256 = "1n052nwsccc3sr0jqnvhyl0six8wi46vysxjchwrdm8brnsdpf84";
};
sourceRoot = ".";
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
runHook preInstall
# ./tart.app/Contents/MacOS/tart binary is required to be used in order to
# trick macOS to pick tart.app/Contents/embedded.provision profile for elevated
# privileges that Tart needs
mkdir -p $out/bin $out/Applications
cp -r tart.app $out/Applications/tart.app
makeWrapper $out/Applications/tart.app/Contents/MacOS/tart $out/bin/tart \
--prefix PATH : ${lib.makeBinPath (lib.optional enableSoftnet softnet)}
install -Dm444 LICENSE $out/share/tart/LICENSE
runHook postInstall
'';
meta = with lib; {
description = "macOS VMs on Apple Silicon to use in CI and other automations";
homepage = "https://tart.run";
license = licenses.fairsource09;
maintainers = with maintainers; [ emilytrau Enzime ];
platforms = [ "aarch64-darwin" ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
};
})
pkgs/data/documentation/gnome-user-docs/default.nix
+2 -2
View File
@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "gnome-user-docs";
version = "44.1";
version = "44.3";
src = fetchurl {
url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "k/MpTUP9IvmWLM9r0X/2Tq54psoGP+bB6bxY0A8046g=";
sha256 = "lOBECCNjQ4vNv6hUlImrarKWoJHotlL1chM/102xaSw=";
};
nativeBuildInputs = [
pkgs/data/fonts/kode-mono/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "kode-mono";
version = "1.017";
version = "1.018";
src = fetchzip {
url = "https://github.com/isaozler/kode-mono/releases/download/${finalAttrs.version}/kode-mono-fonts.zip";
hash = "sha256-5bTciBQhWNUokOP3YzAwrvp7jeyiF4JMdJDX+6NXvLU=";
hash = "sha256-ITz37lO0+bQd156WKBT8bcz8571kMiJGKepGCCVxaJU=";
stripRoot = false;
};
pkgs/data/icons/colloid-icon-theme/default.nix
+2 -2
View File
@@ -18,13 +18,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "default" "purple" "pink" "red"
stdenvNoCC.mkDerivation rec {
inherit pname;
version = "2023-03-28";
version = "2023-07-01";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
hash = "sha256-R7QKxZdcKUeTD6E9gj02Tu5tYv9JyqyH2sCsdOk9zTM=";
hash = "sha256-2J6LmDV/Y2+x+nK3mO+t4MnmZCbVwDLX0tDG6BmLgqo=";
};
nativeBuildInputs = [
pkgs/data/icons/graphite-cursors/default.nix
+1 -1
View File
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = "${version}";
rev = version;
sha256 = "sha256-Kopl2NweYrq9rhw+0EUMhY/pfGo4g387927TZAhI5/A=";
};
pkgs/data/misc/dbip-country-lite/default.nix
+2 -2
View File
@@ -6,11 +6,11 @@
stdenvNoCC.mkDerivation rec {
pname = "dbip-country-lite";
version = "2023-06";
version = "2023-07";
src = fetchurl {
url = "https://download.db-ip.com/free/dbip-country-lite-${version}.mmdb.gz";
hash = "sha256-H+f7OhI03qhgpldF05Nc5ohPIPNhyVRCwiVqeWkvIbc=";
hash = "sha256-WVsyhopYbBlCWDq9UoPe1rcGU3pBYsXkqNWbaQXzRFA=";
};
dontUnpack = true;
pkgs/data/misc/v2ray-domain-list-community/default.nix
+3 -3
View File
@@ -3,14 +3,14 @@
let
generator = pkgsBuildBuild.buildGoModule rec {
pname = "v2ray-domain-list-community";
version = "20230621141418";
version = "20230627034247";
src = fetchFromGitHub {
owner = "v2fly";
repo = "domain-list-community";
rev = version;
hash = "sha256-2RUnE96CYZD/0BixdO/2APnjhOAw12lW+XpktfN3B+U=";
hash = "sha256-9GrIvrLIU72oy12K/+1WaqOjvMJngKRNmkpwTq/9r9Q=";
};
vendorHash = "sha256-lPOn296ngMCYdXoGNDG9okkLC5ryjKIL+UP98lyaKcg=";
vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8=";
meta = with lib; {
description = "community managed domain list";
homepage = "https://github.com/v2fly/domain-list-community";
pkgs/desktops/gnome/apps/gnome-maps/default.nix
+2 -2
View File
@@ -27,11 +27,11 @@
stdenv.mkDerivation rec {
pname = "gnome-maps";
version = "44.2";
version = "44.3";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "sha256-3Kh/hRME2zyMDIjc1t3uhOh1fWH6k+FeLkyf4W3RjpI=";
sha256 = "sha256-O+E7Ie66mp2jDmnfFtcYvrEw7b+9QG649AK/6hdBJgI=";
};
doCheck = true;
pkgs/desktops/gnome/core/eog/default.nix
+2 -2
View File
@@ -31,13 +31,13 @@
stdenv.mkDerivation rec {
pname = "eog";
version = "44.2";
version = "44.3";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "sha256-Ro9Tn2tn7kYYgXDyREgMwxHdHv5Hhv4VVL/+JqZccsQ=";
sha256 = "sha256-1rLXD0tDL/jPSUyPkCmyYh0I54F5ODF9ZAY65sTanYw=";
};
patches = [
pkgs/desktops/gnome/core/evince/default.nix
+2 -2
View File
@@ -43,13 +43,13 @@
stdenv.mkDerivation rec {
pname = "evince";
version = "44.2";
version = "44.3";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "mnXH/49ZkhjQcOCftAgssm+bhjcKm/rpjhqstWTWdd0=";
sha256 = "O4uhWBpHpun1f2tqoI8PtnVJxgEhqiTjEUDpOUe4NiI=";
};
nativeBuildInputs = [
pkgs/development/compilers/flix/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "flix";
version = "0.37.0";
version = "0.38.0";
src = fetchurl {
url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar";
sha256 = "sha256-7Hny8Y74Ihptto4LkvANStUAwBQBrNlwjQ5PqBwsbW0=";
sha256 = "sha256-KiN7qpyAd1svRWWRtuj/lRXyHoLNM2FaTWVgFC4aPrg=";
};
dontUnpack = true;
pkgs/development/compilers/mruby/default.nix
+8 -12
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, ruby, bison, rake, fetchFromGitHub }:
{ lib, stdenv, ruby, rake, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "mruby";
@@ -11,10 +11,12 @@ stdenv.mkDerivation rec {
sha256 = "sha256-MmrbWeg/G29YBvVrOtceTOZChrQ2kx9+apl7u7BiGjA=";
};
nativeBuildInputs = [ ruby bison rake ];
nativeBuildInputs = [ rake ];
nativeCheckInputs = [ ruby ];
# Necessary so it uses `gcc` instead of `ld` for linking.
# https://github.com/mruby/mruby/blob/35be8b252495d92ca811d76996f03c470ee33380/tasks/toolchains/gcc.rake#L25
# https://github.com/mruby/mruby/blob/e502fd88b988b0a8d9f31b928eb322eae269c45a/tasks/toolchains/gcc.rake#L30
preBuild = "unset LD";
installPhase = ''
@@ -24,19 +26,13 @@ stdenv.mkDerivation rec {
doCheck = true;
checkPhase = ''
runHook preCheck
rake test
runHook postCheck
'';
checkTarget = "test";
meta = with lib; {
description = "An embeddable implementation of the Ruby language";
homepage = "https://mruby.org";
maintainers = [ maintainers.nicknovitski ];
maintainers = with maintainers; [ nicknovitski marsam ];
license = licenses.mit;
platforms = platforms.unix;
platforms = platforms.all;
};
}
pkgs/development/compilers/openjdk/20.nix
+195
View File
@@ -0,0 +1,195 @@
{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, bash, pkg-config, autoconf, cpio
, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib
, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst
, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk20-bootstrap
, ensureNewerSourcesForZipFilesHook
, setJavaClassPath
# TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages
# which should be fixable, this is a no-rebuild workaround for GHC.
, headless ? stdenv.targetPlatform.isGhcjs
, enableJavaFX ? false, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
}:
let
version = {
feature = "20";
interim = "";
build = "36";
};
# when building a headless jdk, also bootstrap it with a headless jdk
openjdk-bootstrap = openjdk20-bootstrap.override { gtkSupport = !headless; };
openjdk = stdenv.mkDerivation {
pname = "openjdk" + lib.optionalString headless "-headless";
version = "${version.feature}${version.interim}+${version.build}";
src = fetchFromGitHub {
owner = "openjdk";
repo = "jdk${version.feature}u";
rev = "jdk-${version.feature}${version.interim}+${version.build}";
hash = "sha256-fXoSO8nq5qpUYbCtbrRr2C46XRdYX77Pxmk7GfmlZV4=";
};
nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ];
buildInputs = [
cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
gtk3 gnome_vfs GConf glib
];
patches = [
./fix-java-home-jdk10.patch
./read-truststore-from-env-jdk10.patch
./currency-date-range-jdk10.patch
./increase-javadoc-heap-jdk13.patch
./ignore-LegalNoticeFilePlugin-jdk18.patch
# -Wformat etc. are stricter in newer gccs, per
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677
# so grab the work-around from
# https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24
(fetchurl {
url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
})
# Patch borrowed from Alpine to fix build errors with musl libc and recent gcc.
# This is applied anywhere to prevent patchrot.
(fetchpatch {
url = "https://git.alpinelinux.org/aports/plain/testing/openjdk19/FixNullPtrCast.patch?id=93dc07f97ff716b647c5f57c6224901ea06da560";
hash = "sha256-H4X3Yip5bCpXMH7MSu9BgXIOYRVUBMZPZW8EvZSWI5k=";
})
# Fix build for gnumake-4.4.1:
# https://github.com/openjdk/jdk/pull/12992
(fetchpatch {
name = "gnumake-4.4.1";
url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch";
hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
})
] ++ lib.optionals (!headless && enableGnome2) [
./swing-use-gtk-jdk13.patch
];
postPatch = ''
chmod +x configure
patchShebangs --build configure
'';
# JDK's build system attempts to specifically detect
# and special-case WSL, and we don't want it to do that,
# so pass the correct platform names explicitly
configurePlatforms = ["build" "host"];
configureFlags = [
"--with-boot-jdk=${openjdk-bootstrap.home}"
"--with-version-build=${version.build}"
"--with-version-opt=nixos"
"--with-version-pre="
"--enable-unlimited-crypto"
"--with-native-debug-symbols=internal"
"--with-libjpeg=system"
"--with-giflib=system"
"--with-libpng=system"
"--with-zlib=system"
"--with-lcms=system"
"--with-stdc++lib=dynamic"
] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc"
++ lib.optional headless "--enable-headless-only"
++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
separateDebugInfo = true;
env.NIX_CFLAGS_COMPILE = "-Wno-error";
NIX_LDFLAGS = toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
]);
# -j flag is explicitly rejected by the build system:
# Error: 'make -jN' is not supported, use 'make JOBS=N'
# Note: it does not make build sequential. Build system
# still runs in parallel.
enableParallelBuilding = false;
buildFlags = [ "images" ];
installPhase = ''
mkdir -p $out/lib
mv build/*/images/jdk $out/lib/openjdk
# Remove some broken manpages.
rm -rf $out/lib/openjdk/man/ja*
# Mirror some stuff in top-level.
mkdir -p $out/share
ln -s $out/lib/openjdk/include $out/include
ln -s $out/lib/openjdk/man $out/share/man
# IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081)
ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip
# jni.h expects jni_md.h to be in the header search path.
ln -s $out/include/linux/*_md.h $out/include/
# Remove crap from the installation.
rm -rf $out/lib/openjdk/demo
${lib.optionalString headless ''
rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
''}
ln -s $out/lib/openjdk/bin $out/bin
'';
preFixup = ''
# Propagate the setJavaClassPath setup hook so that any package
# that depends on the JDK has $CLASSPATH set up properly.
mkdir -p $out/nix-support
#TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
# Set JAVA_HOME automatically.
mkdir -p $out/nix-support
cat <<EOF > $out/nix-support/setup-hook
if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
EOF
'';
postFixup = ''
# Build the set of output library directories to rpath against
LIBDIRS=""
for output in $(getAllOutputNames); do
if [ "$output" = debug ]; then continue; fi
LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS"
done
# Add the local library paths to remove dependencies on the bootstrap
for output in $(getAllOutputNames); do
if [ "$output" = debug ]; then continue; fi
OUTPUTDIR=$(eval echo \$$output)
BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
echo "$BINLIBS" | while read i; do
patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
patchelf --shrink-rpath "$i" || true
done
done
'';
disallowedReferences = [ openjdk-bootstrap ];
pos = builtins.unsafeGetAttrPos "feature" version;
meta = import ./meta.nix lib version.feature;
passthru = {
architecture = "";
home = "${openjdk}/lib/openjdk";
inherit gtk3;
};
};
in openjdk
pkgs/development/compilers/openjdk/darwin/20.nix
+81
View File
@@ -0,0 +1,81 @@
{ lib, stdenv, fetchurl, unzip, setJavaClassPath }:
let
# Details from https://www.azul.com/downloads/?version=java-19-sts&os=macos&package=jdk
# Note that the latest build may differ by platform
dist = {
x86_64-darwin = {
arch = "x64";
zuluVersion = "20.30.11";
jdkVersion = "20.0.1";
sha256 = "0hg2n2mdbpxsgpw3c58w8y1f3im6schvfqahji352p9ljbdykzmy";
};
aarch64-darwin = {
arch = "aarch64";
zuluVersion = "20.30.11";
jdkVersion = "20.0.1";
sha256 = "0bc9h1y0b2azyfl3f5sqj19sh02xs995d1kdn55m4lfhc00rzr81";
};
}."${stdenv.hostPlatform.system}";
jce-policies = fetchurl {
# Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK!
url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip";
sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0";
};
jdk = stdenv.mkDerivation rec {
pname = "zulu${dist.zuluVersion}-ca-jdk";
version = dist.jdkVersion;
src = fetchurl {
url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz";
inherit (dist) sha256;
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";
};
nativeBuildInputs = [ unzip ];
installPhase = ''
mkdir -p $out
mv * $out
unzip ${jce-policies}
mv -f ZuluJCEPolicies/*.jar $out/lib/security/
# jni.h expects jni_md.h to be in the header search path.
ln -s $out/include/darwin/*_md.h $out/include/
if [ -f $out/LICENSE ]; then
install -D $out/LICENSE $out/share/zulu/LICENSE
rm $out/LICENSE
fi
'';
preFixup = ''
# Propagate the setJavaClassPath setup hook from the JDK so that
# any package that depends on the JDK has $CLASSPATH set up
# properly.
mkdir -p $out/nix-support
printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
# Set JAVA_HOME automatically.
cat <<EOF >> $out/nix-support/setup-hook
if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
EOF
'';
# fixupPhase is moving the man to share/man which breaks it because it's a
# relative symlink.
postFixup = ''
ln -nsf ../zulu-${lib.versions.major version}.jdk/Contents/Home/man $out/share/man
'';
passthru = {
home = jdk;
};
meta = import ./meta.nix lib version;
};
in
jdk
pkgs/development/compilers/openjdk/openjfx/20.nix
+113
View File
@@ -0,0 +1,113 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless
, openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst
, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, icu68
, withMedia ? true
, withWebKit ? false
}:
let
major = "20";
update = "";
build = "+19";
repover = "${major}${update}${build}";
gradle_ = (gradle_7.override {
# note: gradle does not yet support running on 19
java = openjdk17_headless;
});
makePackage = args: stdenv.mkDerivation ({
version = "${major}${update}${build}";
src = fetchFromGitHub {
owner = "openjdk";
repo = "jfx";
rev = repover;
hash = "sha256-QPPJyl6+XU+m5xqYOFtQKJNNrovqy7ngNE/e7kiEJVU=";
};
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ];
nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ];
dontUseCmakeConfigure = true;
config = writeText "gradle.properties" (''
CONF = Release
JDK_HOME = ${openjdk19_headless.home}
'' + args.gradleProperties or "");
buildPhase = ''
runHook preBuild
export GRADLE_USER_HOME=$(mktemp -d)
ln -s $config gradle.properties
export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE"
gradle --no-daemon $gradleFlags sdk
runHook postBuild
'';
} // args);
# Fake build to pre-download deps into fixed-output derivation.
# We run nearly full build because I see no other way to download everything that's needed.
# Anyone who knows a better way?
deps = makePackage {
pname = "openjfx-deps";
# perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
installPhase = ''
find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \
| perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
| sh
rm -rf $out/tmp
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
# suspiciously the same as for openjfx 17 ...
# could they really not have changed any of their dependencies?
# or did we miss changing another upstream hash when copy-pasting?
outputHash = "sha256-dV7/U5GpFxhI13smZ587C6cVE4FRNPY0zexZkYK4Yqo=";
};
in makePackage {
pname = "openjfx-modular-sdk";
gradleProperties = ''
COMPILE_MEDIA = ${lib.boolToString withMedia}
COMPILE_WEBKIT = ${lib.boolToString withWebKit}
'';
preBuild = ''
swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)"
substituteInPlace build.gradle \
--replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \
--replace 'name: SWT_FILE_NAME' "files('$swtJar')"
'';
installPhase = ''
cp -r build/modular-sdk $out
'';
stripDebugList = [ "." ];
postFixup = ''
# Remove references to bootstrap.
export openjdkOutPath='${openjdk19_headless.outPath}'
find "$out" -name \*.so | while read lib; do
new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')"
patchelf --set-rpath "$new_refs" "$lib"
done
'';
disallowedReferences = [ openjdk17_headless openjdk19_headless ];
passthru.deps = deps;
meta = with lib; {
homepage = "https://openjdk.org/projects/openjfx/";
license = licenses.gpl2Classpath;
description = "The next-generation Java client toolkit";
maintainers = with maintainers; [ abbradar ];
platforms = platforms.unix;
};
}
pkgs/development/compilers/temurin-bin/generate-sources.py
+1 -1
View File
@@ -6,7 +6,7 @@ import re
import requests
import sys
feature_versions = (8, 11, 16, 17, 18, 19)
feature_versions = (8, 11, 16, 17, 18, 19, 20)
oses = ("mac", "linux", "alpine-linux")
types = ("jre", "jdk")
impls = ("hotspot")
pkgs/development/compilers/temurin-bin/jdk-darwin.nix
+3
View File
@@ -19,4 +19,7 @@ in
jdk-19 = common { sourcePerArch = sources.jdk.openjdk19; };
jre-19 = common { sourcePerArch = sources.jre.openjdk19; };
jdk-20 = common { sourcePerArch = sources.jdk.openjdk20; };
jre-20 = common { sourcePerArch = sources.jre.openjdk20; };
}
pkgs/development/compilers/temurin-bin/jdk-linux.nix
+3
View File
@@ -20,4 +20,7 @@ in
jdk-19 = common { sourcePerArch = sources.jdk.openjdk19; };
jre-19 = common { sourcePerArch = sources.jre.openjdk19; };
jdk-20 = common { sourcePerArch = sources.jdk.openjdk20; };
jre-20 = common { sourcePerArch = sources.jre.openjdk20; };
}
pkgs/development/compilers/temurin-bin/sources.json
+344 -248
View File
@@ -6,10 +6,10 @@
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
"build": "8",
"sha256": "774d5955c09893dda14e3eb0fd3e239a6b2cec58615fcf4ec68747260b6e1cc1",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.17_8.tar.gz",
"version": "11.0.17"
"build": "7",
"sha256": "45f56d75da2f55b29e7307cc790958e379abbe6b5f160a3824dc26e320c718e5",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.19_7.tar.gz",
"version": "11.0.19"
}
},
"openjdk16": {
@@ -26,10 +26,10 @@
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
"build": "8",
"sha256": "cb154396ff3bfb6a9082e3640c564643d31ecae1792fab0956149ed5258ad84b",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.5_8.tar.gz",
"version": "17.0.5"
"build": "7",
"sha256": "b6edac2fa669876ef16b4895b36b61d01066626e7a69feba2acc19760c8d18cb",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.7_7.tar.gz",
"version": "17.0.7"
}
},
"openjdk18": {
@@ -46,20 +46,30 @@
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
"build": "10",
"sha256": "76cfcdf47cdf24331b51939fd2840fd387cf62471da99e4718e2e42b486a9270",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_x64_alpine-linux_hotspot_19.0.1_10.tar.gz",
"version": "19.0.1"
"build": "7",
"sha256": "e2d971400ad2db25ad43ea6fa2058b269c0236e3977986dcdee2097da301beb2",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_x64_alpine-linux_hotspot_19.0.2_7.tar.gz",
"version": "19.0.2"
}
},
"openjdk20": {
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
"build": "9",
"sha256": "68d0f0c468064e944e304cab64fc162335d4d9bc0ddab7e6ff7a395a0bceda74",
"url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_x64_alpine-linux_hotspot_20.0.1_9.tar.gz",
"version": "20.0.1"
}
},
"openjdk8": {
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
"build": "8",
"sha256": "aa782e3c561b041a5730cbe728c210e234db71fa7222bd8b661f9f4df7799375",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u352b08.tar.gz",
"version": "8.0.352"
"build": "7",
"sha256": "cfdf8e07c8eeb087b7a2895b90fc0a19986bcff85006f1e2b708e3964909aa8e",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u372b07.tar.gz",
"version": "8.0.372"
}
}
},
@@ -68,20 +78,20 @@
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
"build": "8",
"sha256": "96d26887d042f3c5630cca208b6cd365679a59bf9efb601b28363e827439796c",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.17_8.tar.gz",
"version": "11.0.17"
"build": "7",
"sha256": "b5d71cdf3032040e7d2a577712bf525e32e87686af3430219308a39878b98851",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.19_7.tar.gz",
"version": "11.0.19"
}
},
"openjdk17": {
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
"build": "8",
"sha256": "56daddc4c38cda4fa8716d0a6c5b3197305b94ed7011f06adfcd55357952ae17",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.5_8.tar.gz",
"version": "17.0.5"
"build": "7",
"sha256": "711f837bacf8222dee9e8cd7f39941a4a0acf869243f03e6038ca3ba189f66ca",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.7_7.tar.gz",
"version": "17.0.7"
}
},
"openjdk18": {
@@ -98,20 +108,30 @@
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
"build": "10",
"sha256": "32426b790ac99a21a69abec793bfa47996a4fe7f74c7c89484836237f121640b",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_x64_alpine-linux_hotspot_19.0.1_10.tar.gz",
"version": "19.0.1"
"build": "7",
"sha256": "6c0ce0ead2e7ce3e0f06b9578447499c8bd0509306c95fcd81dbecb634228933",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_x64_alpine-linux_hotspot_19.0.2_7.tar.gz",
"version": "19.0.2"
}
},
"openjdk20": {
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
"build": "9",
"sha256": "0e95fa3719f7989908dfcc77ef701c6fe1111c4195ee3c6858faab5fd37525c5",
"url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jre_x64_alpine-linux_hotspot_20.0.1_9.tar.gz",
"version": "20.0.1"
}
},
"openjdk8": {
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
"build": "8",
"sha256": "0f4a4a3c092d8cca171fc36003ac82e2f3d8d768bd6f530a20e2a4caf79bdb9e",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u352b08.tar.gz",
"version": "8.0.352"
"build": "7",
"sha256": "95d8cb8b5375ec00a064ed728eb60d925d44c1a79fe92f6ca7385b5863d4f78c",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u372b07.tar.gz",
"version": "8.0.372"
}
}
}
@@ -120,36 +140,36 @@
"jdk": {
"openjdk11": {
"aarch64": {
"build": "8",
"sha256": "d18b5dd73fce9edd5c58f623a1173f9ee2d45023836b8753b96beae51673a432",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.17_8.tar.gz",
"version": "11.0.17"
"build": "7",
"sha256": "0c7763a19b4af4ef5fbae831781b5184e988d6f131d264482399eeaf51b6e254",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.19_7.tar.gz",
"version": "11.0.19"
},
"armv6l": {
"build": "8",
"sha256": "9ff3b4bd2bac18fb39f3356148efa2dc710ac029e12dc8f18ea1fe6be23bf299",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_arm_linux_hotspot_11.0.17_8.tar.gz",
"version": "11.0.17"
"build": "7",
"sha256": "be07af349f0d2e1ffb7e01e1e8bac8bffd76e22f6cc1354e5b627222e3395f41",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.19_7.tar.gz",
"version": "11.0.19"
},
"armv7l": {
"build": "8",
"sha256": "9ff3b4bd2bac18fb39f3356148efa2dc710ac029e12dc8f18ea1fe6be23bf299",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_arm_linux_hotspot_11.0.17_8.tar.gz",
"version": "11.0.17"
"build": "7",
"sha256": "be07af349f0d2e1ffb7e01e1e8bac8bffd76e22f6cc1354e5b627222e3395f41",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.19_7.tar.gz",
"version": "11.0.19"
},
"packageType": "jdk",
"powerpc64le": {
"build": "8",
"sha256": "18c636bd103e240d29cdb30d7867720ea9fb9ff7c645738bfb4d5b8027269263",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.17_8.tar.gz",
"version": "11.0.17"
"build": "7",
"sha256": "1e3704c8e155f8f894953c2a6708a52e6f449bbf5a85450be6fbb2ec76581700",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.19_7.tar.gz",
"version": "11.0.19"
},
"vmType": "hotspot",
"x86_64": {
"build": "8",
"sha256": "b8d46ed08ef4859476fe6421a7690d899ed83dce63f13fd894f994043177ef3c",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_x64_linux_hotspot_11.0.17_8.tar.gz",
"version": "11.0.17"
"build": "7",
"sha256": "5f19fb28aea3e28fcc402b73ce72f62b602992d48769502effe81c52ca39a581",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.19_7.tar.gz",
"version": "11.0.19"
}
},
"openjdk16": {
@@ -188,36 +208,36 @@
},
"openjdk17": {
"aarch64": {
"build": "8",
"sha256": "1c26c0e09f1641a666d6740d802beb81e12180abaea07b47c409d30c7f368109",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.5_8.tar.gz",
"version": "17.0.5"
"build": "7",
"sha256": "0084272404b89442871e0a1f112779844090532978ad4d4191b8d03fc6adfade",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.7_7.tar.gz",
"version": "17.0.7"
},
"armv6l": {
"build": "8",
"sha256": "e7c81596f67b6325036e9182d012f2266ced5663c5d4b0de0540ce62dcc67718",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_arm_linux_hotspot_17.0.5_8.tar.gz",
"version": "17.0.5"
"build": "7",
"sha256": "e7a84c3e59704588510d7e6cce1f732f397b54a3b558c521912a18a1b4d0abdc",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.7_7.tar.gz",
"version": "17.0.7"
},
"armv7l": {
"build": "8",
"sha256": "e7c81596f67b6325036e9182d012f2266ced5663c5d4b0de0540ce62dcc67718",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_arm_linux_hotspot_17.0.5_8.tar.gz",
"version": "17.0.5"
"build": "7",
"sha256": "e7a84c3e59704588510d7e6cce1f732f397b54a3b558c521912a18a1b4d0abdc",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.7_7.tar.gz",
"version": "17.0.7"
},
"packageType": "jdk",
"powerpc64le": {
"build": "8",
"sha256": "a426a4e2cbc29f46fa686bea8b26613f7b7a9a772a77fed0d40dfe05295be883",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.5_8.tar.gz",
"version": "17.0.5"
"build": "7",
"sha256": "8f4366ff1eddb548b1744cd82a1a56ceee60abebbcbad446bfb3ead7ac0f0f85",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.7_7.tar.gz",
"version": "17.0.7"
},
"vmType": "hotspot",
"x86_64": {
"build": "8",
"sha256": "482180725ceca472e12a8e6d1a4af23d608d78287a77d963335e2a0156a020af",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.5_8.tar.gz",
"version": "17.0.5"
"build": "7",
"sha256": "e9458b38e97358850902c2936a1bb5f35f6cffc59da9fcd28c63eab8dbbfbc3b",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz",
"version": "17.0.7"
}
},
"openjdk18": {
@@ -256,140 +276,162 @@
},
"openjdk19": {
"aarch64": {
"build": "10",
"sha256": "5e8d7b3189364afd78d936bad140dbe1e7025d4b96d530ed5536d035c21afb7c",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_aarch64_linux_hotspot_19.0.1_10.tar.gz",
"version": "19.0.1"
"build": "7",
"sha256": "1c4be9aa173cb0deb0d215643d9509c8900e5497290b29eee4bee335fa57984f",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_aarch64_linux_hotspot_19.0.2_7.tar.gz",
"version": "19.0.2"
},
"armv6l": {
"build": "36",
"sha256": "34a786548033391de80b857fe02a9c7bd42fcb94243e7273e89012df73f1adef",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19%2B36/OpenJDK19U-jdk_arm_linux_hotspot_19_36.tar.gz",
"version": "19.0.0"
"build": "7",
"sha256": "6a51cb3868b5a3b81848a0d276267230ff3f8639f20ba9ae9ef1d386440bf1fd",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_arm_linux_hotspot_19.0.2_7.tar.gz",
"version": "19.0.2"
},
"armv7l": {
"build": "36",
"sha256": "34a786548033391de80b857fe02a9c7bd42fcb94243e7273e89012df73f1adef",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19%2B36/OpenJDK19U-jdk_arm_linux_hotspot_19_36.tar.gz",
"version": "19.0.0"
"build": "7",
"sha256": "6a51cb3868b5a3b81848a0d276267230ff3f8639f20ba9ae9ef1d386440bf1fd",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_arm_linux_hotspot_19.0.2_7.tar.gz",
"version": "19.0.2"
},
"packageType": "jdk",
"powerpc64le": {
"build": "10",
"sha256": "79320712bbef13825a0aa308621006f32e54f503142737fb21ff085185a61a96",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_ppc64le_linux_hotspot_19.0.1_10.tar.gz",
"version": "19.0.1"
"build": "7",
"sha256": "173d1256dfb9d13d309b5390e6bdf72d143b512201b0868f9d349d5ed3d64072",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_ppc64le_linux_hotspot_19.0.2_7.tar.gz",
"version": "19.0.2"
},
"vmType": "hotspot",
"x86_64": {
"build": "10",
"sha256": "163da7ea140210bae97c6a4590c757858ab4520a78af0e3e33129863d4087552",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_x64_linux_hotspot_19.0.1_10.tar.gz",
"version": "19.0.1"
"build": "7",
"sha256": "3a3ba7a3f8c3a5999e2c91ea1dca843435a0d1c43737bd2f6822b2f02fc52165",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_x64_linux_hotspot_19.0.2_7.tar.gz",
"version": "19.0.2"
}
},
"openjdk20": {
"aarch64": {
"build": "9",
"sha256": "b16c0271899de1f0e277dc0398bfff11b54511765f104fa938929ac484dc926d",
"url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.1_9.tar.gz",
"version": "20.0.1"
},
"packageType": "jdk",
"powerpc64le": {
"build": "36",
"sha256": "45dde71faf8cbb78fab3c976894259655c8d3de827347f23e0ebe5710921dded",
"url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20%2B36/OpenJDK20U-jdk_ppc64le_linux_hotspot_20_36.tar.gz",
"version": "20.0.0"
},
"vmType": "hotspot",
"x86_64": {
"build": "9",
"sha256": "43ad054f135a7894dc87ad5d10ad45d8e82846186515892acdbc17c2c5cd27e4",
"url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_x64_linux_hotspot_20.0.1_9.tar.gz",
"version": "20.0.1"
}
},
"openjdk8": {
"aarch64": {
"build": "8",
"sha256": "a70768968bbcccccf977f036e87e545c3b080ed6c44072a01e9dadb94051c454",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_8u352b08.tar.gz",
"version": "8.0.352"
"build": "7",
"sha256": "195808eb42ab73535c84de05188914a52a47c1ac784e4bf66de95fe1fd315a5a",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_aarch64_linux_hotspot_8u372b07.tar.gz",
"version": "8.0.372"
},
"armv6l": {
"build": "1",
"sha256": "af4ecd311df32b405142d5756f966418d0200fbf6cb9009c20a44dc691e8da6f",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_arm_linux_hotspot_8u345b01.tar.gz",
"version": "8.0.345"
"build": "7",
"sha256": "3f4848700a4bf856d3c138dc9c2b305b978879c8fbef5aa7df34a7c2fe1b64b8",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_arm_linux_hotspot_8u372b07.tar.gz",
"version": "8.0.372"
},
"armv7l": {
"build": "1",
"sha256": "af4ecd311df32b405142d5756f966418d0200fbf6cb9009c20a44dc691e8da6f",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_arm_linux_hotspot_8u345b01.tar.gz",
"version": "8.0.345"
"build": "7",
"sha256": "3f4848700a4bf856d3c138dc9c2b305b978879c8fbef5aa7df34a7c2fe1b64b8",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_arm_linux_hotspot_8u372b07.tar.gz",
"version": "8.0.372"
},
"packageType": "jdk",
"powerpc64le": {
"build": "8",
"sha256": "863791dd8e0536a678f5e439c9c67199a0f3f18c76138a8e242775dfe1784009",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u352b08.tar.gz",
"version": "8.0.352"
"build": "7",
"sha256": "bb85303848fe402d4f1004f748f80ccb39cb11f356f50a513555d1083c3913b8",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u372b07.tar.gz",
"version": "8.0.372"
},
"vmType": "hotspot",
"x86_64": {
"build": "8",
"sha256": "1633bd7590cb1cd72f5a1378ae8294451028b274d798e2a4ac672059a2f00fee",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u352b08.tar.gz",
"version": "8.0.352"
"build": "7",
"sha256": "78a0b3547d6f3d46227f2ad8c774248425f20f1cd63f399b713f0cdde2cc376c",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_linux_hotspot_8u372b07.tar.gz",
"version": "8.0.372"
}
}
},
"jre": {
"openjdk11": {
"aarch64": {
"build": "8",
"sha256": "bd6efe3290c8b5a42f695a55a26f3e3c9c284288574879d4b7089f31f5114177",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.17_8.tar.gz",
"version": "11.0.17"
"build": "7",
"sha256": "1fe4b20d808f393422610818711c728331992a4455eeeb061d3d05b45412771d",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.19_7.tar.gz",
"version": "11.0.19"
},
"armv6l": {
"build": "8",
"sha256": "8cf113d3d7fa808895c8d2e41bb890af21c47e38c2460e0588147a4bb8fc658d",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_arm_linux_hotspot_11.0.17_8.tar.gz",
"version": "11.0.17"
"build": "7",
"sha256": "cb754b055177381f9f6852b7e5469904a15edddd7f8e136043c28b1e33aee47c",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_arm_linux_hotspot_11.0.19_7.tar.gz",
"version": "11.0.19"
},
"armv7l": {
"build": "8",
"sha256": "8cf113d3d7fa808895c8d2e41bb890af21c47e38c2460e0588147a4bb8fc658d",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_arm_linux_hotspot_11.0.17_8.tar.gz",
"version": "11.0.17"
"build": "7",
"sha256": "cb754b055177381f9f6852b7e5469904a15edddd7f8e136043c28b1e33aee47c",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_arm_linux_hotspot_11.0.19_7.tar.gz",
"version": "11.0.19"
},
"packageType": "jre",
"powerpc64le": {
"build": "8",
"sha256": "0ca3d806131ab5834c501f9c625bb0248cd528af361c704503348e9c9605bedf",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.17_8.tar.gz",
"version": "11.0.17"
"build": "7",
"sha256": "8019d938e5525938ec8e68e2989c4413263b0d9b7b3f20fe0c45f6d967919cfb",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.19_7.tar.gz",
"version": "11.0.19"
},
"vmType": "hotspot",
"x86_64": {
"build": "8",
"sha256": "752616097e09d7f60a3ad8bd312f90eaf50ac72577e55df229fe6e8091148f79",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.17_8.tar.gz",
"version": "11.0.17"
"build": "7",
"sha256": "32dcf760664f93531594b72ce9226e9216567de5705a23c9ff5a77c797948054",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_linux_hotspot_11.0.19_7.tar.gz",
"version": "11.0.19"
}
},
"openjdk17": {
"aarch64": {
"build": "8",
"sha256": "34d6414710db27cd7760fe369135f3b9927ccc81410280606613166d4106d60a",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.5_8.tar.gz",
"version": "17.0.5"
"build": "7",
"sha256": "2ff6a4fd1fa354047c93ba8c3179967156162f27bd683aee1f6e52a480bcbe6a",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.7_7.tar.gz",
"version": "17.0.7"
},
"armv6l": {
"build": "8",
"sha256": "9e0d1745139fe502f22df1e261d2ed1ad807085dd75a8b333d481289b579870d",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_arm_linux_hotspot_17.0.5_8.tar.gz",
"version": "17.0.5"
"build": "7",
"sha256": "5b0401199c7c9163b8395ebf25195ed395fec7b7ef7158c36302420cf993825a",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.7_7.tar.gz",
"version": "17.0.7"
},
"armv7l": {
"build": "8",
"sha256": "9e0d1745139fe502f22df1e261d2ed1ad807085dd75a8b333d481289b579870d",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_arm_linux_hotspot_17.0.5_8.tar.gz",
"version": "17.0.5"
"build": "7",
"sha256": "5b0401199c7c9163b8395ebf25195ed395fec7b7ef7158c36302420cf993825a",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.7_7.tar.gz",
"version": "17.0.7"
},
"packageType": "jre",
"powerpc64le": {
"build": "8",
"sha256": "51dd491505bd2e096676b9dc8ecaf196d78993215af16c0f9dfddfe3dbc0205b",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.5_8.tar.gz",
"version": "17.0.5"
"build": "7",
"sha256": "cc25e74c0817cd4d943bba056b256b86e0e9148bf41d7600c5ec2e1eadb2e470",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.7_7.tar.gz",
"version": "17.0.7"
},
"vmType": "hotspot",
"x86_64": {
"build": "8",
"sha256": "11326464a14b63e6328d1d2088a23fb559c0e36b3f380e4c1f8dcbe160a8b95e",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_x64_linux_hotspot_17.0.5_8.tar.gz",
"version": "17.0.5"
"build": "7",
"sha256": "bb025133b96266f6415d5084bb9b260340a813968007f1d2d14690f20bd021ca",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_linux_hotspot_17.0.7_7.tar.gz",
"version": "17.0.7"
}
},
"openjdk18": {
@@ -428,70 +470,92 @@
},
"openjdk19": {
"aarch64": {
"build": "10",
"sha256": "c69ffc5474be076b200e8cc72417b838e4f830b36603d593fb8ca6d11b81969b",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_aarch64_linux_hotspot_19.0.1_10.tar.gz",
"version": "19.0.1"
"build": "7",
"sha256": "3653f9e5ad21e4744e5a655e243fba2895651029bee23f3d2366d5debc41a736",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_aarch64_linux_hotspot_19.0.2_7.tar.gz",
"version": "19.0.2"
},
"armv6l": {
"build": "36",
"sha256": "f6c4895b8d33118c75403d08f9697af0b77769d0e8574cb678518a0ab3b74a12",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19%2B36/OpenJDK19U-jre_arm_linux_hotspot_19_36.tar.gz",
"version": "19.0.0"
"build": "7",
"sha256": "d4588e8c01ca60da2ceed68b7d43d2fd9ec3350b93043f0dabd0eb6cb03cb23d",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_arm_linux_hotspot_19.0.2_7.tar.gz",
"version": "19.0.2"
},
"armv7l": {
"build": "36",
"sha256": "f6c4895b8d33118c75403d08f9697af0b77769d0e8574cb678518a0ab3b74a12",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19%2B36/OpenJDK19U-jre_arm_linux_hotspot_19_36.tar.gz",
"version": "19.0.0"
"build": "7",
"sha256": "d4588e8c01ca60da2ceed68b7d43d2fd9ec3350b93043f0dabd0eb6cb03cb23d",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_arm_linux_hotspot_19.0.2_7.tar.gz",
"version": "19.0.2"
},
"packageType": "jre",
"powerpc64le": {
"build": "10",
"sha256": "c5f3d67edfa0d9b5ec935f944c177c0ee4b2d7a2b5846feaf187b77e954f4242",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_ppc64le_linux_hotspot_19.0.1_10.tar.gz",
"version": "19.0.1"
"build": "7",
"sha256": "a30203431c7c21602227d39368c5af6e7abd19000d6da5562de7f3f5c57cbad5",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_ppc64le_linux_hotspot_19.0.2_7.tar.gz",
"version": "19.0.2"
},
"vmType": "hotspot",
"x86_64": {
"build": "10",
"sha256": "68cae46c973e48ca6777cd0026bbf25f3457bd3d6730c36bd79d4f3b398c8338",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_x64_linux_hotspot_19.0.1_10.tar.gz",
"version": "19.0.1"
"build": "7",
"sha256": "7386e10c74f00a4382be0540bc0494854804ad79427d8a50ac77a4c7208ff348",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_x64_linux_hotspot_19.0.2_7.tar.gz",
"version": "19.0.2"
}
},
"openjdk20": {
"aarch64": {
"build": "9",
"sha256": "4b04fcfabf833403cc74dd19105a387563f9ff0fef975c4101f3d74c53eb7745",
"url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jre_aarch64_linux_hotspot_20.0.1_9.tar.gz",
"version": "20.0.1"
},
"packageType": "jre",
"powerpc64le": {
"build": "36",
"sha256": "a1c5a16d5a438ce7da4563cd51ff6778cdf62331c00a3096ab2388a916e076d2",
"url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20%2B36/OpenJDK20U-jre_ppc64le_linux_hotspot_20_36.tar.gz",
"version": "20.0.0"
},
"vmType": "hotspot",
"x86_64": {
"build": "9",
"sha256": "daacf24c15bf7f38a957a98a312911a36ba7f7d97004920a7875791f20e8e1ed",
"url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jre_x64_linux_hotspot_20.0.1_9.tar.gz",
"version": "20.0.1"
}
},
"openjdk8": {
"aarch64": {
"build": "8",
"sha256": "cce4db7c4311378d8d2a174b2cf680d57b52a4036f37c995b14f936b6fc1141a",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jre_aarch64_linux_hotspot_8u352b08.tar.gz",
"version": "8.0.352"
"build": "7",
"sha256": "f8e440273c8feb3fcfaca88ba18fec291deae18a548adde8a37cd1db08107b95",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_aarch64_linux_hotspot_8u372b07.tar.gz",
"version": "8.0.372"
},
"armv6l": {
"build": "1",
"sha256": "a9dd1ea4280a85158191101688bbf1920c4676a3849e22dc7783fb61f60d6199",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_arm_linux_hotspot_8u345b01.tar.gz",
"version": "8.0.345"
"build": "7",
"sha256": "e58e017012838ae4f0db78293e3246cc09958e6ea9a2393c5947ec003bf736dd",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_arm_linux_hotspot_8u372b07.tar.gz",
"version": "8.0.372"
},
"armv7l": {
"build": "1",
"sha256": "a9dd1ea4280a85158191101688bbf1920c4676a3849e22dc7783fb61f60d6199",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_arm_linux_hotspot_8u345b01.tar.gz",
"version": "8.0.345"
"build": "7",
"sha256": "e58e017012838ae4f0db78293e3246cc09958e6ea9a2393c5947ec003bf736dd",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_arm_linux_hotspot_8u372b07.tar.gz",
"version": "8.0.372"
},
"packageType": "jre",
"powerpc64le": {
"build": "8",
"sha256": "5649672dab65b3519ec16653fb2f154da90a7cd2afc568da03f3bff5c6b30a90",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jre_ppc64le_linux_hotspot_8u352b08.tar.gz",
"version": "8.0.352"
"build": "7",
"sha256": "ba5f8141a16722e39576bf42b69d2b8ebf95fc2c05441e3200f609af4dd9f1ea",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_ppc64le_linux_hotspot_8u372b07.tar.gz",
"version": "8.0.372"
},
"vmType": "hotspot",
"x86_64": {
"build": "8",
"sha256": "40b6b4c3d8f7332ea479527b530413bf0dbc13cff3c0ed9fcadf1ca053bed106",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u352-b08/OpenJDK8U-jre_x64_linux_hotspot_8u352b08.tar.gz",
"version": "8.0.352"
"build": "7",
"sha256": "b6fdfe32085a884c11b31f66aa67ac62811df7112fb6fb08beea61376a86fbb4",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_linux_hotspot_8u372b07.tar.gz",
"version": "8.0.372"
}
}
}
@@ -500,18 +564,18 @@
"jdk": {
"openjdk11": {
"aarch64": {
"build": "8",
"sha256": "79b18cbd398b67a52ebaf033dfca15c7af4c1a84ec5fa68a88f3bf742bb082f7",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.17_8.tar.gz",
"version": "11.0.17"
"build": "7",
"sha256": "f3b416ecccf51f45cc8c986975eb7bd35e7e1ad953656ab0a807125963fcf73b",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.19_7.tar.gz",
"version": "11.0.19"
},
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
"build": "8",
"sha256": "f408a12f10d93b3205bef851af62707531b699963cef79408d59197d08763c94",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jdk_x64_mac_hotspot_11.0.17_8.tar.gz",
"version": "11.0.17"
"build": "7",
"sha256": "fc34c4f0e590071dcd65a0f93540913466ccac3aa8caa984826713b67afb696d",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_mac_hotspot_11.0.19_7.tar.gz",
"version": "11.0.19"
}
},
"openjdk16": {
@@ -526,18 +590,18 @@
},
"openjdk17": {
"aarch64": {
"build": "8",
"sha256": "2dc3e425b52d1cd2915d93af5e468596b9e6a90112056abdcebac8b65bf57049",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.5_8.tar.gz",
"version": "17.0.5"
"build": "7",
"sha256": "1d6aeb55b47341e8ec33cc1644d58b88dfdcce17aa003a858baa7460550e6ff9",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.7_7.tar.gz",
"version": "17.0.7"
},
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
"build": "8",
"sha256": "94fe50982b09a179e603a096e83fd8e59fd12c0ae4bcb37ae35f00ef30a75d64",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_x64_mac_hotspot_17.0.5_8.tar.gz",
"version": "17.0.5"
"build": "7",
"sha256": "50d0e9840113c93916418068ba6c845f1a72ed0dab80a8a1f7977b0e658b65fb",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7.tar.gz",
"version": "17.0.7"
}
},
"openjdk18": {
@@ -558,62 +622,78 @@
},
"openjdk19": {
"aarch64": {
"build": "10",
"sha256": "2be4ffbf7c59b3148886b48ecf3f7d7edb7c745917ceae2a6be145a4678bf014",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_aarch64_mac_hotspot_19.0.1_10.tar.gz",
"version": "19.0.1"
"build": "7",
"sha256": "c419330cc8d6b9974d3bf1937f8f0e747c34c469afd5c546831d35aa19e03d49",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_aarch64_mac_hotspot_19.0.2_7.tar.gz",
"version": "19.0.2"
},
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
"build": "10",
"sha256": "0d80a8787fa97f5fc2f0000a849b54f4d41c5b87726c29ea1de215e382c8380c",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_x64_mac_hotspot_19.0.1_10.tar.gz",
"version": "19.0.1"
"build": "7",
"sha256": "f59d4157b3b53a35e72db283659d47f14aecae0ff5936d5f8078000504299da6",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_x64_mac_hotspot_19.0.2_7.tar.gz",
"version": "19.0.2"
}
},
"openjdk20": {
"aarch64": {
"build": "9",
"sha256": "e743f7a4aebb46bfb02e164c7aa009a29bcce1d7dd0c4926541893ea6ed21d82",
"url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_aarch64_mac_hotspot_20.0.1_9.tar.gz",
"version": "20.0.1"
},
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
"build": "9",
"sha256": "7cccfc4fb9f63410b7fdc315fd1c7739cf61888930d7f88f3eee6589d14e861f",
"url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_x64_mac_hotspot_20.0.1_9.tar.gz",
"version": "20.0.1"
}
},
"openjdk8": {
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
"build": "1",
"sha256": "3eeba0e76101b9f5e8eb9eb14ad991293cf0cc064df35f6a89882b603630f0c8",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_x64_mac_hotspot_8u345b01.tar.gz",
"version": "8.0.345"
"build": "7",
"sha256": "9c33db312cc46b6bfe705770fdc5c08edb7d790ba70be4e8b12a98e79da5f4a1",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_mac_hotspot_8u372b07.tar.gz",
"version": "8.0.372"
}
}
},
"jre": {
"openjdk11": {
"aarch64": {
"build": "8",
"sha256": "2a5cbc2888f8e382c7d0a5bf2c6d2c3bad120ceff51b00d3a62805dae4473c02",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.17_8.tar.gz",
"version": "11.0.17"
"build": "7",
"sha256": "78a07bd60c278f65bafd0df93890d909ff60259ccbd22ad71a1c3b312906508e",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.19_7.tar.gz",
"version": "11.0.19"
},
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
"build": "8",
"sha256": "66508958b5da6e36021d960b65490ab70cc7d44851c98301a3d6d3552f305674",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_x64_mac_hotspot_11.0.17_8.tar.gz",
"version": "11.0.17"
"build": "7",
"sha256": "87e439b2193e1a2cf1a8782168bba83b558f54e2708f88ea8296184ea2735c89",
"url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_mac_hotspot_11.0.19_7.tar.gz",
"version": "11.0.19"
}
},
"openjdk17": {
"aarch64": {
"build": "8",
"sha256": "d98b7f5ee6cb4a1c49288bd932008e3e37f9bb5d9a0eb9396ea236786e6ab570",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.5_8.tar.gz",
"version": "17.0.5"
"build": "7",
"sha256": "625d070a297a3c856badbaa5c65adaaa1adb3ea3813363fb8335c47709b69140",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.7_7.tar.gz",
"version": "17.0.7"
},
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
"build": "8",
"sha256": "c4884b6cd8d43497ff46e4fd475ddde5ab91004db435f0c29a801b081662f7ee",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jre_x64_mac_hotspot_17.0.5_8.tar.gz",
"version": "17.0.5"
"build": "7",
"sha256": "62559a927a8dbac2ea1d7879f590a62fea87d61bfaa92894e578d2045b8d921b",
"url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_mac_hotspot_17.0.7_7.tar.gz",
"version": "17.0.7"
}
},
"openjdk18": {
@@ -634,28 +714,44 @@
},
"openjdk19": {
"aarch64": {
"build": "10",
"sha256": "d6d4a51d2eefb98cabdbdd9118ca473e9b07ced8d784541177f74e9bf09d4a2e",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_aarch64_mac_hotspot_19.0.1_10.tar.gz",
"version": "19.0.1"
"build": "7",
"sha256": "1cd53e60478912fe5f2095313821e90c4926e74ff60a4aa9d99fc2ec912411c1",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_aarch64_mac_hotspot_19.0.2_7.tar.gz",
"version": "19.0.2"
},
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
"build": "10",
"sha256": "8bf67ece0915f5847caec5060e93eafbeeb1a3c99132a72a9424255b3b7cd063",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jre_x64_mac_hotspot_19.0.1_10.tar.gz",
"version": "19.0.1"
"build": "7",
"sha256": "33a37be7a5d7a6003595eeee6d09e47abfa1a1065a4da9a6f592b4b09cfcea19",
"url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_x64_mac_hotspot_19.0.2_7.tar.gz",
"version": "19.0.2"
}
},
"openjdk20": {
"aarch64": {
"build": "9",
"sha256": "ee8be9190324285ebc7e9bd47b948eec349221845fa48f1e673e5a1489708750",
"url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jre_aarch64_mac_hotspot_20.0.1_9.tar.gz",
"version": "20.0.1"
},
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
"build": "9",
"sha256": "b59a5f8b7f8fd1502df274e8ba58215b06934c8261413cb40e344f6ad81e7f1f",
"url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jre_x64_mac_hotspot_20.0.1_9.tar.gz",
"version": "20.0.1"
}
},
"openjdk8": {
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
"build": "1",
"sha256": "6161240769bd784e5ad55105fab9782d787ad34b7b8efd1f730a05f2659455d2",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_x64_mac_hotspot_8u345b01.tar.gz",
"version": "8.0.345"
"build": "7",
"sha256": "6c876ea7bfa778ae78ec5a976e557b2b981a592a3639eb0d3dc3c8d3dda8d321",
"url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_mac_hotspot_8u372b07.tar.gz",
"version": "8.0.372"
}
}
}
pkgs/development/embedded/arduino/arduinoOTA/default.nix
+1 -1
View File
@@ -10,7 +10,7 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "arduino";
repo = pname;
rev = "${version}";
rev = version;
hash = "sha256-HaNMkeV/PDEotYp8+rUKFaBxGbZO8qA99Yp2sa6glz8=";
};
pkgs/development/embedded/nmrpflash/default.nix
+1 -3
View File
@@ -1,11 +1,9 @@
{ fetchFromGitHub
, gcc
, lib
, libnl
, libpcap
, pkg-config
, stdenv
, writeShellScriptBin
}:
stdenv.mkDerivation rec {
pname = "nmrpflash";
@@ -23,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libnl libpcap ];
PREFIX = "${placeholder "out"}";
STANDALONE_VERSION = "${version}";
STANDALONE_VERSION = version;
preInstall = ''
mkdir -p $out/bin
pkgs/development/interpreters/python/manylinux/default.nix
+2
View File
@@ -56,6 +56,8 @@ let
"libgobject-2.0.so.0" = glib;
"libgthread-2.0.so.0" = glib;
"libglib-2.0.so.0" = glib;
"libz.so.1" = zlib;
"libexpat.so.1" = expat;
});
# https://www.python.org/dev/peps/pep-0571/
pkgs/development/libraries/ctranslate2/default.nix
+2 -2
View File
@@ -17,13 +17,13 @@ let
in
stdenv.mkDerivation rec {
pname = "ctranslate2";
version = "3.15.1";
version = "3.16.0";
src = fetchFromGitHub {
owner = "OpenNMT";
repo = "CTranslate2";
rev = "v${version}";
hash = "sha256-lh4j53+LQj09tq3qiHrL2YrACzWY1V/HX8Ixnq0TTyY=";
hash = "sha256-wQhPIjLUpeWNzUH7ZkK+l0nkiv4ncFHUys/vu/e9SOU=";
fetchSubmodules = true;
};
pkgs/development/libraries/leptonica/default.nix
+3 -3
View File
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "leptonica";
version = "1.83.0";
version = "1.83.1";
src = fetchurl {
url = "http://www.leptonica.org/source/${pname}-${version}.tar.gz";
sha256 = "sha256-IGWR3VjPhO84CDba0TO1jJ0a+SSR9amCXDRqFiBEvP4=";
url = "https://github.com/DanBloomberg/${pname}/releases/download/${version}/${pname}-${version}.tar.gz";
hash = "sha256-jxhhXgdDr3339QmFxzDfzwyTVIBz0fVmIeQVaotU090=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
pkgs/development/libraries/leveldb/default.nix
+1 -1
View File
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "google";
repo = "leveldb";
rev = "${version}";
rev = version;
sha256 = "sha256-RL+dfSFZZzWvUobSqiPbuC4nDiGzjIIukbVJZRacHbI=";
};
pkgs/development/libraries/libcifpp/default.nix
+36 -11
View File
@@ -1,28 +1,53 @@
{ lib, stdenv, fetchFromGitHub, boost, cmake, zlib }:
{ lib
, stdenv
, boost
, cmake
, fetchFromGitHub
, fetchpatch
, eigen
, zlib
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "libcifpp";
version = "5.0.8";
version = "5.1.0.1";
src = fetchFromGitHub {
owner = "PDB-REDO";
repo = pname;
rev = "v${version}";
sha256 = "sha256-KJGcopGhCWSl+ElG3BPJjBf/kvYJowOHxto6Ci1IMco=";
repo = "libcifpp";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-fAH7FIgJuitPUoacLnLs8uf9di5iM0c/2WHZqVjJOUE=";
};
nativeBuildInputs = [ cmake ];
patches = [
(fetchpatch {
name = "add-include-compare.patch";
url = "https://github.com/PDB-REDO/libcifpp/commit/676c0c8dc87437e2096718fd8c0750b995e174ba.patch";
hash = "sha256-fbA4fgiTY93+hFct+BQuHF7uv2nG7D9PljQxq1CkReU=";
})
];
# disable network access
cmakeFlags = [ "-DCIFPP_DOWNLOAD_CCD=OFF" ];
nativeBuildInputs = [
cmake
];
buildInputs = [ boost zlib ];
cmakeFlags = [
# disable network access
"-DCIFPP_DOWNLOAD_CCD=OFF"
];
buildInputs = [
boost
eigen
zlib
];
meta = with lib; {
description = "Manipulate mmCIF and PDB files";
homepage = "https://github.com/PDB-REDO/libcifpp";
changelog = "https://github.com/PDB-REDO/libcifpp/releases/tag/${finalAttrs.src.rev}";
license = licenses.bsd2;
maintainers = with maintainers; [ natsukium ];
platforms = platforms.unix;
};
}
})
pkgs/development/libraries/libdecor/default.nix
+1 -1
View File
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
domain = "gitlab.freedesktop.org";
owner = "libdecor";
repo = "libdecor";
rev = "${version}";
rev = version;
hash = "sha256-8b6qCqOSDDbhYwAeAaUyI71tSopTkGtCJaxZaJw1vQQ=";
};
pkgs/development/libraries/libmcfp/default.nix
+15 -8
View File
@@ -1,23 +1,30 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
{ lib
, stdenv
, cmake
, fetchFromGitHub
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "libmcfp";
version = "1.2.3";
version = "1.2.4";
src = fetchFromGitHub {
owner = "mhekkel";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Mi5nj8vR1j3V7fIMBrSyhD57emmlkCb0F08+5s7Usj0=";
repo = "libmcfp";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-Xz7M3TmUHGqiYZbFGSDxsVvg4VhgoVvr9TW03UxdFBw=";
};
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [
cmake
];
meta = with lib; {
description = "Header only library that can collect configuration options from command line arguments";
homepage = "https://github.com/mhekkel/libmcfp";
changelog = "https://github.com/mhekkel/libmcfp/blob/${finalAttrs.src.rev}/changelog";
license = licenses.bsd2;
maintainers = with maintainers; [ natsukium ];
platforms = platforms.unix;
};
}
})
pkgs/development/libraries/nanosvg/default.nix
+23
View File
@@ -0,0 +1,23 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation {
pname = "nanosvg";
version = "unstable-2022-12-04";
src = fetchFromGitHub {
owner = "memononen";
repo = "nanosvg";
rev = "9da543e8329fdd81b64eb48742d8ccb09377aed1";
hash = "sha256-VOiN6583DtzGYPRkl19VG2QvSzl4T9HaynBuNcvZf94=";
};
nativeBuildInputs = [ cmake ];
meta = with lib; {
description = "Simple stupid SVG parser";
homepage = "https://github.com/memononen/nanosvg";
license = licenses.zlib;
platforms = platforms.all;
};
}
pkgs/development/libraries/qtkeychain/default.nix
+1 -1
View File
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "frankosterfeld";
repo = "qtkeychain";
rev = "${version}";
rev = version;
sha256 = "sha256-LclYOuIYn+jYCvg69uHFlV3VcZ2KWdr8lFyCSBIB7Kw=";
};
pkgs/development/libraries/ta-lib/default.nix
+1 -1
View File
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "rafa-dot-el";
repo = "talib";
rev = "${version}";
rev = version;
sha256 = "sha256-bIzN8f9ZiOLaVzGAXcZUHUh/v9z1U+zY+MnyjJr1lSw=";
};
pkgs/development/lisp-modules-obsolete/lisp-packages.nix
+1 -1
View File
@@ -213,7 +213,7 @@ let lispPackages = rec {
src = pkgs.fetchFromGitHub {
owner = "atlas-engineer";
repo = "nyxt";
rev = "${version}";
rev = version;
sha256 = "12l7ir3q29v06jx0zng5cvlbmap7p709ka3ik6x29lw334qshm9b";
};
pkgs/development/ocaml-modules/fix/default.nix
+1 -1
View File
@@ -8,7 +8,7 @@ buildDunePackage rec {
domain = "gitlab.inria.fr";
owner = "fpottier";
repo = "fix";
rev = "${version}";
rev = version;
sha256 = "sha256-suWkZDLnXEO/4QCGmNuyLFOV0LJsFOMD13gxOcgu6JQ=";
};
pkgs/development/ocaml-modules/json-data-encoding/default.nix
+1 -1
View File
@@ -8,7 +8,7 @@ buildDunePackage rec {
src = fetchFromGitLab {
owner = "nomadic-labs";
repo = "json-data-encoding";
rev = "${version}";
rev = version;
hash = "sha256-ticulOKiFNQIZNFOQE9UQOw/wqRfygQwLVIc4kkmwg4=";
};
pkgs/development/ocaml-modules/lwt-exit/default.nix
+1 -1
View File
@@ -11,7 +11,7 @@ buildDunePackage rec {
src = fetchFromGitLab {
owner = "nomadic-labs";
repo = pname;
rev = "${version}";
rev = version;
sha256 = "1k763bmj1asj9ijar39rh3h1d59rckmsf21h2y8966lgglsf42bd";
};
pkgs/development/ocaml-modules/odoc-parser/default.nix
-1
View File
@@ -19,7 +19,6 @@ let param = {
};
}."${version}"; in
let v = version; in
buildDunePackage rec {
pname = "odoc-parser";
inherit version;
pkgs/development/python-modules/aiobiketrax/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "aiobiketrax";
version = "1.0.0";
version = "1.1.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "basilfx";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-lMgD315movmr+u+8BMaqhb1L46Wf0Ak56VAT2jpg1kM=";
hash = "sha256-qt2/Wf9qolNF83tf2G5xGFJiLTbOWLPbtCnDfIrKvoI=";
};
postPatch = ''
pkgs/development/python-modules/bimmer-connected/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "bimmer-connected";
version = "0.13.7";
version = "0.13.8";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "bimmerconnected";
repo = "bimmer_connected";
rev = "refs/tags/${version}";
hash = "sha256-JnrM2LuvqGHxec2C8eYjO++ejZ2jXIi8XmxpIw/tSxs=";
hash = "sha256-IC668e9XRi4rxwiwwdu4mkrQQy/hkM3OGodCDso/Uo4=";
};
nativeBuildInputs = [
pkgs/development/python-modules/btsmarthub_devicelist/default.nix
+1 -1
View File
@@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "jxwolstenholme";
repo = "btsmarthub_devicelist";
rev = "${version}";
rev = version;
hash = "sha256-7ncxCpY+A2SuSFa3k21QchrmFs1dPRUMb1r1z/laa6M=";
};
pkgs/development/python-modules/camel-converter/default.nix
+7 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "camel-converter";
version = "3.0.1";
version = "3.0.2";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "sanders41";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-t0wZ03xMNuBEUeXC+DizNSVJmnlt2SH9f0qw6F4UXg8=";
hash = "sha256-XKtWR9dmSMfqkJYUHDQtWBLG3CHrbrI5lNtPUTShmBE=";
};
postPatch = ''
@@ -44,6 +44,11 @@ buildPythonPackage rec {
"camel_converter"
];
disabledTests = [
# AttributeError: 'Test' object has no attribute 'model_dump'
"test_camel_config"
];
meta = with lib; {
description = "Client for the Meilisearch API";
homepage = "https://github.com/sanders41/camel-converter";
pkgs/development/python-modules/fastapi-mail/default.nix
+2 -2
View File
@@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "fastapi-mail";
version = "1.3.0";
version = "1.3.1";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "sabuhish";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-ttVzjmMZe1iWn2J7N5pcol4GFnKv3CB3DOQkZU2HnHg=";
hash = "sha256-m8d4y75+mSh9A+YVaV/yZhN3ckOe2mV1jdtfeNFtU/w=";
};
postPatch = ''
pkgs/development/python-modules/flatbuffers/default.nix
+1 -1
View File
@@ -10,7 +10,7 @@ buildPythonPackage rec {
# flatbuffers needs VERSION environment variable for setting the correct
# version, otherwise it uses the current date.
VERSION = "${version}";
VERSION = version;
pythonImportsCheck = [ "flatbuffers" ];
pkgs/development/python-modules/gatt/default.nix
+1 -1
View File
@@ -12,7 +12,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "getsenic";
repo = "gatt-python";
rev = "${version}";
rev = version;
hash = "sha256-GMLqQ9ojQ649hbbJB+KiQoOhiTWweOgv6zaCDzhIB5A=";
};
pkgs/development/python-modules/griffe/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "griffe";
version = "0.29.1";
version = "0.30.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "mkdocstrings";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-df6uFIaTdTy5VMKxBZew5zK0/iO7KbttbjGBJp1Vhjw=";
hash = "sha256-OiDNK/NqC1nDiN2uoYaVj07BirzNB6DBKvMKNrfWDIA=";
};
postPatch = ''
pkgs/development/python-modules/langchain/default.nix
+4 -3
View File
@@ -46,6 +46,7 @@
, google-api-python-client
, pypdf
, networkx
, pgvector
, psycopg2
, boto3
, pyowm
@@ -79,7 +80,7 @@
buildPythonPackage rec {
pname = "langchain";
version = "0.0.218";
version = "0.0.220";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -88,7 +89,7 @@ buildPythonPackage rec {
owner = "hwchase17";
repo = "langchain";
rev = "refs/tags/v${version}";
hash = "sha256-8ru3Rp1bRLVivfXAFNfZYfV3DgHuHNEuCrKoqL1O0zo=";
hash = "sha256-Br9j2mmLFxW3MHIY93m85mAVrvWVc6bnSlI71OwT8mY=";
};
postPatch = ''
@@ -196,7 +197,7 @@ buildPythonPackage rec {
# nomic
# aleph-alpha-client
# deeplake
# pgvector
pgvector
psycopg2
boto3
pyowm
pkgs/development/python-modules/nose3/default.nix
+35
View File
@@ -0,0 +1,35 @@
{ lib
, buildPythonPackage
, coverage
, fetchPypi
, isPyPy
, python
, stdenv
}:
buildPythonPackage rec {
pname = "nose3";
version = "1.3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-diquIsrbiYsAudT0u7n46H+ODd5sSaiM0MVU9OWSW3Y=";
};
propagatedBuildInputs = [ coverage ];
# PyPy hangs for unknwon reason
# darwin fails an assertion and I didn't find a way to find skip that test
doCheck = !isPyPy && !stdenv.isDarwin;
checkPhase = ''
${python.pythonForBuild.interpreter} selftest.py
'';
meta = with lib; {
description = "Fork of nose v1 not using lib2to3 for compatibility with Python 3";
homepage = "https://github.com/jayvdb/nose3";
license = licenses.lgpl3;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}
pkgs/development/python-modules/openrgb-python/default.nix
+33
View File
@@ -0,0 +1,33 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
}:
buildPythonPackage rec {
pname = "openrgb-python";
version = "0.2.15";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-rTfpqMM+IUd8rMmw/r15sICLoPHL6KLaRrmUjWTfUkA=";
};
# Module has no tests
doCheck = false;
pythonImportsCheck = [
"openrgb"
];
meta = with lib; {
description = "Module for the OpenRGB SDK";
homepage = "https://openrgb-python.readthedocs.io/";
changelog = "https://github.com/jath03/openrgb-python/releases/tag/v${version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ fab ];
};
}
pkgs/development/python-modules/perfplot/default.nix
+7 -8
View File
@@ -2,11 +2,9 @@
, buildPythonPackage
, fetchFromGitHub
, flit-core
, dufte
, matplotlib
, matplotx
, numpy
, pipdate
, tqdm
, rich
, pytestCheckHook
, pythonOlder
@@ -16,6 +14,7 @@ buildPythonPackage rec {
pname = "perfplot";
version = "0.10.2";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
@@ -30,25 +29,25 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
dufte
matplotlib
matplotx
numpy
pipdate
rich
tqdm
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "perfplot" ];
pythonImportsCheck = [
"perfplot"
];
meta = with lib; {
description = "Performance plots for Python code snippets";
homepage = "https://github.com/nschloe/perfplot";
changelog = "https://github.com/nschloe/perfplot/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ costrouc ];
broken = true; # missing matplotx dependency
};
}
pkgs/development/python-modules/pgvector/default.nix
+62
View File
@@ -0,0 +1,62 @@
{ lib
, asyncpg
, buildPythonPackage
, django
, fetchFromGitHub
, numpy
, postgresql
, postgresqlTestHook
, psycopg
, psycopg2
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, sqlalchemy
}:
buildPythonPackage rec {
pname = "pgvector";
version = "0.1.8";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "pgvector";
repo = "pgvector-python";
rev = "refs/tags/v${version}";
hash = "sha256-+0daPPZGVkqfZw0gOZwIl+knL/zZki9fs5kA3dYqPpE=";
};
propagatedBuildInputs = [
numpy
];
nativeCheckInputs = [
asyncpg
django
(postgresql.withPackages (p: with p; [ pgvector ]))
postgresqlTestHook
psycopg
psycopg2
pytest-asyncio
pytestCheckHook
sqlalchemy
];
env = {
PGDATABASE = "pgvector_python_test";
postgresqlEnableTCP = 1;
postgresqlTestUserOptions = "LOGIN SUPERUSER";
};
pythonImportsCheck = [ "pgvector" ];
meta = with lib; {
description = "Pgvector support for Python";
homepage = "https://github.com/pgvector/pgvector-python";
changelog = "https://github.com/pgvector/pgvector-python/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ natsukium ];
};
}
pkgs/development/python-modules/pyasn/default.nix
+1 -1
View File
@@ -12,7 +12,7 @@ buildPythonPackage rec {
datasrc = fetchFromGitHub {
owner = "hadiasghari";
repo = "pyasn";
rev = "${version}";
rev = version;
hash = "sha256-R7Vi1Mn44Mg3HQLDk9O43MkXXwbLRr/jjVKSHJvgYj0";
};
pkgs/development/python-modules/pywick/default.nix
-73
View File
@@ -1,73 +0,0 @@
{ buildPythonPackage
, fetchFromGitHub
, pythonOlder
, pytestCheckHook
, dill
, h5py
, hickle
, numpy
, opencv4
, pandas
, pillow
, pycm
, pyyaml
, scipy
, requests
, scikit-image
, six
, tabulate
, torch
, torchvision
, tqdm
, yacs
, lib
}:
buildPythonPackage rec {
pname = "pywick";
version = "0.6.5";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "achaiah";
repo = pname;
rev = "v${version}";
sha256 = "0wnijdvqgdpzfdsy1cga3bsr0n7zzsl8hp4dskqwxx087g5h1r84";
};
postPatch = ''
substituteInPlace setup.py --replace "opencv-python-headless" "opencv"
'';
propagatedBuildInputs = [
dill
h5py
hickle
numpy
opencv4
pandas
pillow
pycm
pyyaml
scipy
requests
scikit-image
tabulate
torch
torchvision
tqdm
six
yacs
];
nativeCheckInputs = [ pytestCheckHook ];
meta = {
description = "High-level training framework for Pytorch";
homepage = "https://github.com/achaiah/pywick";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ bcdarwin ];
broken = true; # Nixpkgs missing `albumentations` and `prodict`
};
}
pkgs/development/python-modules/referencing/default.nix
+64
View File
@@ -0,0 +1,64 @@
{ lib
, attrs
, buildPythonPackage
, fetchFromGitHub
, hatch-vcs
, hatchling
, jsonschema
, pytest-subtests
, pytestCheckHook
, pythonOlder
, rpds-py
, setuptools-scm
}:
buildPythonPackage rec {
pname = "referencing";
version = "0.29.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "python-jsonschema";
repo = "referencing";
rev = "refs/tags/v${version}";
fetchSubmodules = true;
hash = "sha256-+wPNPYu2/0gBmHFJ8aAeZ3dFDC7uFV6Ww3RAbri26Mc=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
postPatch = ''
sed -i "/Topic/d" pyproject.toml
'';
nativeBuildInputs = [
hatch-vcs
hatchling
setuptools-scm
];
propagatedBuildInputs = [
attrs
rpds-py
];
nativeCheckInputs = [
jsonschema
pytest-subtests
pytestCheckHook
];
pythonImportsCheck = [
"referencing"
];
meta = with lib; {
description = "Cross-specification JSON referencing";
homepage = "https://github.com/python-jsonschema/referencing";
changelog = "https://github.com/python-jsonschema/referencing/blob/${version}/CHANGELOG.rst";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}
pkgs/development/python-modules/rpds-py/default.nix
+51
View File
@@ -0,0 +1,51 @@
{ lib
, buildPythonPackage
, cargo
, fetchPypi
, pytestCheckHook
, pythonOlder
, rustc
, rustPlatform
}:
buildPythonPackage rec {
pname = "rpds-py";
version = "0.7.1";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
pname = "rpds_py";
inherit version;
hash = "sha256-2UC1ZE8U5JscbnkCueyKDHWEEJ+/OA+hgRWDGmQZJ8g=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-BAoE0oRQGf5ze/8uAH6gsFP77lPvOvYy8W9iDrqUn3Q=";
};
nativeBuildInputs = [
rustPlatform.cargoSetupHook
rustPlatform.maturinBuildHook
cargo
rustc
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"rpds"
];
meta = with lib; {
description = "Python bindings to Rust's persistent data structures (rpds";
homepage = "https://pypi.org/project/rpds-py/";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}
pkgs/development/python-modules/sentry-sdk/default.nix
+2 -2
View File
@@ -40,7 +40,7 @@
buildPythonPackage rec {
pname = "sentry-sdk";
version = "1.25.1";
version = "1.26.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -49,7 +49,7 @@ buildPythonPackage rec {
owner = "getsentry";
repo = "sentry-python";
rev = "refs/tags/${version}";
hash = "sha256-I7lsyMJ6akQvpzXEcUrWfomTX+oFYCX7YiE4cf6KAuE=";
hash = "sha256-zGlfkp7xOIpQKl0xL8EqtbMZfgCsi+txcsC/HW4ViEg=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/xarray/default.nix
+1 -1
View File
@@ -22,7 +22,7 @@ buildPythonPackage rec {
hash = "sha256-qnYFAKLY+L6O/Y87J6lLKvOwqMLANzR9WV6vb/Cdinc=";
};
SETUPTOOLS_SCM_PRETEND_VERSION="${version}";
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptoolsBuildHook

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