diff options
89 files changed, 2593 insertions, 1095 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index 8836ab912e631..ee71488263a93 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -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"; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 23e585871ace5..b6c988c95739a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9841,6 +9841,11 @@ fingerprint = "1147 43F1 E707 6F3E 6F4B 2C96 B9A8 B592 F126 F8E8"; }]; }; + mac-chaffee = { + name = "Mac Chaffee"; + github = "mac-chaffee"; + githubId = 7581860; + }; maddiethecafebabe = { email = "maddie@cafebabe.date"; github = "maddiethecafebabe"; @@ -10242,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"; @@ -15994,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"; diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 3d161d8bb64bc..0844596d7f6c9 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -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. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e728dcb3f1921..12c854335efef 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1282,6 +1282,7 @@ ./services/web-servers/pomerium.nix ./services/web-servers/rustus.nix ./services/web-servers/stargazer.nix + ./services/web-servers/static-web-server.nix ./services/web-servers/tomcat.nix ./services/web-servers/traefik.nix ./services/web-servers/trafficserver/default.nix diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix index eebf2a2f7b55d..9393fa7512886 100644 --- a/nixos/modules/services/security/fail2ban.nix +++ b/nixos/modules/services/security/fail2ban.nix @@ -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"; }; } diff --git a/nixos/modules/services/web-servers/static-web-server.nix b/nixos/modules/services/web-servers/static-web-server.nix new file mode 100644 index 0000000000000..07187f00feccb --- /dev/null +++ b/nixos/modules/services/web-servers/static-web-server.nix @@ -0,0 +1,68 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.static-web-server; + toml = pkgs.formats.toml {}; + configFilePath = toml.generate "config.toml" cfg.configuration; +in { + options = { + services.static-web-server = { + enable = lib.mkEnableOption (lib.mdDoc ''Static Web Server''); + listen = lib.mkOption { + default = "[::]:8787"; + type = lib.types.str; + description = lib.mdDoc '' + The "ListenStream" used in static-web-server.socket. + This is equivalent to SWS's "host" and "port" options. + See here for specific syntax: <https://www.freedesktop.org/software/systemd/man/systemd.socket.html#ListenStream=> + ''; + }; + root = lib.mkOption { + type = lib.types.path; + description = lib.mdDoc '' + The location of files for SWS to serve. Equivalent to SWS's "root" config value. + NOTE: This folder must exist before starting SWS. + ''; + }; + configuration = lib.mkOption { + default = { }; + type = toml.type; + example = { + general = { log-level = "error"; directory-listing = true; }; + }; + description = lib.mdDoc '' + Configuration for Static Web Server. See + <https://static-web-server.net/configuration/config-file/>. + NOTE: Don't set "host", "port", or "root" here. They will be ignored. + Use the top-level "listen" and "root" options instead. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ pkgs.static-web-server ]; + systemd.packages = [ pkgs.static-web-server ]; + # Have to set wantedBy since systemd.packages ignores the "Install" section + systemd.sockets.static-web-server = { + wantedBy = [ "sockets.target" ]; + # Start with empty string to reset upstream option + listenStreams = [ "" cfg.listen ]; + }; + systemd.services.static-web-server = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + # Remove upstream sample environment file; use config.toml exclusively + EnvironmentFile = [ "" ]; + ExecStart = [ "" "${pkgs.static-web-server}/bin/static-web-server --fd 0 --config-file ${configFilePath} --root ${cfg.root}" ]; + # Supplementary groups doesn't work unless we create the group ourselves + SupplementaryGroups = [ "" ]; + # If the user is serving files from their home dir, override ProtectHome to allow that + ProtectHome = if lib.hasPrefix "/home" cfg.root then "tmpfs" else "true"; + BindReadOnlyPaths = cfg.root; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ mac-chaffee ]; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 02bef2039075b..cc473bba5c79f 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -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 {}; @@ -709,6 +710,7 @@ in { sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {}; stargazer = runTest ./web-servers/stargazer.nix; starship = handleTest ./starship.nix {}; + static-web-server = handleTest ./web-servers/static-web-server.nix {}; step-ca = handleTestOn ["x86_64-linux"] ./step-ca.nix {}; stratis = handleTest ./stratis {}; strongswan-swanctl = handleTest ./strongswan-swanctl.nix {}; diff --git a/nixos/tests/fail2ban.nix b/nixos/tests/fail2ban.nix new file mode 100644 index 0000000000000..c3708575b702b --- /dev/null +++ b/nixos/tests/fail2ban.nix @@ -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") + ''; +}) diff --git a/nixos/tests/web-servers/static-web-server.nix b/nixos/tests/web-servers/static-web-server.nix new file mode 100644 index 0000000000000..da1a9bdec5d25 --- /dev/null +++ b/nixos/tests/web-servers/static-web-server.nix @@ -0,0 +1,32 @@ +import ../make-test-python.nix ({ pkgs, lib, ... } : { + name = "static-web-server"; + meta = { + maintainers = with lib.maintainers; [ mac-chaffee ]; + }; + + nodes.machine = { pkgs, ... }: { + services.static-web-server = { + enable = true; + listen = "[::]:8080"; + root = toString (pkgs.writeTextDir "nixos-test.html" '' + <h1>Hello NixOS!</h1> + ''); + configuration = { + general = { directory-listing = true; }; + }; + }; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("static-web-server.socket") + machine.wait_for_open_port(8080) + # We don't use wait_until_succeeds() because we're testing socket + # activation which better work on the first request + response = machine.succeed("curl -fsS localhost:8080") + assert "nixos-test.html" in response, "The directory listing page did not include a link to our nixos-test.html file" + response = machine.succeed("curl -fsS localhost:8080/nixos-test.html") + assert "Hello NixOS!" in response + machine.wait_for_unit("static-web-server.service") + ''; +}) diff --git a/pkgs/applications/audio/gtkcord4/default.nix b/pkgs/applications/audio/gtkcord4/default.nix index fde6a06326910..ce9d26229c6c7 100644 --- a/pkgs/applications/audio/gtkcord4/default.nix +++ b/pkgs/applications/audio/gtkcord4/default.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "gtkcord4"; - version = "0.0.11"; + version = "0.0.11-1"; src = fetchFromGitHub { owner = "diamondburned"; repo = pname; rev = "v${version}"; - hash = "sha256-0d656gjfFlgNdKbPJK+6KIU7zvp88j3bGIlGPwJNRdM="; + hash = "sha256-GkjUURmPS1KOwgYn7kO9/oGIUX9fnSgYjyU7PHXtE5w="; }; nativeBuildInputs = [ @@ -57,7 +57,7 @@ buildGoModule rec { install -D -m 444 internal/icons/png/logo.png $out/share/icons/hicolor/256x256/apps/gtkcord4.png ''; - vendorHash = "sha256-+zbaRaGOF6w8C7lmtd3k5Rh/0a+OnqTL9Qhg1ErTHBo="; + vendorHash = "sha256-RJ6dLa5EzfLMPR3LMIplFhmph+tcdsieiB5Uv95lqIs="; meta = with lib; { description = "GTK4 Discord client in Go, attempt #4."; diff --git a/pkgs/applications/audio/ledfx/default.nix b/pkgs/applications/audio/ledfx/default.nix index 0bec6eefb63e9..b536de637acfd 100644 --- a/pkgs/applications/audio/ledfx/default.nix +++ b/pkgs/applications/audio/ledfx/default.nix @@ -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 diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index c5750c6136bc4..132e7edcc3940 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -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}"; }; diff --git a/pkgs/applications/misc/prusa-slicer/wxWidgets-Makefile.in-fix.patch b/pkgs/applications/misc/prusa-slicer/wxWidgets-Makefile.in-fix.patch new file mode 100644 index 0000000000000..aadf9765882d8 --- /dev/null +++ b/pkgs/applications/misc/prusa-slicer/wxWidgets-Makefile.in-fix.patch @@ -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 = \ diff --git a/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/pkgs/applications/misc/system76-keyboard-configurator/default.nix index 89074db7e0593..1002fb13ae890 100644 --- a/pkgs/applications/misc/system76-keyboard-configurator/default.nix +++ b/pkgs/applications/misc/system76-keyboard-configurator/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-keyboard-configurator"; - version = "1.3.6"; + version = "1.3.7"; src = fetchFromGitHub { owner = "pop-os"; repo = "keyboard-configurator"; rev = "v${version}"; - sha256 = "sha256-xM1A9hREy/l3KPZAKt/UDCGTXquLG0imAs9/BwO0YeA="; + sha256 = "sha256-73D24g3jvPPregR/bLSpWzSGQRlhjp2/0kHuDDSqSBY="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { udev ]; - cargoHash = "sha256-Bf2hf1l5KNdSlOZn6++sgmdGrH356BHP77k0bNhjFDg="; + cargoHash = "sha256-AGWrMMJ5FihIVc7HvzpsL1Vmi/fvuFowX+ijgwGRJCo="; meta = with lib; { description = "Keyboard configuration application for System76 keyboards and laptops"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 51b69d2b11050..37e9bcaf63e9c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -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 }, diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 0fd6bbee8b580..cbfe6a8958ac9 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -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 '' diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 449d156a94ac2..95dc33120aa24 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -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 ]; }; } diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 1bdc378b11c0e..30cc891d0999d 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "2.7.3"; + version = "2.7.4"; src = fetchurl { url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; - sha256 = "sha256-8cGL2xQI4NYDPGqnvlnVVvha3wXFT8IcjRWTTGO7OJQ="; + sha256 = "sha256-jrDu4tXuYl2ttTRHpKHZDucqWO4mYc6zwAdRd0rQht4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/gfold/default.nix b/pkgs/applications/version-management/gfold/default.nix index b42a5dd3913e5..cf254293987db 100644 --- a/pkgs/applications/version-management/gfold/default.nix +++ b/pkgs/applications/version-management/gfold/default.nix @@ -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 ]; diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index 56a672404d275..459208f411cc1 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -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 - libGL - xorg.libICE - xorg.libSM - xorg.libXxf86vm - xorg.libxcb - udev - opencl-headers alsa-lib - xorg.libX11 - xorg.libXext - expat - zlib - libuuid + aprutil bzip2 - libtool - ocl-icd + 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 - python2 - # currently they want python 3.6 which is EOL - #python3 - aprutil + 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 + xorg.xcbutil + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.xcbutilrenderutil + xorg.xcbutilwm + xorg.xkeyboardconfig + zlib ]; 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; diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 613703b3185b2..7be72b35dd22c 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -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="; diff --git a/pkgs/applications/virtualization/tart/default.nix b/pkgs/applications/virtualization/tart/default.nix new file mode 100644 index 0000000000000..ad0cfa8df547f --- /dev/null +++ b/pkgs/applications/virtualization/tart/default.nix @@ -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 ]; + }; +}) diff --git a/pkgs/data/icons/colloid-icon-theme/default.nix b/pkgs/data/icons/colloid-icon-theme/default.nix index 8384b924a9838..7806f3e814ad1 100644 --- a/pkgs/data/icons/colloid-icon-theme/default.nix +++ b/pkgs/data/icons/colloid-icon-theme/default.nix @@ -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 = [ diff --git a/pkgs/data/misc/dbip-country-lite/default.nix b/pkgs/data/misc/dbip-country-lite/default.nix index ffa2ec24974b7..73c8d44145051 100644 --- a/pkgs/data/misc/dbip-country-lite/default.nix +++ b/pkgs/data/misc/dbip-country-lite/default.nix @@ -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; diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 7195bcc571e1f..d17207d2f1c6f 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -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"; diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix index 6cebeed7378ec..578dbf9c9837e 100644 --- a/pkgs/development/compilers/mruby/default.nix +++ b/pkgs/development/compilers/mruby/default.nix @@ -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; }; } diff --git a/pkgs/development/compilers/openjdk/20.nix b/pkgs/development/compilers/openjdk/20.nix new file mode 100644 index 0000000000000..105a1cc7b35d0 --- /dev/null +++ b/pkgs/development/compilers/openjdk/20.nix @@ -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 diff --git a/pkgs/development/compilers/openjdk/darwin/20.nix b/pkgs/development/compilers/openjdk/darwin/20.nix new file mode 100644 index 0000000000000..e26592462e500 --- /dev/null +++ b/pkgs/development/compilers/openjdk/darwin/20.nix @@ -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 diff --git a/pkgs/development/compilers/openjdk/openjfx/20.nix b/pkgs/development/compilers/openjdk/openjfx/20.nix new file mode 100644 index 0000000000000..430b32187b339 --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/20.nix @@ -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; + }; +} diff --git a/pkgs/development/compilers/temurin-bin/generate-sources.py b/pkgs/development/compilers/temurin-bin/generate-sources.py index 3e043275a7d94..79bf8aeca275e 100755 --- a/pkgs/development/compilers/temurin-bin/generate-sources.py +++ b/pkgs/development/compilers/temurin-bin/generate-sources.py @@ -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") diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix index 7774b7f2b1ae1..fe0c5792a53d4 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix @@ -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; }; } diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux.nix b/pkgs/development/compilers/temurin-bin/jdk-linux.nix index 9033413431fe8..af9202aa40785 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux.nix @@ -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; }; } diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json index 171180492a13b..e4744a7996092 100644 --- a/pkgs/development/compilers/temurin-bin/sources.json +++ b/pkgs/development/compilers/temurin-bin/sources.json @@ -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": "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": "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": "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" } } } diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix index 180a8874e50e9..98fc4ae1774df 100644 --- a/pkgs/development/libraries/libamqpcpp/default.nix +++ b/pkgs/development/libraries/libamqpcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libamqpcpp"; - version = "4.3.24"; + version = "4.3.25"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; rev = "v${version}"; - sha256 = "sha256-65/LsH1ZDkeBrtQUmKc5/5C2ce4nw4nSHXnJqZMKenI="; + sha256 = "sha256-9nqp7VM5korICwzZF0XTlC4uKwjSY5MoILVJBzKulPk="; }; buildInputs = [ openssl ]; diff --git a/pkgs/development/libraries/nanosvg/default.nix b/pkgs/development/libraries/nanosvg/default.nix new file mode 100644 index 0000000000000..2033069d77e28 --- /dev/null +++ b/pkgs/development/libraries/nanosvg/default.nix @@ -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; + }; +} + diff --git a/pkgs/development/python-modules/aiobiketrax/default.nix b/pkgs/development/python-modules/aiobiketrax/default.nix index ab357dc618568..b64c7e103a7e1 100644 --- a/pkgs/development/python-modules/aiobiketrax/default.nix +++ b/pkgs/development/python-modules/aiobiketrax/default.nix @@ -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 = '' diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index 90278ad928d77..765380a184df2 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/camel-converter/default.nix b/pkgs/development/python-modules/camel-converter/default.nix index a5386b8b047ba..cc9c345d3fb0a 100644 --- a/pkgs/development/python-modules/camel-converter/default.nix +++ b/pkgs/development/python-modules/camel-converter/default.nix @@ -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"; diff --git a/pkgs/development/python-modules/fastapi-mail/default.nix b/pkgs/development/python-modules/fastapi-mail/default.nix index 4ca32c0d5afad..52d3c44357244 100644 --- a/pkgs/development/python-modules/fastapi-mail/default.nix +++ b/pkgs/development/python-modules/fastapi-mail/default.nix @@ -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 = '' diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index dafa0dbee85a6..bff945f52c392 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -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 = '' diff --git a/pkgs/development/python-modules/nose3/default.nix b/pkgs/development/python-modules/nose3/default.nix new file mode 100644 index 0000000000000..8af1be25d0a71 --- /dev/null +++ b/pkgs/development/python-modules/nose3/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/development/python-modules/openrgb-python/default.nix b/pkgs/development/python-modules/openrgb-python/default.nix new file mode 100644 index 0000000000000..106a2f7533ea5 --- /dev/null +++ b/pkgs/development/python-modules/openrgb-python/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/development/python-modules/rabbitpy/default.nix b/pkgs/development/python-modules/rabbitpy/default.nix deleted file mode 100644 index 9287c72441cce..0000000000000 --- a/pkgs/development/python-modules/rabbitpy/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, mock -, nose -, pamqp -}: - -buildPythonPackage rec { - version = "2.0.1"; - pname = "rabbitpy"; - - # No tests in the pypi tarball, so we directly fetch from git - src = fetchFromGitHub { - owner = "gmr"; - repo = pname; - rev = version; - sha256 = "0m5z3i3d5adrz1wh6y35xjlls3cq6p4y9p1mzghw3k7hdvg26cck"; - }; - - propagatedBuildInputs = [ pamqp ]; - nativeCheckInputs = [ mock nose ]; - - checkPhase = '' - runHook preCheck - rm tests/integration_tests.py # Impure tests requiring network - nosetests tests - runHook postCheck - ''; - - postPatch = '' - # See: https://github.com/gmr/rabbitpy/issues/118 - substituteInPlace setup.py \ - --replace 'pamqp>=2,<3' 'pamqp' - ''; - - meta = with lib; { - description = "A pure python, thread-safe, minimalistic and pythonic RabbitMQ client library"; - homepage = "https://pypi.python.org/pypi/rabbitpy"; - license = licenses.bsd3; - - # broken by pamqp==3, tracked in - # https://github.com/gmr/rabbitpy/issues/125 - broken = true; - }; - -} diff --git a/pkgs/development/python-modules/referencing/default.nix b/pkgs/development/python-modules/referencing/default.nix new file mode 100644 index 0000000000000..571d512c336bc --- /dev/null +++ b/pkgs/development/python-modules/referencing/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index d74cdce95379b..c808a891a9e0e 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.7.0"; + version = "0.7.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-4+gJcW5wi1MH3OskcfWyDNaT4FKJO5boHaxdORZUwPs="; + hash = "sha256-JW7dv/MwOOZqN2Vrg6FVhsFyZ3BWN2oVGmRn9cSNWs0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/rpds-py/default.nix b/pkgs/development/python-modules/rpds-py/default.nix new file mode 100644 index 0000000000000..f07a4341aed9d --- /dev/null +++ b/pkgs/development/python-modules/rpds-py/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 33886f82f4f14..fef50c9646732 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -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 = [ diff --git a/pkgs/development/tools/allure/default.nix b/pkgs/development/tools/allure/default.nix index 14ce73b05dfab..a0ede8a0b9643 100644 --- a/pkgs/development/tools/allure/default.nix +++ b/pkgs/development/tools/allure/default.nix @@ -2,7 +2,7 @@ let pname = "allure"; - version = "2.22.4"; + version = "2.23.0"; in stdenv.mkDerivation rec { inherit pname version; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/allure-framework/allure2/releases/download/${version}/allure-${version}.tgz"; - sha256 = "sha256-oqxobClWwPNeZZhFdoX2tzD2/unG/XmvSp6hU+zzyos="; + sha256 = "sha256-RBe9S6eHnKhtar/rLoLs6gl2TJtCNfoGrYLDbE6CpRI="; }; dontConfigure = true; dontBuild = true; diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index 44da96d5b4b10..c731a1d2e723c 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "bazel-remote"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "buchgr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aC1I+33jEmgjtidA5CQXpwePsavwlx97abpsc68RkBI="; + sha256 = "sha256-7zAeGJyMfMdrVDCuTWU3zikXjM/ydjnGj6Ctjckd32c="; }; - vendorHash = "sha256-4vNRtFqtzoDHjDQwPe1/sJNzcCU+b7XHgQ5YqEzNhjI="; + vendorHash = "sha256-SxGBfWcV10L6xC5XPIfv/HJWQy5g3AoV8z4/ae23DEc="; doCheck = false; diff --git a/pkgs/development/tools/database/vitess/default.nix b/pkgs/development/tools/database/vitess/default.nix index e5743e8e2e4ba..192b29c152273 100644 --- a/pkgs/development/tools/database/vitess/default.nix +++ b/pkgs/development/tools/database/vitess/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vitess"; - version = "16.0.2"; + version = "17.0.0"; src = fetchFromGitHub { owner = "vitessio"; repo = pname; rev = "v${version}"; - hash = "sha256-8nFvNO+zb7Z0g2BMnlk+obDolCQrlfClOIg0mPW8gAU="; + hash = "sha256-J/lvOP8MsHOWnq7kKRqIktME0ewtilkyOv8pD1wSnPc="; }; - vendorHash = "sha256-hC0skrEDXn6SXjH75ur77I0pHnGSURErAy97lmVvqro="; + vendorHash = "sha256-QcCgDOqKSI+NPCdQJY4v6qU31nLQPIF8fs2qkLOk+DU="; buildInputs = [ sqlite ]; diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index b8e7a67270dfe..314e921408c57 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "okteto"; - version = "2.16.3"; + version = "2.16.5"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-SbLOrdsBy4rq2wm4tTIfjF61kcXXQQZdOJEclRdASOc="; + hash = "sha256-K3GkdcUNaBTo5sMfLONQ2o7SYUNMJ45WA5FQQ3+0+RY="; }; vendorHash = "sha256-aNXKRP7WFzscDPjZmDTbgKItNEQrRpsq+XiOuggx85w="; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index e75e290271502..ef56724d7a023 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.1.40"; + version = "0.1.43"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-TqLxx69mnc6fN0TdhFsMjTbTBP9Asr0IFVCJlgnCB+U="; + hash = "sha256-mvB5TCPkRWDAkDd4PV50EKjtlaZSFqTl6IDMTnPDrng="; }; - vendorHash = "sha256-Ml+ODoJqRkOiqPqLltpxrMvkTFV+iSoCrdr4PuvkMCY="; + vendorHash = "sha256-2us72JBzLXaxJ6X6T/Hc2y4YVoAJ6YvJVJdO3KzsbkE="; subPackages = [ "." ]; diff --git a/pkgs/games/pegasus-frontend/default.nix b/pkgs/games/pegasus-frontend/default.nix new file mode 100644 index 0000000000000..855caa75dff28 --- /dev/null +++ b/pkgs/games/pegasus-frontend/default.nix @@ -0,0 +1,51 @@ +{ lib +, fetchFromGitHub +, stdenv +, cmake +, qtbase +, qtgraphicaleffects +, qtmultimedia +, qtsvg +, qttools +, qtx11extras +, SDL2 +, sqlite +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "pegasus-frontend"; + version = "unstable-2023-05-22"; + + src = fetchFromGitHub { + owner = "mmatyas"; + repo = "pegasus-frontend"; + rev = "6421d7a75d29a82ea06008e4a08ec14e074430d9"; + fetchSubmodules = true; + sha256 = "sha256-mwJm+3zMP4alcis7OFQUcH3eXlRTZhoZYtxKrvCQGc8="; + }; + + nativeBuildInputs = [ + cmake + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + qtmultimedia + qtsvg + qtgraphicaleffects + qtx11extras + sqlite + SDL2 + ]; + + meta = with lib; { + description = "A cross platform, customizable graphical frontend for launching emulators and managing your game collection."; + homepage = "https://pegasus-frontend.org/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ tengkuizdihar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/games/pysolfc/default.nix b/pkgs/games/pysolfc/default.nix index f05babac5b79b..c543434b610d6 100644 --- a/pkgs/games/pysolfc/default.nix +++ b/pkgs/games/pysolfc/default.nix @@ -1,25 +1,42 @@ -{ lib, fetchzip, buildPythonApplication, python3Packages - , desktop-file-utils, freecell-solver }: +{ lib +, fetchzip +, buildPythonApplication +, python3Packages +, desktop-file-utils +, freecell-solver +}: buildPythonApplication rec { pname = "PySolFC"; - version = "2.16.0"; + version = "2.20.1"; src = fetchzip { url = "https://versaweb.dl.sourceforge.net/project/pysolfc/PySolFC/PySolFC-${version}/PySolFC-${version}.tar.xz"; - sha256 = "sha256-kklB16IrDicxqMee1kbxtoqgwcSrMjCV4HP6GtnZxo8="; + hash = "sha256-mEnsq8Su0ses+nqoSFC+Wr0MHY7aTDMbtDV8toYVNPY="; }; cardsets = fetchzip { - url = "https://versaweb.dl.sourceforge.net/project/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-2.1/PySolFC-Cardsets-2.1.tar.bz2"; - sha256 = "sha256-0ji6jY7zJFaaaJdInaULKUou+u934RMzYjxVDGVHbE0="; + url = "https://versaweb.dl.sourceforge.net/project/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-2.2/PySolFC-Cardsets-2.2.tar.bz2"; + hash = "sha256-mWJ0l9rvn9KeZ9rCWy7VjngJzJtSQSmG8zGcYFE4yM0="; + }; + + music = fetchzip { + url = "https://versaweb.dl.sourceforge.net/project/pysolfc/PySol-Music/PySol-Music-4.50/pysol-music-4.50.tar.xz"; + hash = "sha256-sOl5U98aIorrQHJRy34s0HHaSW8hMUE7q84FMQAj5Yg="; }; propagatedBuildInputs = with python3Packages; [ - tkinter six random2 configobj - pysol-cards attrs pycotap + tkinter + six + random2 + configobj + pysol-cards + attrs + pycotap # optional : - pygame freecell-solver pillow + pygame + freecell-solver + pillow ]; patches = [ @@ -35,6 +52,7 @@ buildPythonApplication rec { postInstall = '' mkdir $out/share/PySolFC/cardsets cp -r $cardsets/* $out/share/PySolFC/cardsets + cp -r $music/data/music $out/share/PySolFC ''; # No tests in archive diff --git a/pkgs/games/wolfstoneextract/default.nix b/pkgs/games/wolfstoneextract/default.nix new file mode 100644 index 0000000000000..159e6ae3f15ca --- /dev/null +++ b/pkgs/games/wolfstoneextract/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchFromBitbucket +, cmake +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "wolfstoneextract"; + version = "1.2"; + + src = fetchFromBitbucket { + owner = "ecwolf"; + repo = "wolfstoneextract"; + rev = finalAttrs.version; + hash = "sha256-yrYLP2ewOtiry+EgH1IEaxz2Q55mqQ6mRGSxzVUnJ8Q="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + description = "Utility to extract Wolfstone data from Wolfenstein II"; + homepage = "https://bitbucket.org/ecwolf/wolfstoneextract/src/master/"; + platforms = [ "x86_64-linux" ]; + license = with licenses; [ gpl3Only bsd3 ]; + maintainers = with maintainers; [ keenanweaver ]; + }; +}) diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index fe1bb139a10b4..3dba3de332c25 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "23.17.26241.15"; + version = "23.17.26241.24"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - sha256 = "sha256-A0gtSM6e+VcfcGG/6zReV2LIXq6tGbWIwDQFlQ2TW28="; + sha256 = "sha256-FcI9bBJc23UlPP7qSBUc+t4e1X3UEJTYiy86N3KVWrs="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 2e0a9cfd8c463..2c9eb76b45483 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.3.4"; #zen + version = "6.4.1"; #zen suffix = "zen1"; #zen - sha256 = "1dj5pk8fqf4plk5nri6cajwvdcs9b6gpfk1y620vi3g7w15p1gvx"; #zen + sha256 = "05a3dplzz6vy5gjz9yd1hz7n4xf3mlr2q112kf3yabg8k8izqnys"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "6.3.4"; #lqx - suffix = "lqx1"; #lqx - sha256 = "06xkcrd4wjpj23dnrfbyxyx1699vxzswb3r6p2xjwmpy44j5wjgf"; #lqx + version = "6.3.11"; #lqx + suffix = "lqx2"; #lqx + sha256 = "0hpzafw2zwy25ss4cwj6mm8pr1nnv680m8bfcal29f7gaxbm96k8"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/pkgs/servers/sip/kamailio/default.nix b/pkgs/servers/sip/kamailio/default.nix new file mode 100644 index 0000000000000..c4677e37f1f2e --- /dev/null +++ b/pkgs/servers/sip/kamailio/default.nix @@ -0,0 +1,76 @@ +{ callPackage +, fetchurl +, lib +, pkgs +, stdenv +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "kamailio"; + version = "5.7.1"; + + meta = { + description = "Fast and flexible SIP server, proxy, SBC, and load balancer"; + homepage = "https://www.kamailio.org/"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ mawis ]; + platforms = lib.platforms.linux; + }; + + src = fetchurl { + url = "https://www.kamailio.org/pub/kamailio/5.7.1/src/kamailio-${finalAttrs.version}_src.tar.gz"; + hash = "sha256-TkrAj5ohwzJ959UvXNwaMmcIwTRowUitP9/UNQ8D1zw="; + }; + + buildInputs = with pkgs; [ + bison + flex + gnugrep + json_c.dev + libevent.dev + libxml2.dev + mariadb-connector-c.dev + pcre.dev + ]; + + nativeBuildInputs = with pkgs; [ + pkg-config + which + ]; + + configurePhase = '' + runHook preConfigure + + make PREFIX="$out" include_modules="db_mysql dialplan jsonrpcc json lcr presence presence_conference presence_dialoginfo presence_mwi presence_profile presence_reginfo presence_xml pua pua_bla pua_dialoginfo pua_json pua_reginfo pua_rpc pua_usrloc pua_xmpp regex rls xcap_client xcap_server" cfg + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + make MYSQLCFG=${pkgs.mariadb-connector-c.dev}/bin/mariadb_config all + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + make MYSQLCFG=${pkgs.mariadb-connector-c.dev}/bin/mariadb_config install + echo 'MD5="${pkgs.coreutils}/bin/md5sum"' >> $out/etc/kamailio/kamctlrc + echo 'AWK="${pkgs.gawk}/bin/awk"' >> $out/etc/kamailio/kamctlrc + echo 'GDB="${pkgs.gdb}/bin/gdb"' >> $out/etc/kamailio/kamctlrc + echo 'GREP="${pkgs.gnugrep}/bin/grep "' >> $out/etc/kamailio/kamctlrc + echo 'EGREP="${pkgs.gnugrep}/bin/grep -E"' >> $out/etc/kamailio/kamctlrc + echo 'SED="${pkgs.gnused}/bin/sed"' >> $out/etc/kamailio/kamctlrc + echo 'LAST_LINE="${pkgs.coreutils}/bin/tail -n 1"' >> $out/etc/kamailio/kamctlrc + echo 'EXPR="${pkgs.gnugrep}/bin/expr"' >> $out/etc/kamailio/kamctlrc + + runHook postInstall + ''; + + passthru.tests = { + kamailio-bin = callPackage ./test-kamailio-bin {}; + }; +}) diff --git a/pkgs/servers/sip/kamailio/test-kamailio-bin/default.nix b/pkgs/servers/sip/kamailio/test-kamailio-bin/default.nix new file mode 100644 index 0000000000000..5d6eea600959c --- /dev/null +++ b/pkgs/servers/sip/kamailio/test-kamailio-bin/default.nix @@ -0,0 +1,24 @@ +{ stdenv, kamailio }: + +stdenv.mkDerivation { + name = "kamailio-bin-test"; + meta.timeout = 60; + src = ./.; + + dontInstall = true; + + buildPhase = '' + mkdir $out + + ${kamailio}/bin/kamailio -v > $out/kamailio-stdout + ${kamailio}/bin/kamcmd -h > $out/kamcmd-stdout + (${kamailio}/bin/kamctl help || exit 0) > $out/kamctl-stdout + ''; + + doCheck = true; + checkPhase = '' + grep -q "version: kamailio" $out/kamailio-stdout || (echo "ERROR: kamailio cannot be run"; exit 1) + grep -q "version: kamcmd" $out/kamcmd-stdout || (echo "ERROR: kamcmd cannot be run"; exit 1) + grep -q "add a new subscriber" $out/kamctl-stdout || (echo "ERROR: kamctl cannot be run"; exit 1) + ''; +} diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index c1c9829db4257..7df1d03eef972 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -1,14 +1,17 @@ { lib, stdenv, fetchurl, cmake, python3, bison, openssl, readline, bzip2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "monetdb"; - version = "11.45.17"; + version = "11.47.3"; src = fetchurl { - url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2"; - sha256 = "sha256-sVRNnaklw2mHkTz8Kw6x8uPfdN+I1n1tOjHBslyMpGc="; + url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${finalAttrs.version}.tar.bz2"; + hash = "sha256-0vhcPh4ZXCAKpgiSZstu6vBQv7VwOYc6qoz8dPkugNE="; }; + nativeBuildInputs = [ bison cmake python3 ]; + buildInputs = [ openssl readline bzip2 ]; + postPatch = '' substituteInPlace cmake/monetdb-packages.cmake --replace \ 'get_os_release_info(LINUX_DISTRO LINUX_DISTRO_VERSION)' \ @@ -27,9 +30,6 @@ stdenv.mkDerivation rec { $out/bin/Mconvert.py ''; - nativeBuildInputs = [ cmake python3 ]; - buildInputs = [ bison openssl readline bzip2 ]; - meta = with lib; { description = "An open source database system"; homepage = "https://www.monetdb.org/"; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = [ maintainers.StillerHarpo ]; }; -} +}) diff --git a/pkgs/servers/static-web-server/default.nix b/pkgs/servers/static-web-server/default.nix index 0cedcd50768df..24024d235ff01 100644 --- a/pkgs/servers/static-web-server/default.nix +++ b/pkgs/servers/static-web-server/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin, nixosTests }: rustPlatform.buildRustPackage rec { pname = "static-web-server"; @@ -24,6 +24,13 @@ rustPlatform.buildRustPackage rec { "--skip=handle_precondition" ]; + # Need to copy in the systemd units for systemd.packages to discover them + postInstall = '' + install -Dm444 -t $out/lib/systemd/system/ systemd/static-web-server.{service,socket} + ''; + + passthru.tests = { inherit (nixosTests) static-web-server; }; + meta = with lib; { description = "An asynchronus web server for static files-serving"; homepage = "https://static-web-server.net/"; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index bf7cb3aceb49b..b729f5703ca36 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -8,11 +8,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! appres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXt }: stdenv.mkDerivation { pname = "appres"; - version = "1.0.5"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/appres-1.0.5.tar.bz2"; - sha256 = "0a2r4sxky3k7b3kdb5pbv709q9b5zi3gxjz336wl66f828vqkbgz"; + url = "mirror://xorg/individual/app/appres-1.0.6.tar.xz"; + sha256 = "02sr4f1bm3y1w24gsvjfzvbpac1kgkq27v1s68q87bd1l3i5f8lb"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -27,7 +27,7 @@ self: with self; { version = "1.1.1"; builder = ./builder.sh; src = fetchurl { - url = "https://xorg.freedesktop.org/archive/individual/util/bdftopcf-1.1.1.tar.xz"; + url = "mirror://xorg/individual/util/bdftopcf-1.1.1.tar.xz"; sha256 = "026rzs92h9jsc7r0kvvyvwhm22q0805gp38rs14x6ghg7kam7j8i"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -40,11 +40,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! bitmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "bitmap"; - version = "1.0.9"; + version = "1.1.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/bitmap-1.0.9.tar.gz"; - sha256 = "0kzbv5wh02798l77y9y8d8sjkmzm9cvsn3rjh8a86v5waj50apsb"; + url = "mirror://xorg/individual/app/bitmap-1.1.0.tar.xz"; + sha256 = "141nhfmrg14axvix2mc34vfs07gmki3k14qq1vqy7v7f5yf8g1lf"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -56,11 +56,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! editres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "editres"; - version = "1.0.7"; + version = "1.0.8"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/editres-1.0.7.tar.bz2"; - sha256 = "04awfwmy3f9f0bchidc4ssbgrbicn5gzasg3jydpfnp5513d76h8"; + url = "mirror://xorg/individual/app/editres-1.0.8.tar.xz"; + sha256 = "1ydn32x9qh2zkn90w6nfv33gcq75z67w93bakkykadl8n7zmvkw3"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -72,11 +72,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! encodings = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { pname = "encodings"; - version = "1.0.5"; + version = "1.0.7"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/encodings-1.0.5.tar.bz2"; - sha256 = "0caafx0yqqnqyvbalxhh3mb0r9v36xmcy5zjhygb2i508dhy35mx"; + url = "mirror://xorg/individual/font/encodings-1.0.7.tar.xz"; + sha256 = "193hxaygxy2msmf8cyps8jdi0kxga84hj47qv7diqlhn7gsajf9s"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -88,11 +88,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontadobe100dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-adobe-100dpi"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-adobe-100dpi-1.0.3.tar.bz2"; - sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j"; + url = "mirror://xorg/individual/font/font-adobe-100dpi-1.0.4.tar.xz"; + sha256 = "1kwwbaiqnfm3pcysy9gw0g9xhpgmhjcd6clp7zajhqq5br2gyymn"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -106,11 +106,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontadobe75dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-adobe-75dpi"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-adobe-75dpi-1.0.3.tar.bz2"; - sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6"; + url = "mirror://xorg/individual/font/font-adobe-75dpi-1.0.4.tar.xz"; + sha256 = "04drk4wi176524lxjwfrnkr3dwz1hysabqfajpj6klfypqnsd08j"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -124,11 +124,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontadobeutopia100dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-adobe-utopia-100dpi"; - version = "1.0.4"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2"; - sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi"; + url = "mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.5.tar.xz"; + sha256 = "0jq27gs5xpwkghggply5pr215lmamrnpr6x5iia76schg8lyr17v"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -142,11 +142,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontadobeutopia75dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-adobe-utopia-75dpi"; - version = "1.0.4"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2"; - sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7"; + url = "mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.5.tar.xz"; + sha256 = "0q3pg4imdbwwiq2g8a1rypjrgmb33n0r5j9qqnh4ywnh69cj89m7"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -160,11 +160,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontadobeutopiatype1 = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale }: stdenv.mkDerivation { pname = "font-adobe-utopia-type1"; - version = "1.0.4"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2"; - sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p"; + url = "mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.5.tar.xz"; + sha256 = "15snyyy3rk75fikz1hs80nybxai1aynybl0gw32hffv98yy81cjc"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -194,11 +194,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontarabicmisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-arabic-misc"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-arabic-misc-1.0.3.tar.bz2"; - sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah"; + url = "mirror://xorg/individual/font/font-arabic-misc-1.0.4.tar.xz"; + sha256 = "0rrlcqbyx9y7hnhbkjir8rs6jkfqyalj1zvhr8niv2n7a8dydzs6"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -212,11 +212,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontbh100dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-bh-100dpi"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-bh-100dpi-1.0.3.tar.bz2"; - sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13"; + url = "mirror://xorg/individual/font/font-bh-100dpi-1.0.4.tar.xz"; + sha256 = "07mb9781c9yxzp3ifw317v4fbnmg9qyqv0244zfspylihkz5x3zx"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -230,11 +230,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontbh75dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-bh-75dpi"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-bh-75dpi-1.0.3.tar.bz2"; - sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il"; + url = "mirror://xorg/individual/font/font-bh-75dpi-1.0.4.tar.xz"; + sha256 = "1nkwkqdl946xc4xknhi1pnxdww6rxrv013c7nk5x6ganfg0dh9k0"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -248,11 +248,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontbhlucidatypewriter100dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-bh-lucidatypewriter-100dpi"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2"; - sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32"; + url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.4.tar.xz"; + sha256 = "1wp87pijbydkpcmawsyas7vwhad2xg1mkkwigga2jjh9lknhkv3n"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -266,11 +266,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontbhlucidatypewriter75dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-bh-lucidatypewriter-75dpi"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2"; - sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa"; + url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.4.tar.xz"; + sha256 = "1xg86mb9qigf5v0wx0q2shn8qaabsapamj627xllzw31mhwjqkl6"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -284,11 +284,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontbhttf = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale }: stdenv.mkDerivation { pname = "font-bh-ttf"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-bh-ttf-1.0.3.tar.bz2"; - sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"; + url = "mirror://xorg/individual/font/font-bh-ttf-1.0.4.tar.xz"; + sha256 = "0misxkpjc2bir20m01z355sfk3lbpjnshphjzl32p364006zk9c5"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -302,11 +302,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontbhtype1 = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale }: stdenv.mkDerivation { pname = "font-bh-type1"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-bh-type1-1.0.3.tar.bz2"; - sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n"; + url = "mirror://xorg/individual/font/font-bh-type1-1.0.4.tar.xz"; + sha256 = "19kjdm0cx766yj9vwkyv7gyg1q4bjag5g500s7nnppmb0vnc7phr"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -320,11 +320,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontbitstream100dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-bitstream-100dpi"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2"; - sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b"; + url = "mirror://xorg/individual/font/font-bitstream-100dpi-1.0.4.tar.xz"; + sha256 = "19y1j1v65890x8yn6a47jqljfax3ihfrd25xbzgypxz4xy1cc71d"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -338,11 +338,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontbitstream75dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-bitstream-75dpi"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2"; - sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs"; + url = "mirror://xorg/individual/font/font-bitstream-75dpi-1.0.4.tar.xz"; + sha256 = "09pq7dvyyxj6kvps1dm3qr15pjwh9iq9118fryqc5a94fkc39sxa"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -354,13 +354,31 @@ self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! + fontbitstreamspeedo = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale }: stdenv.mkDerivation { + pname = "font-bitstream-speedo"; + version = "1.0.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-bitstream-speedo-1.0.2.tar.gz"; + sha256 = "0wmy58cd3k7w2j4v20icnfs8z3b61qj3vqdx958z18w00h9mzsmf"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; + nativeBuildInputs = [ pkg-config mkfontscale ]; + buildInputs = [ fontutil ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; + meta.platforms = lib.platforms.unix; + }) {}; + + # THIS IS A GENERATED FILE. DO NOT EDIT! fontbitstreamtype1 = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale }: stdenv.mkDerivation { pname = "font-bitstream-type1"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-bitstream-type1-1.0.3.tar.bz2"; - sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6"; + url = "mirror://xorg/individual/font/font-bitstream-type1-1.0.4.tar.xz"; + sha256 = "0a669193ivi2lxk3v692kq1pqavaswlpi9hbi8ib8bfp9j5j6byy"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -374,11 +392,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontcronyxcyrillic = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-cronyx-cyrillic"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2"; - sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf"; + url = "mirror://xorg/individual/font/font-cronyx-cyrillic-1.0.4.tar.xz"; + sha256 = "12dpsvif85z1m6jvq9g91lmzj0rll5rh3871mbvdpzyb1p7821yw"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -392,11 +410,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontcursormisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-cursor-misc"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-cursor-misc-1.0.3.tar.bz2"; - sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp"; + url = "mirror://xorg/individual/font/font-cursor-misc-1.0.4.tar.xz"; + sha256 = "10prshcmmm5ccczyq7yaadz92k23ls9rjl10hjh8rjqka1cwkn95"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -410,11 +428,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontdaewoomisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-daewoo-misc"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-daewoo-misc-1.0.3.tar.bz2"; - sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw"; + url = "mirror://xorg/individual/font/font-daewoo-misc-1.0.4.tar.xz"; + sha256 = "0cagg963v94paq1l9l7g5kyv7df8q31b4zcbhv5rh07kr0yqng7n"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -428,11 +446,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontdecmisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-dec-misc"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-dec-misc-1.0.3.tar.bz2"; - sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1"; + url = "mirror://xorg/individual/font/font-dec-misc-1.0.4.tar.xz"; + sha256 = "1xqs2qg21h5xg519810hw4bvykjdpf0xgk0xwp0bxy4g3lh6inc2"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -446,11 +464,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontibmtype1 = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale }: stdenv.mkDerivation { pname = "font-ibm-type1"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-ibm-type1-1.0.3.tar.bz2"; - sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx"; + url = "mirror://xorg/individual/font/font-ibm-type1-1.0.4.tar.xz"; + sha256 = "0zyfc0mxkzlrbpdn16rj25abf2hcqb592zkks550rm26paamwff4"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -464,11 +482,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontisasmisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-isas-misc"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-isas-misc-1.0.3.tar.bz2"; - sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q"; + url = "mirror://xorg/individual/font/font-isas-misc-1.0.4.tar.xz"; + sha256 = "1z1qqi64hbp297f6ryiswa4ikfn7mcwnb8nadyglni6swsxrbra7"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -482,11 +500,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontjismisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-jis-misc"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-jis-misc-1.0.3.tar.bz2"; - sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b"; + url = "mirror://xorg/individual/font/font-jis-misc-1.0.4.tar.xz"; + sha256 = "1l7spyq93rhydsdnsh46alcfbn2irz664vd209lamxviqkvfzlbq"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -500,11 +518,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontmicromisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-micro-misc"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-micro-misc-1.0.3.tar.bz2"; - sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws"; + url = "mirror://xorg/individual/font/font-micro-misc-1.0.4.tar.xz"; + sha256 = "0hzryqyml0bzzw91vqdmzdlb7dm18jmyz0mxy6plks3sppbbkq1f"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -518,11 +536,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontmisccyrillic = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-misc-cyrillic"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-misc-cyrillic-1.0.3.tar.bz2"; - sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4"; + url = "mirror://xorg/individual/font/font-misc-cyrillic-1.0.4.tar.xz"; + sha256 = "14z9x174fidjn65clkd2y1l6pxspmvphizap9a8h2h06adzil0kn"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -536,11 +554,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontmiscethiopic = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale }: stdenv.mkDerivation { pname = "font-misc-ethiopic"; - version = "1.0.3"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-misc-ethiopic-1.0.3.tar.bz2"; - sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"; + url = "mirror://xorg/individual/font/font-misc-ethiopic-1.0.5.tar.xz"; + sha256 = "04mnd620s9wkdid9wnf181yh5vf0n7l096nc3z4zdvm1w7kafja7"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -554,11 +572,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontmiscmeltho = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale }: stdenv.mkDerivation { pname = "font-misc-meltho"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-misc-meltho-1.0.3.tar.bz2"; - sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p"; + url = "mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz"; + sha256 = "06ajsqjd20zsk9a44bl5i1mv1r9snil6l2947hk8z2bqf30mxgk3"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -572,11 +590,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontmiscmisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-misc-misc"; - version = "1.1.2"; + version = "1.1.3"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-misc-misc-1.1.2.tar.bz2"; - sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"; + url = "mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz"; + sha256 = "1vcgc6lbc53fqaz8alhxcb6f231hhvj9hn2nkzg1mclbymhy7avr"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -590,11 +608,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontmuttmisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-mutt-misc"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-mutt-misc-1.0.3.tar.bz2"; - sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx"; + url = "mirror://xorg/individual/font/font-mutt-misc-1.0.4.tar.xz"; + sha256 = "095vd33kqd157j6xi4sjxwdsjpwpgqliifa8nkybq8rcw7s5j8xi"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -608,11 +626,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontschumachermisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-schumacher-misc"; - version = "1.1.2"; + version = "1.1.3"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-schumacher-misc-1.1.2.tar.bz2"; - sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"; + url = "mirror://xorg/individual/font/font-schumacher-misc-1.1.3.tar.xz"; + sha256 = "0w40lr214n39al449fnm4k1bpyj3fjrhz2yxqd6a6m8yvc69z14b"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -626,11 +644,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontscreencyrillic = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-screen-cyrillic"; - version = "1.0.4"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-screen-cyrillic-1.0.4.tar.bz2"; - sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2"; + url = "mirror://xorg/individual/font/font-screen-cyrillic-1.0.5.tar.xz"; + sha256 = "1h75zn1rp7bdv6av4cnrajpaq6fkd7dx1lc7aijpw32qrnw8nxcg"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -644,11 +662,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontsonymisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-sony-misc"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-sony-misc-1.0.3.tar.bz2"; - sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0"; + url = "mirror://xorg/individual/font/font-sony-misc-1.0.4.tar.xz"; + sha256 = "0swlhjmmagrfkip4i9yq7cr56hains1j41mjs05nxc6c7y19zc76"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -662,11 +680,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontsunmisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-sun-misc"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-sun-misc-1.0.3.tar.bz2"; - sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8"; + url = "mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz"; + sha256 = "17yvhk1hlajm3q57r09q8830zz7cnckrg8hgzajgyyljdl8xv16x"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -696,11 +714,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontutil = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { pname = "font-util"; - version = "1.3.3"; + version = "1.4.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-util-1.3.3.tar.xz"; - sha256 = "1lpb5qd2drilql4wl644m682hvmv67hdbbisnrm0ah4wfy8ci4g7"; + url = "mirror://xorg/individual/font/font-util-1.4.0.tar.xz"; + sha256 = "0z8gsi0bz5nnpsl008fyb4isrkrqrmhxjar5ywwpx30j83wlnwlz"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -712,11 +730,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontwinitzkicyrillic = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-winitzki-cyrillic"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2"; - sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb"; + url = "mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz"; + sha256 = "1a4pz8f7hz6nn9xirz2k1j81ykl3lwrpi1ydmzipciy15l984v9v"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -730,11 +748,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontxfree86type1 = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale }: stdenv.mkDerivation { pname = "font-xfree86-type1"; - version = "1.0.4"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-xfree86-type1-1.0.4.tar.bz2"; - sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"; + url = "mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz"; + sha256 = "0ds8xbgxy9h0bqn2p38vylfzn8cqkp7n51kwmw1c18ayi9w2qg59"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -764,11 +782,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! iceauth = callPackage ({ stdenv, pkg-config, fetchurl, libICE, xorgproto }: stdenv.mkDerivation { pname = "iceauth"; - version = "1.0.8"; + version = "1.0.9"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2"; - sha256 = "1ik0mdidmyvy48hn8p2hwvf3535rf3m96hhf0mvcqrbj44x23vp6"; + url = "mirror://xorg/individual/app/iceauth-1.0.9.tar.xz"; + sha256 = "01cc816fvdkkfcnqnyvgcshcip2jzjivwa8hzdvsz0snak5xzf9c"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -780,11 +798,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! ico = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { pname = "ico"; - version = "1.0.5"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/ico-1.0.5.tar.bz2"; - sha256 = "0gvpwfk9kvlfn631dgizc45qc2qqjn9pavdp2q7qb3drkvr64fyp"; + url = "mirror://xorg/individual/app/ico-1.0.6.tar.xz"; + sha256 = "01a4kykayckxzi4jzggaz3wh9qjcr6f4iykhvq7jhlz767a6kwrq"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1424,7 +1442,7 @@ self: with self; { version = "0.4"; builder = ./builder.sh; src = fetchurl { - url = "https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2"; + url = "mirror://xorg/individual/xcb/libpthread-stubs-0.4.tar.bz2"; sha256 = "0cz7s9w8lqgzinicd4g36rjg08zhsbyngh0w68c3np8nlc8mkl74"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1501,11 +1519,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! listres = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { pname = "listres"; - version = "1.0.4"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/listres-1.0.4.tar.bz2"; - sha256 = "041bxkvv6f92sm3hhm977c4gdqdv5r1jyxjqcqfi8vkrg3s2j4ka"; + url = "mirror://xorg/individual/app/listres-1.0.5.tar.xz"; + sha256 = "17fwfjh0xrvg7jj4h32pa8ns4hq4r11z61kh2xsqvsyjwyxh0anf"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1581,11 +1599,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! oclock = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, libXext, libXmu, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "oclock"; - version = "1.0.4"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/oclock-1.0.4.tar.bz2"; - sha256 = "1zmfzfmdp42nvapf0qz1bc3i3waq5sjrpkgfw64qs4nmq30wy86c"; + url = "mirror://xorg/individual/app/oclock-1.0.5.tar.xz"; + sha256 = "0p4nqfrhy1srqqzbamp7afa54clbydbhprd1nxbd12g8anb9f2cg"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1597,11 +1615,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! sessreg = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { pname = "sessreg"; - version = "1.1.2"; + version = "1.1.3"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/sessreg-1.1.2.tar.bz2"; - sha256 = "0crczl25zynkrslmm8sjaxszhrh4i33m7h5fg4wfdb3k8aarxjyz"; + url = "mirror://xorg/individual/app/sessreg-1.1.3.tar.xz"; + sha256 = "1hmc9wsfgl2wmy0kccwa4brxbv02w5wiz5hrz72dsz87x1fwsah2"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1611,29 +1629,29 @@ self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - setxkbmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { + setxkbmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, libXrandr }: stdenv.mkDerivation { pname = "setxkbmap"; - version = "1.3.2"; + version = "1.3.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/setxkbmap-1.3.2.tar.bz2"; - sha256 = "1xdrxs65v7d0rw1yaz0vsz55w4hxym99216p085ya9978j379wlg"; + url = "mirror://xorg/individual/app/setxkbmap-1.3.4.tar.xz"; + sha256 = "1pps0x66512y3f7v6xgnb6gjbllsgi4q5zxmjcdiv60fsia8b3dy"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libxkbfile ]; + buildInputs = [ libX11 libxkbfile libXrandr ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! smproxy = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libXmu, libXt }: stdenv.mkDerivation { pname = "smproxy"; - version = "1.0.6"; + version = "1.0.7"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2"; - sha256 = "0rkjyzmsdqmlrkx8gy2j4q6iksk58hcc92xzdprkf8kml9ar3wbc"; + url = "mirror://xorg/individual/app/smproxy-1.0.7.tar.xz"; + sha256 = "01gkz4n2pfxiklzzx3ghnm9shx3626jcriwvrs3pvawxrhvr5aaa"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1645,11 +1663,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! transset = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { pname = "transset"; - version = "1.0.2"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/transset-1.0.2.tar.bz2"; - sha256 = "088v8p0yfn4r3azabp6662hqikfs2gjb9xmjjd45gnngwwp19b2b"; + url = "mirror://xorg/individual/app/transset-1.0.3.tar.xz"; + sha256 = "1zp6ldxb3h2zsr4nmkb8aj8ia8v3qvjj3w85by5xh3fxvlq8zqqz"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1659,18 +1677,18 @@ self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - twm = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXext, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + twm = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXext, libXmu, xorgproto, libXrandr, libXt }: stdenv.mkDerivation { pname = "twm"; - version = "1.0.10"; + version = "1.0.12"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/twm-1.0.10.tar.bz2"; - sha256 = "1ms5cj1w3g26zg6bxdv1j9hl0pxr4300qnv003cz1q3cl7ffljb4"; + url = "mirror://xorg/individual/app/twm-1.0.12.tar.xz"; + sha256 = "1r5gfv1gvcjn39v7n6znpnvifwhlw2zf8gfrxq8vph84vva03wma"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libICE libSM libX11 libXext libXmu xorgproto libXt ]; + buildInputs = [ libICE libSM libX11 libXext libXmu xorgproto libXrandr libXt ]; meta.platforms = lib.platforms.unix; }) {}; @@ -1693,11 +1711,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! viewres = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "viewres"; - version = "1.0.5"; + version = "1.0.7"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/viewres-1.0.5.tar.bz2"; - sha256 = "1mz319kfmvcrdpi22dmdr91mif1j0j3ck1f8mmnz5g1r9kl1in2y"; + url = "mirror://xorg/individual/app/viewres-1.0.7.tar.xz"; + sha256 = "0a66mz27gcsxd1qq1ij0w8dv4wjvszgbf5ygw5dga40sbc464nmi"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1773,11 +1791,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xcalc = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xorgproto, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "xcalc"; - version = "1.1.0"; + version = "1.1.2"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2"; - sha256 = "1sxmlcb0sb3h4z05kl5l0kxnhrc0h8c74p9m3zdc7bv58jaldmym"; + url = "mirror://xorg/individual/app/xcalc-1.1.2.tar.xz"; + sha256 = "1m0wzhjvc88kmx12ykdml5rqlz9h2iki9mkfdngji53y8nhxyy45"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1808,7 +1826,7 @@ self: with self; { version = "0.4.1"; builder = ./builder.sh; src = fetchurl { - url = "https://xcb.freedesktop.org/dist/xcb-util-0.4.1.tar.xz"; + url = "mirror://xorg/individual/xcb/xcb-util-0.4.1.tar.xz"; sha256 = "04p54r0zjc44fpw1hdy4rhygv37sx2vr2lllxjihykz5v2xkpgjs"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1824,7 +1842,7 @@ self: with self; { version = "0.1.3"; builder = ./builder.sh; src = fetchurl { - url = "https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2"; + url = "mirror://xorg/individual/xcb/xcb-util-cursor-0.1.3.tar.bz2"; sha256 = "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1840,7 +1858,7 @@ self: with self; { version = "1.0.1"; builder = ./builder.sh; src = fetchurl { - url = "https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.1.tar.xz"; + url = "mirror://xorg/individual/xcb/xcb-util-errors-1.0.1.tar.xz"; sha256 = "0mzkh3xj1n690dw8hrdhyjykd71ib0ls9n5cgf9asna2k1xwha2n"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1856,7 +1874,7 @@ self: with self; { version = "0.4.1"; builder = ./builder.sh; src = fetchurl { - url = "https://xcb.freedesktop.org/dist/xcb-util-image-0.4.1.tar.xz"; + url = "mirror://xorg/individual/xcb/xcb-util-image-0.4.1.tar.xz"; sha256 = "0g8dwknrlz96k176qxh8ar84x9kpppci9b978zyp24nvvbjqxbfc"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1872,7 +1890,7 @@ self: with self; { version = "0.4.1"; builder = ./builder.sh; src = fetchurl { - url = "https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.1.tar.xz"; + url = "mirror://xorg/individual/xcb/xcb-util-keysyms-0.4.1.tar.xz"; sha256 = "0f66snk179hmp8ppgv1zp9y7pl1vzn52znpikm1fsaj1ji90l9kw"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1888,7 +1906,7 @@ self: with self; { version = "0.3.10"; builder = ./builder.sh; src = fetchurl { - url = "https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.10.tar.xz"; + url = "mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.10.tar.xz"; sha256 = "1fh4dnlwlqyccrhmmwlv082a7mxc7ss7vmzmp7xxp39dwbqd859y"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1904,7 +1922,7 @@ self: with self; { version = "0.4.2"; builder = ./builder.sh; src = fetchurl { - url = "https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.2.tar.xz"; + url = "mirror://xorg/individual/xcb/xcb-util-wm-0.4.2.tar.xz"; sha256 = "02wai17mxfbvlnj4l4bjbvah97rccdivzvd7mrznhr32s0hlxhv2"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1917,11 +1935,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xclock = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "xclock"; - version = "1.0.9"; + version = "1.1.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xclock-1.0.9.tar.bz2"; - sha256 = "1fr3q4rszgx7x2zxy2ip592a3fgx20hfwac49p2l5b7jqsr1ying"; + url = "mirror://xorg/individual/app/xclock-1.1.1.tar.xz"; + sha256 = "0b3l1zwz2b1cn46f8pd480b835j9anadf929vqpll107iyzylz6z"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1933,11 +1951,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xcmsdb = callPackage ({ stdenv, pkg-config, fetchurl, libX11 }: stdenv.mkDerivation { pname = "xcmsdb"; - version = "1.0.5"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2"; - sha256 = "1ik7gzlp2igz183x70883000ygp99r20x3aah6xhaslbpdhm6n75"; + url = "mirror://xorg/individual/app/xcmsdb-1.0.6.tar.xz"; + sha256 = "0magrza0i5qwpf0zlpqjychp3bzxgdw3p5v616xl4nbxag2fwxrw"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1947,29 +1965,29 @@ self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xcompmgr = callPackage ({ stdenv, pkg-config, fetchurl, libXcomposite, libXdamage, libXext, libXfixes, libXrender }: stdenv.mkDerivation { + xcompmgr = callPackage ({ stdenv, pkg-config, fetchurl, libXcomposite, libXdamage, libXext, libXfixes, xorgproto, libXrender }: stdenv.mkDerivation { pname = "xcompmgr"; - version = "1.1.8"; + version = "1.1.9"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2"; - sha256 = "0hvjkanrdlvk3ln5a1jx3c9ggziism2jr1na7jl3zyk0y3sdm28b"; + url = "mirror://xorg/individual/app/xcompmgr-1.1.9.tar.xz"; + sha256 = "1w564walyqi3bqnnl8l2d949v64smipdw2q8lnrixl3jhrlvcxa8"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libXcomposite libXdamage libXext libXfixes libXrender ]; + buildInputs = [ libXcomposite libXdamage libXext libXfixes xorgproto libXrender ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! xconsole = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "xconsole"; - version = "1.0.7"; + version = "1.0.8"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2"; - sha256 = "1q2ib1626i5da0nda09sp3vzppjrcn82fff83cw7hwr0vy14h56i"; + url = "mirror://xorg/individual/app/xconsole-1.0.8.tar.xz"; + sha256 = "195vhqjrzjf4kkzmy0kx50n1bv2kj9fg7mi18mm2w3p4d3q6ljkv"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1979,18 +1997,18 @@ self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xcursorgen = callPackage ({ stdenv, pkg-config, fetchurl, libpng, libX11, libXcursor }: stdenv.mkDerivation { + xcursorgen = callPackage ({ stdenv, pkg-config, fetchurl, libpng, libX11, libXcursor, xorgproto }: stdenv.mkDerivation { pname = "xcursorgen"; - version = "1.0.7"; + version = "1.0.8"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2"; - sha256 = "0ggbv084cavp52hjgcz3vdj0g018axs0m23c03lpc5sgn92gidim"; + url = "mirror://xorg/individual/app/xcursorgen-1.0.8.tar.xz"; + sha256 = "16yc82k4vp7icmf9247z4v38r65pdf032mrpzxj5wa2fggi3rcrj"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libpng libX11 libXcursor ]; + buildInputs = [ libpng libX11 libXcursor xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; @@ -2013,11 +2031,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xdm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "xdm"; - version = "1.1.12"; + version = "1.1.14"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xdm-1.1.12.tar.bz2"; - sha256 = "1x17hdymf6rd8jmh4n1sd4g5a8ayr5w94nwjw84qs2fs5pvq7lhd"; + url = "mirror://xorg/individual/app/xdm-1.1.14.tar.xz"; + sha256 = "0prx5h0xmv08yvm0axzh74a90cyc1s1dcv98jpjwjzkr6rbg56ry"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -2029,11 +2047,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xdpyinfo = callPackage ({ stdenv, pkg-config, fetchurl, libdmx, libX11, libxcb, libXcomposite, libXext, libXi, libXinerama, xorgproto, libXrender, libXtst, libXxf86dga, libXxf86misc, libXxf86vm }: stdenv.mkDerivation { pname = "xdpyinfo"; - version = "1.3.2"; + version = "1.3.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2"; - sha256 = "0ldgrj4w2fa8jng4b3f3biaj0wyn8zvya88pnk70d7k12pcqw8rh"; + url = "mirror://xorg/individual/app/xdpyinfo-1.3.4.tar.xz"; + sha256 = "0aw2yhx4ys22231yihkzhnw9jsyzksl4yyf3sx0689npvf0sbbd8"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -2045,11 +2063,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xdriinfo = callPackage ({ stdenv, pkg-config, fetchurl, libGL, xorgproto, libX11 }: stdenv.mkDerivation { pname = "xdriinfo"; - version = "1.0.6"; + version = "1.0.7"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2"; - sha256 = "0lcx8h3zd11m4w8wf7dyp89826d437iz78cyrix436bqx31x5k6r"; + url = "mirror://xorg/individual/app/xdriinfo-1.0.7.tar.xz"; + sha256 = "0d7p9fj3znq0av9pjgi2kphqaz5w7b9hxlz63zbxs69bknp8p0yx"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -2061,11 +2079,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xev = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXrandr }: stdenv.mkDerivation { pname = "xev"; - version = "1.2.4"; + version = "1.2.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xev-1.2.4.tar.bz2"; - sha256 = "1ql592pdhddhkipkrsxn929y9l2nn02a5fh2z3dx47kmzs5y006p"; + url = "mirror://xorg/individual/app/xev-1.2.5.tar.xz"; + sha256 = "1hbfwcnbyz4w13fbhnghl0vdhf6w9f9pb7jgjwrhykkii51ilin9"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -2909,11 +2927,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xfd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt, gettext, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "xfd"; - version = "1.1.3"; + version = "1.1.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xfd-1.1.3.tar.bz2"; - sha256 = "0n6r1v8sm0z0ycqch035xpm46nv5v4mav3kxh36883l3ln5r6bqr"; + url = "mirror://xorg/individual/app/xfd-1.1.4.tar.xz"; + sha256 = "1zbnj0z28dx2rm2h7pjwcz7z1jnl28gz0v9xn3hs2igxcvxhyiym"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -2923,29 +2941,29 @@ self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xfontsel = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { + xfontsel = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "xfontsel"; - version = "1.0.6"; + version = "1.1.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2"; - sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5"; + url = "mirror://xorg/individual/app/xfontsel-1.1.0.tar.xz"; + sha256 = "1d6ifx6sw97mmr00bhfakyx2f94w14yswxc68sw49zmvawrjq18p"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; - buildInputs = [ libX11 libXaw libXmu libXt ]; + buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! xfs = callPackage ({ stdenv, pkg-config, fetchurl, libXfont2, xorgproto, xtrans }: stdenv.mkDerivation { pname = "xfs"; - version = "1.2.0"; + version = "1.2.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xfs-1.2.0.tar.bz2"; - sha256 = "0q4q4rbzx159sfn2n52y039fki6nc6a39qdfxa78yjc3aw8i48nv"; + url = "mirror://xorg/individual/app/xfs-1.2.1.tar.xz"; + sha256 = "1rn1l76z4l133491wb1klixbwb8az5cnrzwx37fb3vnpmplc72ix"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -2957,11 +2975,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xfsinfo = callPackage ({ stdenv, pkg-config, fetchurl, libFS, xorgproto }: stdenv.mkDerivation { pname = "xfsinfo"; - version = "1.0.6"; + version = "1.0.7"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xfsinfo-1.0.6.tar.bz2"; - sha256 = "1mmir5i7gm71xc0ba8vnizi4744vsd31hknhi4cmgvg6kadqngla"; + url = "mirror://xorg/individual/app/xfsinfo-1.0.7.tar.xz"; + sha256 = "0x48p4hk0lds2s8nwzgfl616r99s28ydx02zs7p1fxxs3i2wmwwj"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -2973,11 +2991,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xgamma = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXxf86vm }: stdenv.mkDerivation { pname = "xgamma"; - version = "1.0.6"; + version = "1.0.7"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2"; - sha256 = "1lr2nb1fhg5fk2fchqxdxyl739602ggwhmgl2wiv5c8qbidw7w8f"; + url = "mirror://xorg/individual/app/xgamma-1.0.7.tar.xz"; + sha256 = "13xw2fqp9cs7xj3nqi8khqxv81rk0dd8khp59xgs2lw9bbldly8w"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -2989,11 +3007,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xgc = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "xgc"; - version = "1.0.5"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xgc-1.0.5.tar.bz2"; - sha256 = "0pigvjd3i9fchmj1inqy151aafz3dr0vq1h2zizdb2imvadqv0hl"; + url = "mirror://xorg/individual/app/xgc-1.0.6.tar.xz"; + sha256 = "0h5jm2946f5m1g8a3qh1c01h3zrsjjivi09vi9rmij2frvdvp1vv"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3021,11 +3039,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xinit = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { pname = "xinit"; - version = "1.4.1"; + version = "1.4.2"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xinit-1.4.1.tar.bz2"; - sha256 = "1fdbakx59vyh474skjydj1bbglpby3y03nl7mxn0z9v8gdhqz6yy"; + url = "mirror://xorg/individual/app/xinit-1.4.2.tar.xz"; + sha256 = "08qz6f6yhis6jdcp6hzspql6ib9a9zp0ddhhbac1b7zg4a6xrn5p"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3037,11 +3055,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXi, libXinerama, libXrandr }: stdenv.mkDerivation { pname = "xinput"; - version = "1.6.3"; + version = "1.6.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xinput-1.6.3.tar.bz2"; - sha256 = "1vb6xdd1xmk5f7pwc5zcbxfray5sf1vbnscqwf2yl8lv7gfq38im"; + url = "mirror://xorg/individual/app/xinput-1.6.4.tar.xz"; + sha256 = "1j2pf28c54apr56v1fmvprp657n6x4sdrv8f24rx3138cl6x015d"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3069,11 +3087,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xkbevd = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { pname = "xkbevd"; - version = "1.1.4"; + version = "1.1.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2"; - sha256 = "0sprjx8i86ljk0l7ldzbz2xlk8916z5zh78cafjv8k1a63js4c14"; + url = "mirror://xorg/individual/app/xkbevd-1.1.5.tar.xz"; + sha256 = "0swjhk33fp15060hhzycmk288ys51wwm6l7p9xy4blz95mq7nd9q"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3085,11 +3103,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xkbprint = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { pname = "xkbprint"; - version = "1.0.4"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2"; - sha256 = "04iyv5z8aqhabv7wcpvbvq0ji0jrz1666vw6gvxkvl7szswalgqb"; + url = "mirror://xorg/individual/app/xkbprint-1.0.6.tar.xz"; + sha256 = "1c57kb8d8cbf720n9bcjhhaqpk08lac0sk4l0jp8j0mryw299k4r"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3101,11 +3119,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xkbutils = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXaw, libXt }: stdenv.mkDerivation { pname = "xkbutils"; - version = "1.0.4"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2"; - sha256 = "0c412isxl65wplhl7nsk12vxlri29lk48g3p52hbrs3m0awqm8fj"; + url = "mirror://xorg/individual/app/xkbutils-1.0.5.tar.xz"; + sha256 = "197f4pgw3jdnlp7sj37f3xf15ayad20sl7vvg2rvx0j5qplsi97n"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3133,11 +3151,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xkill = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { pname = "xkill"; - version = "1.0.5"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xkill-1.0.5.tar.bz2"; - sha256 = "0szzd9nzn0ybkhnfyizb876irwnjsnb78rcaxx6prb71jmmbpw65"; + url = "mirror://xorg/individual/app/xkill-1.0.6.tar.xz"; + sha256 = "01xrmqw498hqlhn6l1sq89s31k6sjf6xlij6a08pnrvmqiwama75"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3149,11 +3167,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xload = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, gettext, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "xload"; - version = "1.1.3"; + version = "1.1.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xload-1.1.3.tar.bz2"; - sha256 = "01sr6yd6yhyyfgn88l867w6h9dn5ikcynaz5rwji6xqxhw1lhkpk"; + url = "mirror://xorg/individual/app/xload-1.1.4.tar.xz"; + sha256 = "0c9h6w4bd1q3k4cy8v56sc3v9cg94cpg3xr057sf096v428vjil3"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3165,11 +3183,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xlsatoms = callPackage ({ stdenv, pkg-config, fetchurl, libxcb }: stdenv.mkDerivation { pname = "xlsatoms"; - version = "1.1.3"; + version = "1.1.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xlsatoms-1.1.3.tar.bz2"; - sha256 = "10m3a046jvaw5ywx4y65kl84lsxqan70gww1g1r7cf96ijaqz1jp"; + url = "mirror://xorg/individual/app/xlsatoms-1.1.4.tar.xz"; + sha256 = "1dviriynilkw0jwl0s2h8y95pwh8cxj95cnmllkd6rn0args3gzl"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3181,11 +3199,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xlsclients = callPackage ({ stdenv, pkg-config, fetchurl, libxcb }: stdenv.mkDerivation { pname = "xlsclients"; - version = "1.1.4"; + version = "1.1.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xlsclients-1.1.4.tar.bz2"; - sha256 = "1h8931sn34mcip6vpi4v7hdmr1r58gkbw4s2p97w98kykks2lgvp"; + url = "mirror://xorg/individual/app/xlsclients-1.1.5.tar.xz"; + sha256 = "1qxsav5gicsfwv1dqlcfpj47vy9i30i7iysrfx5aql02wxbyxfk8"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3197,11 +3215,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xlsfonts = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { pname = "xlsfonts"; - version = "1.0.6"; + version = "1.0.7"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xlsfonts-1.0.6.tar.bz2"; - sha256 = "0s6kxgv78chkwsqmhw929f4pf91gq63f4yvixxnan1h00cx0pf49"; + url = "mirror://xorg/individual/app/xlsfonts-1.0.7.tar.xz"; + sha256 = "0r84wp4352hbfcaybqp2khipm40293byvrfyrlslrd37m52njwkv"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3213,11 +3231,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xmag = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "xmag"; - version = "1.0.6"; + version = "1.0.7"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xmag-1.0.6.tar.bz2"; - sha256 = "0qg12ifbbk9n8fh4jmyb625cknn8ssj86chd6zwdiqjin8ivr8l7"; + url = "mirror://xorg/individual/app/xmag-1.0.7.tar.xz"; + sha256 = "0qblrqrhxml2asgbck53a1v7c4y7ap7jcyqjg500h1i7bb63d680"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3229,11 +3247,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xmessage = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "xmessage"; - version = "1.0.5"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2"; - sha256 = "0a90kfm0qz8cn2pbpqfyqrc5s9bfvvy14nj848ynvw56wy0zng9p"; + url = "mirror://xorg/individual/app/xmessage-1.0.6.tar.xz"; + sha256 = "04kahkk3kd6p1xlzf0jwfgnrb5z2r3y55q3p12b6n59py52wbsnj"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3245,11 +3263,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xmodmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { pname = "xmodmap"; - version = "1.0.10"; + version = "1.0.11"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2"; - sha256 = "0z28331i2pm16x671fa9qwsfqdmr6a43bzwmp0dm17a3sx0hjgs7"; + url = "mirror://xorg/individual/app/xmodmap-1.0.11.tar.xz"; + sha256 = "10byhzdfv1xckqc3d2v52xg1ggxn5j806x4450l3ig5hyxl82bws"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3357,11 +3375,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xpr = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { pname = "xpr"; - version = "1.0.5"; + version = "1.1.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xpr-1.0.5.tar.bz2"; - sha256 = "07qy9lwjvxighcmg6qvjkgagad3wwvidrfx0jz85lgynz3qy0dmr"; + url = "mirror://xorg/individual/app/xpr-1.1.0.tar.xz"; + sha256 = "1iaphm96kha6bzz34cj82r2lp5hrdpqwdca04iij4rinflab3fx0"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3389,11 +3407,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xrandr = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXrandr, libXrender }: stdenv.mkDerivation { pname = "xrandr"; - version = "1.5.1"; + version = "1.5.2"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xrandr-1.5.1.tar.xz"; - sha256 = "0ql75s1n3dm2m3g1ilb9l6hqh15r0v709bgghpwazy3jknpnvivv"; + url = "mirror://xorg/individual/app/xrandr-1.5.2.tar.xz"; + sha256 = "0h7jy4c5zgrr06fimnnxhy5ba782b1n4aik29g6bln4h1mwy9gn8"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3405,11 +3423,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xrdb = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { pname = "xrdb"; - version = "1.2.1"; + version = "1.2.2"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xrdb-1.2.1.tar.bz2"; - sha256 = "1d78prd8sfszq2rwwlb32ksph4fymf988lp75aj8iysg44f06pag"; + url = "mirror://xorg/individual/app/xrdb-1.2.2.tar.xz"; + sha256 = "1x1ka0zbcw66a06jvsy92bvnsj9vxbvnq1hbn1az4f0v4fmzrx9i"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3421,11 +3439,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xrefresh = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { pname = "xrefresh"; - version = "1.0.6"; + version = "1.0.7"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2"; - sha256 = "0lv3rlshh7s0z3aqx5ahnnf8cl082m934bk7gv881mz8nydznz98"; + url = "mirror://xorg/individual/app/xrefresh-1.0.7.tar.xz"; + sha256 = "07hvfw3rdv8mzqmm9ax5z8kw544insdd152f2z8868ply8sxdwd9"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3453,11 +3471,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xsetroot = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xbitmaps, libXcursor, libXmu, xorgproto }: stdenv.mkDerivation { pname = "xsetroot"; - version = "1.1.2"; + version = "1.1.3"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2"; - sha256 = "0z21mqvmdl6rl63q77479wgkfygnll57liza1i3va7sr4fx45i0h"; + url = "mirror://xorg/individual/app/xsetroot-1.1.3.tar.xz"; + sha256 = "1l9qcv4mldj70slnmfg56nv7yh9j9ca1x795bl26whmlkrdb90b0"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3467,29 +3485,29 @@ self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xsm = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXaw, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { + xsm = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXaw, xorgproto, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "xsm"; - version = "1.0.4"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xsm-1.0.4.tar.bz2"; - sha256 = "09a4ss1fnrh1sgm21r4n5pivawf34paci3rn6mscyljf7a4vcd4r"; + url = "mirror://xorg/individual/app/xsm-1.0.5.tar.xz"; + sha256 = "0bgvwvj99yqivy4dyxrfa0anwvh5d634gz0w43zy8cn17ymgsc4w"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; - buildInputs = [ libICE libSM libX11 libXaw libXt ]; + buildInputs = [ libICE libSM libX11 libXaw xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! xstdcmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { pname = "xstdcmap"; - version = "1.0.4"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xstdcmap-1.0.4.tar.bz2"; - sha256 = "12vgzsxv4rw25frkgjyli6w6hy10lgpvsx9wzw2v5l5a3qzqp286"; + url = "mirror://xorg/individual/app/xstdcmap-1.0.5.tar.xz"; + sha256 = "1061b95j08mlwpadyilmpbzfgmm08z69k8nrkbn9k11rg7ilfn1n"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3533,11 +3551,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xvinfo = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXv }: stdenv.mkDerivation { pname = "xvinfo"; - version = "1.1.4"; + version = "1.1.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xvinfo-1.1.4.tar.bz2"; - sha256 = "0gz7fvxavqlrqynpfbrm2nc9yx8h0ksnbnv34fj7n1q6cq6j4lq3"; + url = "mirror://xorg/individual/app/xvinfo-1.1.5.tar.xz"; + sha256 = "0164qpbjmxxa1rbvh6ay1iz2qnp9hl1745k9pk6195kdnbn73piy"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3549,11 +3567,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xwd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, xorgproto }: stdenv.mkDerivation { pname = "xwd"; - version = "1.0.8"; + version = "1.0.9"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xwd-1.0.8.tar.bz2"; - sha256 = "06q36fh55r62ms0igfxsanrn6gv8lh794q1bw9xzw51p2qs2papv"; + url = "mirror://xorg/individual/app/xwd-1.0.9.tar.xz"; + sha256 = "0gxx3y9zlh13jgwkayxljm6i58ng8jc1xzqv2g8s7d3yjj21n4nw"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3565,11 +3583,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xwininfo = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxcb, xorgproto }: stdenv.mkDerivation { pname = "xwininfo"; - version = "1.1.4"; + version = "1.1.6"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2"; - sha256 = "00avrpw4h5mr1klp41lv2j4dmq465v6l5kb5bhm4k5ml8sm9i543"; + url = "mirror://xorg/individual/app/xwininfo-1.1.6.tar.xz"; + sha256 = "0gr5m4lyvkil3cl63zf0sw7bq5qgraqrnvddk6xgk3a42xy8j61m"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3581,11 +3599,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xwud = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { pname = "xwud"; - version = "1.0.5"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xwud-1.0.5.tar.bz2"; - sha256 = "1a8hdgy40smvblnh3s9f0vkqckl68nmivx7d48zk34m8z18p16cr"; + url = "mirror://xorg/individual/app/xwud-1.0.6.tar.xz"; + sha256 = "1zhsih1l3x1038fi1wi9npvfnn8j7580ca73saixjg5sbv8qq134"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 9d63228220e71..08eb42d0cb334 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -164,7 +164,6 @@ self: super: }); xdm = super.xdm.overrideAttrs (attrs: { - patches = (attrs.patches or []) ++ [ ./xdm-fix-header-inclusion.patch ]; buildInputs = attrs.buildInputs ++ [ libxcrypt ]; configureFlags = attrs.configureFlags or [] ++ [ "ac_cv_path_RAWCPP=${stdenv.cc.targetPrefix}cpp" @@ -856,14 +855,6 @@ self: super: "--with-launchdaemons-dir=\${out}/LaunchDaemons" "--with-launchagents-dir=\${out}/LaunchAgents" ]; - patches = [ - # don't unset DBUS_SESSION_BUS_ADDRESS in startx - (fetchpatch { - name = "dont-unset-DBUS_SESSION_BUS_ADDRESS.patch"; - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/40f3ac0a31336d871c76065270d3f10e922d06f3/trunk/fs46369.patch"; - sha256 = "18kb88i3s9nbq2jxl7l2hyj6p56c993hivk8mzxg811iqbbawkp7"; - }) - ]; postPatch = '' # Avoid replacement of word-looking cpp's builtin macros in Nix's cross-compiled paths substituteInPlace Makefile.in --replace "PROGCPPDEFS =" "PROGCPPDEFS = -Dlinux=linux -Dunix=unix" diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 941504a62b14e..935515e432a77 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -1,78 +1,77 @@ https://invisible-mirror.net/archives/luit/luit-20190106.tgz -https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2 -https://xcb.freedesktop.org/dist/xcb-util-0.4.1.tar.xz -https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2 -https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.1.tar.xz -https://xcb.freedesktop.org/dist/xcb-util-image-0.4.1.tar.xz -https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.1.tar.xz -https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.10.tar.xz -https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.2.tar.xz -mirror://xorg/individual/app/appres-1.0.5.tar.bz2 -https://xorg.freedesktop.org/archive/individual/util/bdftopcf-1.1.1.tar.xz -mirror://xorg/individual/app/bitmap-1.0.9.tar.gz -mirror://xorg/individual/app/editres-1.0.7.tar.bz2 +mirror://xorg/individual/xcb/libpthread-stubs-0.4.tar.bz2 +mirror://xorg/individual/xcb/xcb-util-0.4.1.tar.xz +mirror://xorg/individual/xcb/xcb-util-cursor-0.1.3.tar.bz2 +mirror://xorg/individual/xcb/xcb-util-errors-1.0.1.tar.xz +mirror://xorg/individual/xcb/xcb-util-image-0.4.1.tar.xz +mirror://xorg/individual/xcb/xcb-util-keysyms-0.4.1.tar.xz +mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.10.tar.xz +mirror://xorg/individual/xcb/xcb-util-wm-0.4.2.tar.xz +mirror://xorg/individual/app/appres-1.0.6.tar.xz +mirror://xorg/individual/app/bitmap-1.1.0.tar.xz +mirror://xorg/individual/app/editres-1.0.8.tar.xz mirror://xorg/individual/app/fonttosfnt-1.2.2.tar.bz2 -mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 -mirror://xorg/individual/app/ico-1.0.5.tar.bz2 -mirror://xorg/individual/app/listres-1.0.4.tar.bz2 +mirror://xorg/individual/app/iceauth-1.0.9.tar.xz +mirror://xorg/individual/app/ico-1.0.6.tar.xz +mirror://xorg/individual/app/listres-1.0.5.tar.xz mirror://xorg/individual/app/mkfontscale-1.2.2.tar.xz -mirror://xorg/individual/app/oclock-1.0.4.tar.bz2 -mirror://xorg/individual/app/sessreg-1.1.2.tar.bz2 -mirror://xorg/individual/app/setxkbmap-1.3.2.tar.bz2 -mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2 -mirror://xorg/individual/app/transset-1.0.2.tar.bz2 -mirror://xorg/individual/app/twm-1.0.10.tar.bz2 -mirror://xorg/individual/app/viewres-1.0.5.tar.bz2 +mirror://xorg/individual/app/oclock-1.0.5.tar.xz +mirror://xorg/individual/app/sessreg-1.1.3.tar.xz +mirror://xorg/individual/app/setxkbmap-1.3.4.tar.xz +mirror://xorg/individual/app/smproxy-1.0.7.tar.xz +mirror://xorg/individual/app/transset-1.0.3.tar.xz +mirror://xorg/individual/app/twm-1.0.12.tar.xz +mirror://xorg/individual/app/viewres-1.0.7.tar.xz mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2 mirror://xorg/individual/app/xauth-1.1.2.tar.xz mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2 -mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2 -mirror://xorg/individual/app/xclock-1.0.9.tar.bz2 -mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2 -mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2 -mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2 -mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2 -mirror://xorg/individual/app/xdm-1.1.12.tar.bz2 -mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2 -mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2 -mirror://xorg/individual/app/xev-1.2.4.tar.bz2 +mirror://xorg/individual/app/xcalc-1.1.2.tar.xz +mirror://xorg/individual/app/xclock-1.1.1.tar.xz +mirror://xorg/individual/app/xcmsdb-1.0.6.tar.xz +mirror://xorg/individual/app/xcompmgr-1.1.9.tar.xz +mirror://xorg/individual/app/xconsole-1.0.8.tar.xz +mirror://xorg/individual/app/xcursorgen-1.0.8.tar.xz +mirror://xorg/individual/app/xdm-1.1.14.tar.xz +mirror://xorg/individual/app/xdpyinfo-1.3.4.tar.xz +mirror://xorg/individual/app/xdriinfo-1.0.7.tar.xz +mirror://xorg/individual/app/xev-1.2.5.tar.xz mirror://xorg/individual/app/xeyes-1.2.0.tar.bz2 -mirror://xorg/individual/app/xfd-1.1.3.tar.bz2 -mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2 -mirror://xorg/individual/app/xfs-1.2.0.tar.bz2 -mirror://xorg/individual/app/xfsinfo-1.0.6.tar.bz2 -mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2 -mirror://xorg/individual/app/xgc-1.0.5.tar.bz2 +mirror://xorg/individual/app/xfd-1.1.4.tar.xz +mirror://xorg/individual/app/xfontsel-1.1.0.tar.xz +mirror://xorg/individual/app/xfs-1.2.1.tar.xz +mirror://xorg/individual/app/xfsinfo-1.0.7.tar.xz +mirror://xorg/individual/app/xgamma-1.0.7.tar.xz +mirror://xorg/individual/app/xgc-1.0.6.tar.xz mirror://xorg/individual/app/xhost-1.0.9.tar.xz -mirror://xorg/individual/app/xinit-1.4.1.tar.bz2 -mirror://xorg/individual/app/xinput-1.6.3.tar.bz2 +mirror://xorg/individual/app/xinit-1.4.2.tar.xz +mirror://xorg/individual/app/xinput-1.6.4.tar.xz mirror://xorg/individual/app/xkbcomp-1.4.6.tar.xz -mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2 -mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2 -mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 -mirror://xorg/individual/app/xkill-1.0.5.tar.bz2 -mirror://xorg/individual/app/xload-1.1.3.tar.bz2 -mirror://xorg/individual/app/xlsatoms-1.1.3.tar.bz2 -mirror://xorg/individual/app/xlsclients-1.1.4.tar.bz2 -mirror://xorg/individual/app/xlsfonts-1.0.6.tar.bz2 -mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 -mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2 -mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2 +mirror://xorg/individual/app/xkbevd-1.1.5.tar.xz +mirror://xorg/individual/app/xkbprint-1.0.6.tar.xz +mirror://xorg/individual/app/xkbutils-1.0.5.tar.xz +mirror://xorg/individual/app/xkill-1.0.6.tar.xz +mirror://xorg/individual/app/xload-1.1.4.tar.xz +mirror://xorg/individual/app/xlsatoms-1.1.4.tar.xz +mirror://xorg/individual/app/xlsclients-1.1.5.tar.xz +mirror://xorg/individual/app/xlsfonts-1.0.7.tar.xz +mirror://xorg/individual/app/xmag-1.0.7.tar.xz +mirror://xorg/individual/app/xmessage-1.0.6.tar.xz +mirror://xorg/individual/app/xmodmap-1.0.11.tar.xz mirror://xorg/individual/app/xmore-1.0.3.tar.bz2 -mirror://xorg/individual/app/xpr-1.0.5.tar.bz2 +mirror://xorg/individual/app/xpr-1.1.0.tar.xz mirror://xorg/individual/app/xprop-1.2.6.tar.xz -mirror://xorg/individual/app/xrandr-1.5.1.tar.xz -mirror://xorg/individual/app/xrdb-1.2.1.tar.bz2 -mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2 +mirror://xorg/individual/app/xrandr-1.5.2.tar.xz +mirror://xorg/individual/app/xrdb-1.2.2.tar.xz +mirror://xorg/individual/app/xrefresh-1.0.7.tar.xz mirror://xorg/individual/app/xset-1.2.5.tar.xz -mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2 -mirror://xorg/individual/app/xsm-1.0.4.tar.bz2 -mirror://xorg/individual/app/xstdcmap-1.0.4.tar.bz2 +mirror://xorg/individual/app/xsetroot-1.1.3.tar.xz +mirror://xorg/individual/app/xsm-1.0.5.tar.xz +mirror://xorg/individual/app/xstdcmap-1.0.5.tar.xz mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2 -mirror://xorg/individual/app/xvinfo-1.1.4.tar.bz2 -mirror://xorg/individual/app/xwd-1.0.8.tar.bz2 -mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2 -mirror://xorg/individual/app/xwud-1.0.5.tar.bz2 +mirror://xorg/individual/app/xvinfo-1.1.5.tar.xz +mirror://xorg/individual/app/xwd-1.0.9.tar.xz +mirror://xorg/individual/app/xwininfo-1.1.6.tar.xz +mirror://xorg/individual/app/xwud-1.0.6.tar.xz mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2 mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2 mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.33.tar.bz2 @@ -129,43 +128,44 @@ mirror://xorg/individual/driver/xf86-video-vmware-13.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2 -mirror://xorg/individual/font/encodings-1.0.5.tar.bz2 -mirror://xorg/individual/font/font-adobe-100dpi-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-adobe-75dpi-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2 -mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2 -mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2 +mirror://xorg/individual/font/encodings-1.0.7.tar.xz +mirror://xorg/individual/font/font-adobe-75dpi-1.0.4.tar.xz +mirror://xorg/individual/font/font-adobe-100dpi-1.0.4.tar.xz +mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.5.tar.xz +mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.5.tar.xz +mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.5.tar.xz mirror://xorg/individual/font/font-alias-1.0.5.tar.xz -mirror://xorg/individual/font/font-arabic-misc-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-bh-100dpi-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-bh-75dpi-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-bh-ttf-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-bh-type1-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-bitstream-type1-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-cursor-misc-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-daewoo-misc-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-dec-misc-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-ibm-type1-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-isas-misc-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-jis-misc-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-micro-misc-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-misc-cyrillic-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-misc-ethiopic-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-misc-meltho-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-misc-misc-1.1.2.tar.bz2 -mirror://xorg/individual/font/font-mutt-misc-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-schumacher-misc-1.1.2.tar.bz2 -mirror://xorg/individual/font/font-screen-cyrillic-1.0.4.tar.bz2 -mirror://xorg/individual/font/font-sony-misc-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-sun-misc-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-util-1.3.3.tar.xz -mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-xfree86-type1-1.0.4.tar.bz2 +mirror://xorg/individual/font/font-arabic-misc-1.0.4.tar.xz +mirror://xorg/individual/font/font-bh-75dpi-1.0.4.tar.xz +mirror://xorg/individual/font/font-bh-100dpi-1.0.4.tar.xz +mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.4.tar.xz +mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.4.tar.xz +mirror://xorg/individual/font/font-bh-ttf-1.0.4.tar.xz +mirror://xorg/individual/font/font-bh-type1-1.0.4.tar.xz +mirror://xorg/individual/font/font-bitstream-75dpi-1.0.4.tar.xz +mirror://xorg/individual/font/font-bitstream-100dpi-1.0.4.tar.xz +mirror://xorg/individual/font/font-bitstream-speedo-1.0.2.tar.gz +mirror://xorg/individual/font/font-bitstream-type1-1.0.4.tar.xz +mirror://xorg/individual/font/font-cronyx-cyrillic-1.0.4.tar.xz +mirror://xorg/individual/font/font-cursor-misc-1.0.4.tar.xz +mirror://xorg/individual/font/font-daewoo-misc-1.0.4.tar.xz +mirror://xorg/individual/font/font-dec-misc-1.0.4.tar.xz +mirror://xorg/individual/font/font-ibm-type1-1.0.4.tar.xz +mirror://xorg/individual/font/font-isas-misc-1.0.4.tar.xz +mirror://xorg/individual/font/font-jis-misc-1.0.4.tar.xz +mirror://xorg/individual/font/font-micro-misc-1.0.4.tar.xz +mirror://xorg/individual/font/font-misc-cyrillic-1.0.4.tar.xz +mirror://xorg/individual/font/font-misc-ethiopic-1.0.5.tar.xz +mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz +mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz +mirror://xorg/individual/font/font-mutt-misc-1.0.4.tar.xz +mirror://xorg/individual/font/font-schumacher-misc-1.1.3.tar.xz +mirror://xorg/individual/font/font-screen-cyrillic-1.0.5.tar.xz +mirror://xorg/individual/font/font-sony-misc-1.0.4.tar.xz +mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz +mirror://xorg/individual/font/font-util-1.4.0.tar.xz +mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz +mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2 mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2 mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2 @@ -211,6 +211,7 @@ mirror://xorg/individual/lib/libXxf86vm-1.1.5.tar.xz mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2 mirror://xorg/individual/proto/xcb-proto-1.14.1.tar.xz mirror://xorg/individual/proto/xorgproto-2021.5.tar.bz2 +mirror://xorg/individual/util/bdftopcf-1.1.1.tar.xz mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2 mirror://xorg/individual/util/imake-1.0.8.tar.bz2 mirror://xorg/individual/util/lndir-1.0.4.tar.xz diff --git a/pkgs/servers/x11/xorg/xdm-fix-header-inclusion.patch b/pkgs/servers/x11/xorg/xdm-fix-header-inclusion.patch deleted file mode 100644 index 7bde988aefd13..0000000000000 --- a/pkgs/servers/x11/xorg/xdm-fix-header-inclusion.patch +++ /dev/null @@ -1,29 +0,0 @@ -On glibc-2.36 this fails with - - genauth.c:45:12: fatal error: bsd/stdlib.h: No such file or directory - 45 | # include <bsd/stdlib.h> - | ^~~~~~~~~~~~~~ - -This is because the file will be included if HAVE_ARC4RANDOM is true and `__linux__` is set. -However, this is wrong: arc4random is now defined in glibc-2.36 and thus stdlib.h must be included -even though HAVE_ARC4RANDOM is true. - -diff --git a/xdm/genauth.c b/xdm/genauth.c -index cd2ad61..74d0ae1 100644 ---- a/xdm/genauth.c -+++ b/xdm/genauth.c -@@ -40,13 +40,7 @@ from The Open Group. - - #include <errno.h> - --#ifdef HAVE_ARC4RANDOM --# ifdef __linux__ --# include <bsd/stdlib.h> --# else --# include <stdlib.h> --# endif --#endif -+#include <stdlib.h> - - #include <time.h> - #define Time_t time_t diff --git a/pkgs/tools/admin/okta-aws-cli/default.nix b/pkgs/tools/admin/okta-aws-cli/default.nix index 7906837fe0596..18bf3f04eebe5 100644 --- a/pkgs/tools/admin/okta-aws-cli/default.nix +++ b/pkgs/tools/admin/okta-aws-cli/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "okta-aws-cli"; - version = "1.0.1"; + version = "1.0.2"; subPackages = [ "cmd/okta-aws-cli" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "okta"; repo = "okta-aws-cli"; rev = "v${version}"; - sha256 = "1qlc04fydcqnifbhrzdw63wq3ndzsyzp4s1bdvfhvizbhdi03mpp"; + sha256 = "sha256-gC5/KwtawVfCx6C5kP0/ZesEzn9XxrPX/X8E8Mb/KUE="; }; - vendorSha256 = "1gzaadpf9zrci7yv88f434mvc7gralb7dj6wl6r4vsv3qk291680"; + vendorHash = "sha256-AJmQxMRj602yodzIdhZV+R22KxnEIbT9iSz/5G5T6r8="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 5efc654337ffc..529c905e385bf 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.83.1"; + version = "0.84.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - hash = "sha256-GZLkz2aadUiSD+v69vLq5BDgn0MSnHVkeGeAFLNDWgM="; + hash = "sha256-1/8M4z/ezyyZRG+amzErOGIv2kRZ/sfx7AAB7V7aPX8="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -22,7 +22,7 @@ buildGoModule rec { }; # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-hv+0qLzGd31CTDGd3STszSUO2BOMRfppyewbJKzGDTg="; + vendorHash = "sha256-WDxHDf+F0QdM/kK2WrStjgzq6h4IPFdsZFbO5qpILp4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/audio/vgmtools/default.nix b/pkgs/tools/audio/vgmtools/default.nix index 2300609beea1b..857bf7c503f31 100644 --- a/pkgs/tools/audio/vgmtools/default.nix +++ b/pkgs/tools/audio/vgmtools/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "vgmtools"; - version = "unstable-2023-05-04"; + version = "unstable-2023-06-29"; src = fetchFromGitHub { owner = "vgmrips"; repo = "vgmtools"; - rev = "0a7814304b9664ff1cf167e209ff354d222773a4"; - hash = "sha256-YEOuT5RN0zFT7rU4KfxYS0Ec+rUL3Flsgx9IrELnhGg="; + rev = "e1f3e053e390bde6bd53b81bd853a0298ccb0ab4"; + hash = "sha256-evIvW9Nk9g7R+EmaQXLmr0ecpAS5Ashditk3komBwyw="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 140ca8c86ea8d..f902be816ba28 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -79,6 +79,11 @@ stdenv.mkDerivation rec { url = "https://github.com/ibus/ibus/commit/7c8abbe89403c2fcb08e3fda42049a97187e53ab.patch"; hash = "sha256-59HzAdLq8ahrF7K+tFGLjTodwIiTkJGEkFe8quqIkhU="; }) + # fix SIGABRT in X11 https://github.com/ibus/ibus/issues/2484 + (fetchpatch { + url = "https://github.com/ibus/ibus/commit/8f706d160631f1ffdbfa16543a38b9d5f91c16ad.patch"; + hash = "sha256-YzS9TmUWW0OmheDeCeU00kFK2U2QEmKYMSRJAbu14ec="; + }) ]; outputs = [ "out" "dev" "installedTests" ]; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 9f1b76badbbaf..9c8e33d182de5 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,33 +1,99 @@ -{ lib, stdenv, fetchurl, python3Packages, docutils, help2man, installShellFiles, fetchpatch -, abootimg, acl, apksigcopier, apksigner, apktool, binutils-unwrapped-all-targets, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc -, e2fsprogs, enjarify, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar -, gzip, html2text, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, ocaml, oggvideotools, openssh, openssl, pdftk, pgpdump, poppler_utils, procyon, qemu, R -, radare2, sng, sqlite, squashfsTools, tcpdump, ubootTools, odt2txt, unzip, wabt, xmlbeans, xxd, xz, zip, zstd +{ lib +, stdenv +, abootimg +, acl +, apksigcopier +, apksigner +, apktool +, binutils-unwrapped-all-targets +, bzip2 +, cbfstool +, cdrkit +, colord +, colordiff +, coreutils +, cpio +, db +, diffutils +, docutils +, dtc +, e2fsprogs , enableBloat ? true , enableUnfree ? false -# updater only +, enjarify +, fetchurl +, file +, findutils +, fontforge-fonttools +, ffmpeg +, fpc +, gettext +, ghc +, ghostscriptX +, giflib +, gnumeric +, gnupg +, gnutar +, gzip +, hdf5 +, help2man +, html2text +, imagemagick +, installShellFiles +, jdk +, libarchive +, libcaca +, libxmlb +, llvm +, lz4 +, lzip +, mono +, ocaml +, odt2txt +, oggvideotools +, openssh +, openssl +, pdftk +, pgpdump +, poppler_utils +, procyon +, python3 +, qemu +, R +, radare2 +, sng +, sqlite +, squashfsTools +, tcpdump +, ubootTools +, unzip +, wabt +, xmlbeans +, xxd +, xz +, zip +, zstd + # updater only , writeScript }: # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "233"; + version = "243"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-A2GYnhdjkzSFnMsy99FmckiOsbRdymAdtjp55hyFLp4="; + hash = "sha256-lqI9MOZJxgHZ87kax343t6Wylzv1NWcQZ1cMWgmpnRo="; }; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; patches = [ ./ignore_links.patch - # test_text_proper_indentation requires file >= 5.44 - (fetchpatch { - url = "https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/9fdb78ec0bbc69f1980499dfdcbf6f1dd5e55cc8.patch"; - sha256 = "sha256-F0N3L9yymj2NjeIKtSnOEDsxPe+ZTb0m/M4f8LPRHg0="; - }) ]; postPatch = '' @@ -38,43 +104,127 @@ python3Packages.buildPythonApplication rec { substituteInPlace doc/Makefile --replace "../bin" "$out/bin" ''; - nativeBuildInputs = [ docutils help2man installShellFiles ]; + nativeBuildInputs = [ + docutils + help2man + installShellFiles + ]; # Most of the non-Python dependencies here are optional command-line tools for various file-format parsers. # To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh # - # Still missing these tools: docx2txt lipo otool r2pipe + # Still missing these tools: + # aapt2 + # dexdump + # docx2txt + # getfacl + # lipo + # otool + # r2pipe + # # We filter automatically all packages for the host platform (some dependencies are not supported on Darwin, aarch64, etc.). pythonPath = lib.filter (lib.meta.availableOn stdenv.hostPlatform) ([ - binutils-unwrapped-all-targets bzip2 colordiff coreutils cpio db diffutils - e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip - html2text libarchive lz4 openssl pgpdump sng sqlite squashfsTools unzip xxd - xz zip zstd cdrkit dtc + binutils-unwrapped-all-targets + bzip2 + cdrkit + colordiff + coreutils + cpio + db + diffutils + dtc + e2fsprogs + file + findutils + fontforge-fonttools + gettext + gnutar + gzip + html2text + libarchive + libxmlb + lz4 + lzip + openssl + pgpdump + sng + sqlite + squashfsTools + unzip + xxd + xz + zip + zstd + ] + ++ (with python3.pkgs; [ + argcomplete + debian + defusedxml + jsbeautifier + jsondiff + libarchive-c + progressbar33 + pypdf2 + python-magic + pyxattr + rpm + tlsh + ]) + ++ lib.optionals enableBloat ( + [ + abootimg + apksigcopier + apksigner + cbfstool + colord + enjarify + ffmpeg + fpc + ghc + ghostscriptX + giflib + gnupg + hdf5 + imagemagick + jdk + libcaca + llvm + mono + ocaml + odt2txt + openssh + pdftk + poppler_utils + procyon + qemu + R + radare2 + tcpdump + ubootTools + wabt + xmlbeans ] - ++ (with python3Packages; [ - argcomplete debian defusedxml jsondiff jsbeautifier libarchive-c - python-magic progressbar33 pypdf2 tlsh pyxattr rpm + ++ (with python3.pkgs; [ + androguard + binwalk + guestfs + h5py + pdfminer-six ]) - ++ lib.optionals enableBloat ( - [ - apksigcopier apksigner enjarify ffmpeg fpc ghc ghostscriptX giflib gnupg pdftk - hdf5 imagemagick libcaca llvm jdk mono ocaml odt2txt openssh - poppler_utils procyon qemu R tcpdump wabt radare2 xmlbeans - abootimg cbfstool colord ubootTools - ] - ++ (with python3Packages; [ androguard binwalk h5py pdfminer-six guestfs ]) - # oggvideotools is broken on Darwin, please put it back when it will be fixed? - ++ lib.optionals stdenv.isLinux [ oggvideotools ] - # This doesn't work on aarch64-darwin - ++ lib.optionals (stdenv.hostPlatform != "aarch64-darwin") [ gnumeric ] - # `apktool` depend on `build-tools` which requires Android SDK acceptance, therefore, the whole thing is unfree. - ++ lib.optionals enableUnfree [ apktool ] - )); - - nativeCheckInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath; + # oggvideotools is broken on Darwin, please put it back when it will be fixed? + ++ lib.optionals stdenv.isLinux [ oggvideotools ] + # This doesn't work on aarch64-darwin + ++ lib.optionals (stdenv.hostPlatform != "aarch64-darwin") [ gnumeric ] + # apktool depend on build-tools which requires Android SDK acceptance, therefore, the whole thing is unfree + ++ lib.optionals enableUnfree [ apktool ] + )); + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + ] ++ pythonPath; pytestFlagsArray = [ - # always show more information when tests fail + # Always show more information when tests fail "-vv" ]; @@ -88,7 +238,7 @@ python3Packages.buildPythonApplication rec { "test_diff_meta" "test_diff_meta2" - # fails because it fails to determine llvm version + # Fails because it fails to determine llvm version "test_item3_deflate_llvm_bitcode" ] ++ lib.optionals stdenv.isDarwin [ # Disable flaky tests on Darwin @@ -97,7 +247,7 @@ python3Packages.buildPythonApplication rec { "test_symlink_root" ]; - # flaky tests on Darwin + # Flaky tests on Darwin disabledTestPaths = lib.optionals stdenv.isDarwin [ "tests/comparators/test_git.py" "tests/comparators/test_java.py" @@ -106,7 +256,7 @@ python3Packages.buildPythonApplication rec { "tests/comparators/test_macho.py" ]; - passthru = { + passthru = { updateScript = writeScript "update-diffoscope" '' #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl pcre common-updater-scripts @@ -117,7 +267,7 @@ python3Packages.buildPythonApplication rec { newVersion="$(curl -s https://diffoscope.org/ | pcregrep -o1 'Latest release: ([0-9]+)')" update-source-version ${pname} "$newVersion" ''; - }; + }; meta = with lib; { description = "Perform in-depth comparison of files, archives, and directories"; @@ -132,6 +282,7 @@ python3Packages.buildPythonApplication rec { project and was formerly known as "debbindiff". ''; homepage = "https://diffoscope.org/"; + changelog = "https://diffoscope.org/news/diffoscope-${version}-released/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dezgeg danielfullmer raitobezarius ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index d1eda4768e16a..adccb3a8da4f9 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.79.0"; + version = "0.80.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - hash = "sha256-OTddX0hTrcxvU1XI5DSXOYPhVrn3dJ9Ryvr/wf1AHQ0="; + hash = "sha256-Etm4VbLnkxDxWZqi5T+QfqCAUG1cqJzcSCV346ZxgP8="; }; # there is a nested go.mod sourceRoot = "source/cmd/otelcorecol"; - vendorHash = "sha256-Efsgogk3C7oroniRPrl5GwTogBk7lT0XPkbz0ygJh48="; + vendorHash = "sha256-O4NnXJHAP54tejolwp/G9n4ogW5daOZxTQ2NKSCtefE="; # upstream strongly recommends disabling CGO # additionally dependencies have had issues when GCO was enabled that weren't caught upstream diff --git a/pkgs/tools/misc/parquet-tools/default.nix b/pkgs/tools/misc/parquet-tools/default.nix index 38a71dd02a131..10247064cd97f 100644 --- a/pkgs/tools/misc/parquet-tools/default.nix +++ b/pkgs/tools/misc/parquet-tools/default.nix @@ -56,6 +56,8 @@ buildPythonApplication rec { # These tests try to read Python code as parquet and fail "test_local_wildcard" "test_local_and_s3_wildcard_files" + # test file is 2 bytes bigger than expected + "test_excute_simple" ]; pythonImportsCheck = [ diff --git a/pkgs/tools/misc/tailer/default.nix b/pkgs/tools/misc/tailer/default.nix index 7f39dfd5815ff..f3c4d3545252c 100644 --- a/pkgs/tools/misc/tailer/default.nix +++ b/pkgs/tools/misc/tailer/default.nix @@ -1,22 +1,34 @@ { lib , buildGoModule , fetchFromGitHub +, testers +, tailer }: -buildGoModule { +buildGoModule rec { pname = "tailer"; - version = "unstable-2023-06-26"; + version = "0.1.1"; src = fetchFromGitHub { owner = "hionay"; repo = "tailer"; - rev = "2f32e2640a220c990ae419d1562889971c9ed535"; - hash = "sha256-L+5HlUv6g2o6ghqp8URfR7k5NlWqFhVBmEIsEjGy7aU="; + rev = "v${version}"; + hash = "sha256-gPezz2ksqdCffgdAHwU2NMTar2glp5YGfA5C+tMYPtE="; }; vendorHash = "sha256-nQqSvfN+ed/g5VkbD6XhZNA1G3CGGfwFDdadJ5+WoD0="; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + "-X=main.version=${version}" + ]; + + passthru.tests = { + version = testers.testVersion { + package = tailer; + }; + }; meta = with lib; { description = "A CLI tool to insert lines when command output stops"; diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index 1f4544fb5a27a..cbc42444af38e 100644 --- a/pkgs/tools/misc/tbls/default.nix +++ b/pkgs/tools/misc/tbls/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "tbls"; - version = "1.67.1"; + version = "1.68.0"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-O1ANUA2xCLl0ks+YCS8ADK5ySPYV4aSf3i5L6EN8swA="; + hash = "sha256-qFPTDyljSKWim8sZbDM5OZ4sHL4csqXxit4UdMnOTxs="; }; vendorHash = "sha256-Xxoe+8MKwZPPapTILHAIegGPBn8vaAjU5bZrd8RvazE="; diff --git a/pkgs/tools/networking/aardvark-dns/default.nix b/pkgs/tools/networking/aardvark-dns/default.nix index 3689a4fb127f6..106fac53d682e 100644 --- a/pkgs/tools/networking/aardvark-dns/default.nix +++ b/pkgs/tools/networking/aardvark-dns/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "aardvark-dns"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-l240kejJjv3rVb4S9ngXo88kmByuS/Co3AB/SSv+iIA="; + hash = "sha256-bScL8hFV/Kot7P9nJRMDDhB8pllPUsejtJpbjmQ8skI="; }; - cargoHash = "sha256-d3u/He8+Ei+tX37EgYTGW5gjcalawlTdPekV9iLK7XI="; + cargoHash = "sha256-rrn+ZTAsFs7UTP4xQL3Cy8G6RG7vwT0wMKnXHHIkB90="; passthru.tests = { inherit (nixosTests) podman; }; diff --git a/pkgs/tools/networking/gvproxy/default.nix b/pkgs/tools/networking/gvproxy/default.nix index 0a8ec3d44bc08..4c6e69c600b4d 100644 --- a/pkgs/tools/networking/gvproxy/default.nix +++ b/pkgs/tools/networking/gvproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gvproxy"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "containers"; repo = "gvisor-tap-vsock"; rev = "v${version}"; - hash = "sha256-LkSKJVnWwqWSId/qdb7hTIiryxdazjW4oluZZN47orQ="; + hash = "sha256-3WBL+ByYSiYKXzFkeoUnCxTdhvy3XxLKUHgJ2hO6oIo="; }; vendorHash = null; diff --git a/pkgs/tools/networking/netavark/default.nix b/pkgs/tools/networking/netavark/default.nix index c205f4d35eb25..f1a0aafe0f2cd 100644 --- a/pkgs/tools/networking/netavark/default.nix +++ b/pkgs/tools/networking/netavark/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "netavark"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-USGmYLBv2ynnLx5jg+WkRle0AMtO7dDgf41VIepoHN0="; + hash = "sha256-amvy8sR2gpTYU7wcfkFeYyaTvrhZC558zidNdHwxqaI="; }; - cargoHash = "sha256-zj1eE7f4/wSVe+78abMePqsIrCPl6Uhtavn8hq7+ZRY="; + cargoHash = "sha256-v8djyU+MvBmg929oFVPZlRPtj7zK8eZg3/KmCsFNWpw="; nativeBuildInputs = [ installShellFiles mandown protobuf ]; diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 1b370521eb7af..2ca9261f1f255 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -30,13 +30,13 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.21.7"; + version = "0.21.8"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-y/1RWywWgDpklG6I58J//6IngdEgAQtsGEAS1z2X/M4="; + sha256 = "sha256-BSLstxiiFUJZLIVqHsAFv20GdXJaq2OucG40+lu5LYU="; }; vendorHash = "sha256-R5LhqW6uh7R8/vr60Sy0kVpAaTL3rwh5c4Ix08Rx6Zk="; diff --git a/pkgs/tools/networking/ockam/default.nix b/pkgs/tools/networking/ockam/default.nix index d2275df840de4..fe5ba72caf68e 100644 --- a/pkgs/tools/networking/ockam/default.nix +++ b/pkgs/tools/networking/ockam/default.nix @@ -12,7 +12,7 @@ let pname = "ockam"; - version = "0.89.0"; + version = "0.90.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -21,10 +21,10 @@ rustPlatform.buildRustPackage { owner = "build-trust"; repo = pname; rev = "ockam_v${version}"; - sha256 = "sha256-KyhOPcE23nvCVGLnQSxL88WeQVWeTx+70CTvH2KfqK8="; + sha256 = "sha256-IblL87YSSTew4UOZEkbPrQ1Zy9x33mfxGG1kg1atxrs="; }; - cargoHash = "sha256-LMGm+/fjyHMj8fZjw8uhVHTbG4PuxJjzq8kKP+DPVWE="; + cargoHash = "sha256-/fKqUOa1Dos01IKyIZIjWwpZNXKh+cVoq4s2TUFWkBw="; nativeBuildInputs = [ git pkg-config ]; buildInputs = [ openssl dbus ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/networking/softnet/default.nix b/pkgs/tools/networking/softnet/default.nix new file mode 100644 index 0000000000000..b1a9cb3a97f76 --- /dev/null +++ b/pkgs/tools/networking/softnet/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenvNoCC +, fetchurl +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "softnet"; + version = "0.7.1"; + + src = fetchurl { + url = "https://github.com/cirruslabs/softnet/releases/download/${finalAttrs.version}/softnet.tar.gz"; + sha256 = "1g274x524xc85hfzxi3vb4xp720bjgk740bp6hc92d1ikmp0b664"; + }; + sourceRoot = "."; + + installPhase = '' + runHook preInstall + + install -D softnet $out/bin/softnet + install -Dm444 -t $out/share/softnet README.md LICENSE + + runHook postInstall + ''; + + meta = with lib; { + description = "Software networking with isolation for Tart"; + homepage = "https://github.com/cirruslabs/softnet"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ emilytrau ]; + platforms = [ "aarch64-darwin" ]; + # Source build will be possible after darwin SDK 12.0 bump + # https://github.com/NixOS/nixpkgs/pull/229210 + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index faa1520c9957e..5b2fa00291301 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,4 +1,5 @@ { lib +, config , aws-sdk-cpp , boehmgc , callPackage @@ -118,7 +119,7 @@ let hash = "sha256-YrmFkVpwPreiig1/BsP+DInpTdQrPmS7bEY0WUGpw+c="; }; -in lib.makeExtensible (self: { +in lib.makeExtensible (self: ({ nix_2_3 = (common rec { version = "2.3.16"; src = fetchurl { @@ -130,18 +131,6 @@ in lib.makeExtensible (self: { ]; }).override { boehmgc = boehmgc-nix_2_3; }; - nix_2_4 = throw "nixVersions.nix_2_4 has been removed"; - - nix_2_5 = throw "nixVersions.nix_2_5 has been removed"; - - nix_2_6 = throw "nixVersions.nix_2_6 has been removed"; - - nix_2_7 = throw "nixVersions.nix_2_7 has been removed"; - - nix_2_8 = throw "nixVersions.nix_2_8 has been removed"; - - nix_2_9 = throw "nixVersions.nix_2_9 has been removed"; - nix_2_10 = common { version = "2.10.3"; hash = "sha256-B9EyDUz/9tlcWwf24lwxCFmkxuPTVW7HFYvp0C4xGbc="; @@ -217,4 +206,16 @@ in lib.makeExtensible (self: { stable = self.nix_2_15; unstable = self.nix_2_16; -}) +} // lib.optionalAttrs config.allowAliases { + nix_2_4 = throw "nixVersions.nix_2_4 has been removed"; + + nix_2_5 = throw "nixVersions.nix_2_5 has been removed"; + + nix_2_6 = throw "nixVersions.nix_2_6 has been removed"; + + nix_2_7 = throw "nixVersions.nix_2_7 has been removed"; + + nix_2_8 = throw "nixVersions.nix_2_8 has been removed"; + + nix_2_9 = throw "nixVersions.nix_2_9 has been removed"; +})) diff --git a/pkgs/tools/security/cloudfox/default.nix b/pkgs/tools/security/cloudfox/default.nix index f82705cdd3e1a..14041ba7e7f06 100644 --- a/pkgs/tools/security/cloudfox/default.nix +++ b/pkgs/tools/security/cloudfox/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "cloudfox"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = "BishopFox"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-EqL5/PVQm/lfviojKoYKDnzilx7KQZ7T3EEx/or6y7E="; + hash = "sha256-zkZ8Glny9eERfU4DGtTOc66O7LOk5NISqUR5muxb2m0="; }; vendorHash = "sha256-lgccNq1cSg8rrHW0aMLcC5HrZXf8TvdFSmk6pbGXNqQ="; diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/tools/security/gotrue/supabase.nix index 1670277801e44..4658353d131fc 100644 --- a/pkgs/tools/security/gotrue/supabase.nix +++ b/pkgs/tools/security/gotrue/supabase.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gotrue"; - version = "2.76.0"; + version = "2.77.1"; src = fetchFromGitHub { owner = "supabase"; repo = pname; rev = "v${version}"; - hash = "sha256-2hhO/8PvrRoz2RoctoJdCMWn+DdBEni+AyoxkXLbgp0="; + hash = "sha256-/CHbs/GZt8E+/XVTJWQZeEpIRHYO1pQ0u5h9tOQSFdg="; }; - vendorHash = "sha256-uLcea5tLe61oAyw09PpIfgf1xbClgqZYlk6553Vsvso="; + vendorHash = "sha256-S/uedmoqTOmbIeotdky+s/eENDi2knKIW0rMMcQr2zU="; ldflags = [ "-s" diff --git a/pkgs/tools/security/oauth2c/default.nix b/pkgs/tools/security/oauth2c/default.nix index 9ab132481b294..e73aed4dfe8ef 100644 --- a/pkgs/tools/security/oauth2c/default.nix +++ b/pkgs/tools/security/oauth2c/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "oauth2c"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "cloudentity"; repo = pname; rev = "v${version}"; - hash = "sha256-ecG7+b1chHAJVB7WTilA1dowtisLHj2E/ORUoXXxqNY="; + hash = "sha256-+R3NViAnrHg/9dthF0e2dEppX5MLzHeRMYFiZutE1mU="; }; vendorHash = "sha256-euEmslrSbXPVDNZkIguq+ukt74Um4H0+lIXEyCBorjE="; diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/tools/security/pcsc-cyberjack/default.nix index b420263c209b2..04aad0b277393 100644 --- a/pkgs/tools/security/pcsc-cyberjack/default.nix +++ b/pkgs/tools/security/pcsc-cyberjack/default.nix @@ -2,17 +2,18 @@ let version = "3.99.5"; - suffix = "SP13"; + suffix = "SP15"; tarBall = "${version}final.${suffix}"; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "pcsc-cyberjack"; inherit version; src = fetchurl { url = - "http://support.reiner-sct.de/downloads/LINUX/V${version}_${suffix}/${pname}_${tarBall}.tar.gz"; - sha256 = "1lx4bfz4riz7j77sl65akyxzww0ygm63w0c1b75knr1pijlv8d3b"; + "https://support.reiner-sct.de/downloads/LINUX/V${version}_${suffix}/${pname}_${tarBall}.tar.bz2"; + sha256 = "sha256-rLfCgyRQcYdWcTdnxLPvUAgy1lLtUbNRELkQsR69Rno="; }; outputs = [ "out" "tools" ]; @@ -36,7 +37,7 @@ in stdenv.mkDerivation rec { description = "REINER SCT cyberJack USB chipcard reader user space driver"; homepage = "https://www.reiner-sct.com/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ aszlig ]; + maintainers = with maintainers; [ aszlig flokli ]; platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae6f3be59fefc..9395d609a1268 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10756,6 +10756,8 @@ with pkgs; pcmsolver = callPackage ../development/libraries/pcmsolver { }; + pegasus-frontend = libsForQt5.callPackage ../games/pegasus-frontend {}; + pgbadger = perlPackages.callPackage ../tools/misc/pgbadger { }; pffft = callPackage ../development/libraries/pffft { }; @@ -12848,6 +12850,8 @@ with pkgs; sockperf = callPackage ../tools/networking/sockperf { }; + softnet = callPackage ../tools/networking/softnet { }; + solaar = callPackage ../applications/misc/solaar { }; solanum = callPackage ../servers/irc/solanum { @@ -14789,6 +14793,9 @@ with pkgs; _4th = callPackage ../development/compilers/4th { }; + temurin-bin-20 = javaPackages.compiler.temurin-bin.jdk-20; + temurin-jre-bin-20 = javaPackages.compiler.temurin-bin.jre-20; + temurin-bin-19 = javaPackages.compiler.temurin-bin.jdk-19; temurin-jre-bin-19 = javaPackages.compiler.temurin-bin.jre-19; @@ -15878,7 +15885,7 @@ with pkgs; hugs = callPackage ../development/interpreters/hugs { }; - inherit (javaPackages) openjfx11 openjfx15 openjfx17 openjfx19; + inherit (javaPackages) openjfx11 openjfx15 openjfx17 openjfx19 openjfx20; openjfx = openjfx17; openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap; @@ -15908,6 +15915,11 @@ with pkgs; jdk19 = openjdk19; jdk19_headless = openjdk19_headless; + openjdk20 = javaPackages.compiler.openjdk20; + openjdk20_headless = javaPackages.compiler.openjdk20.headless; + jdk20 = openjdk20; + jdk20_headless = openjdk20_headless; + /* default JDK */ jdk = jdk19; jdk_headless = jdk19_headless; @@ -23504,6 +23516,8 @@ with pkgs; nanomsg = callPackage ../development/libraries/nanomsg { }; + nanosvg = callPackage ../development/libraries/nanosvg { }; + nanovna-saver = libsForQt5.callPackage ../applications/science/electronics/nanovna-saver { }; nanotts = callPackage ../tools/audio/nanotts { }; @@ -25940,6 +25954,8 @@ with pkgs; jitsi-videobridge = callPackage ../servers/jitsi-videobridge { }; + kamailio = callPackage ../servers/sip/kamailio { }; + kanidm = callPackage ../servers/kanidm { }; kapowbang = callPackage ../servers/kapowbang { }; @@ -34611,6 +34627,8 @@ with pkgs; sway-launcher-desktop = callPackage ../applications/misc/sway-launcher-desktop { }; + tart = callPackage ../applications/virtualization/tart { }; + tecoc = callPackage ../applications/editors/tecoc { }; viber = callPackage ../applications/networking/instant-messengers/viber { }; @@ -37761,6 +37779,8 @@ with pkgs; widelands = callPackage ../games/widelands { }; + wolfstoneextract = callPackage ../games/wolfstoneextract { }; + worldofgoo = callPackage ../games/worldofgoo { }; xboard = callPackage ../games/xboard { }; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 98567c7b9fcae..7439ba7892fbe 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -7,11 +7,12 @@ let openjfx15 = callPackage ../development/compilers/openjdk/openjfx/15.nix { }; openjfx17 = callPackage ../development/compilers/openjdk/openjfx/17.nix { }; openjfx19 = callPackage ../development/compilers/openjdk/openjfx/19.nix { }; + openjfx20 = callPackage ../development/compilers/openjdk/openjfx/20.nix { }; mavenfod = pkgs.maven.buildMavenPackage; in { - inherit mavenfod openjfx11 openjfx15 openjfx17 openjfx19; + inherit mavenfod openjfx11 openjfx15 openjfx17 openjfx19 openjfx20; compiler = let @@ -201,6 +202,14 @@ in { openjfx = openjfx19; }; + openjdk20 = mkOpenjdk + ../development/compilers/openjdk/20.nix + ../development/compilers/openjdk/darwin/20.nix + { + openjdk20-bootstrap = temurin-bin.jdk-20; + openjfx = openjfx20; + }; + temurin-bin = recurseIntoAttrs (callPackage ( if stdenv.isLinux then ../development/compilers/temurin-bin/jdk-linux.nix diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 5d4a015ff5308..91e78eae47f25 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -283,6 +283,7 @@ mapAliases ({ qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 Quandl = quandl; # added 2023-02-19 qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages"; + rabbitpy = throw "rabbitpy has been removed, since it is unmaintained and broken"; # added 2023-07-01 rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05 retworkx = rustworkx; # added 2023-05-14 repeated_test = repeated-test; # added 2022-11-15 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2d2f07fe9bdbf..9063d90590ca8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6920,9 +6920,11 @@ self: super: with self; { normality = callPackage ../development/python-modules/normality { }; + nose = callPackage ../development/python-modules/nose { }; + nose2 = callPackage ../development/python-modules/nose2 { }; - nose = callPackage ../development/python-modules/nose { }; + nose3 = callPackage ../development/python-modules/nose3 { }; nose-cov = callPackage ../development/python-modules/nose-cov { }; @@ -7207,6 +7209,8 @@ self: super: with self; { openrazer-daemon = callPackage ../development/python-modules/openrazer/daemon.nix { }; + openrgb-python = callPackage ../development/python-modules/openrgb-python { }; + openrouteservice = callPackage ../development/python-modules/openrouteservice { }; opensearch-py = callPackage ../development/python-modules/opensearch-py { }; @@ -10510,8 +10514,6 @@ self: super: with self; { r2pipe = callPackage ../development/python-modules/r2pipe { }; - rabbitpy = callPackage ../development/python-modules/rabbitpy { }; - rachiopy = callPackage ../development/python-modules/rachiopy { }; radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud { @@ -10625,6 +10627,8 @@ self: super: with self; { reedsolo = callPackage ../development/python-modules/reedsolo { }; + referencing = callPackage ../development/python-modules/referencing { }; + reflink = callPackage ../development/python-modules/reflink { }; regenmaschine = callPackage ../development/python-modules/regenmaschine { }; @@ -10889,6 +10893,8 @@ self: super: with self; { rpdb = callPackage ../development/python-modules/rpdb { }; + rpds-py = callPackage ../development/python-modules/rpds-py { }; + rpi-bad-power = callPackage ../development/python-modules/rpi-bad-power { }; rpi-gpio = callPackage ../development/python-modules/rpi-gpio { }; |