diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 08ee0e349d02..366c519751c0 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -991,13 +991,56 @@ Hook executed at the end of the fixup phase. If set to `true`, the standard environment will enable debug information in C/C++ builds. After installation, the debug information will be separated from the executables and stored in the output named `debug`. (This output is enabled automatically; you don’t need to set the `outputs` attribute explicitly.) To be precise, the debug information is stored in `debug/lib/debug/.build-id/XX/YYYY…`, where \ is the \ of the binary — a SHA-1 hash of the contents of the binary. Debuggers like GDB use the build ID to look up the separated debug information. -For example, with GDB, you can add +:::{.example #ex-gdb-debug-symbols-socat} -``` -set debug-file-directory ~/.nix-profile/lib/debug +# Enable debug symbols for use with GDB + +To make GDB find debug information for the `socat` package and its dependencies, you can use the following `shell.nix`: + +```nix +let + pkgs = import ./. { + config = {}; + overlays = [ + (final: prev: { + ncurses = prev.ncurses.overrideAttrs { separateDebugInfo = true; }; + readline = prev.readline.overrideAttrs { separateDebugInfo = true; }; + }) + ]; + }; + + myDebugInfoDirs = pkgs.symlinkJoin { + name = "myDebugInfoDirs"; + paths = with pkgs; [ + glibc.debug + ncurses.debug + openssl.debug + readline.debug + ]; + }; +in + pkgs.mkShell { + + NIX_DEBUG_INFO_DIRS = "${pkgs.lib.getLib myDebugInfoDirs}/lib/debug"; + + packages = [ + pkgs.gdb + pkgs.socat + ]; + + shellHook = '' + ${pkgs.lib.getBin pkgs.gdb}/bin/gdb ${pkgs.lib.getBin pkgs.socat}/bin/socat + ''; + } ``` -to `~/.gdbinit`. GDB will then be able to find debug information installed via `nix-env -i`. +This setup works as follows: +- Add [`overlays`](#chap-overlays) to the package set, since debug symbols are disabled for `ncurses` and `readline` by default. +- Create a derivation to combine all required debug symbols under one path with [`symlinkJoin`](#trivial-builder-symlinkJoin). +- Set the environment variable `NIX_DEBUG_INFO_DIRS` in the shell. Nixpkgs patches `gdb` to use it for looking up debug symbols. +- Run `gdb` on the `socat` binary on shell startup in the [`shellHook`](#sec-pkgs-mkShell). Here we use [`lib.getBin`](#function-library-lib.attrsets.getBin) to ensure that the correct derivation output is selected rather than the default one. + +::: ### The installCheck phase {#ssec-installCheck-phase} diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 33ce50aedb2f..e9e8f4363360 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -895,6 +895,12 @@ githubId = 160476; name = "Amanjeev Sethi"; }; + amanse = { + email = "amansetiarjp@gmail.com"; + github = "amanse"; + githubId = 13214574; + name = "Aman Setia"; + }; amar1729 = { email = "amar.paul16@gmail.com"; github = "Amar1729"; @@ -11591,6 +11597,13 @@ githubId = 1001112; name = "Marcin Janczyk"; }; + mjm = { + email = "matt@mattmoriarity.com"; + github = "mjm"; + githubId = 1181; + matrix = "@mjm:beeper.com"; + name = "Matt Moriarity"; + }; mjp = { email = "mike@mythik.co.uk"; github = "MikePlayle"; @@ -12091,6 +12104,11 @@ githubId = 59313755; name = "Maxim Karasev"; }; + mxmlnkn = { + github = "mxmlnkn"; + githubId = 6842824; + name = "Maximilian Knespel"; + }; myaats = { email = "mats@mats.sh"; github = "Myaats"; @@ -15283,6 +15301,12 @@ githubId = 171470; name = "Sam Hug"; }; + SamirTalwar = { + email = "lazy.git@functional.computer"; + github = "SamirTalwar"; + githubId = 47852; + name = "Samir Talwar"; + }; samlich = { email = "nixos@samli.ch"; github = "samlich"; @@ -18575,6 +18599,12 @@ githubId = 7121530; name = "Wolf Honoré"; }; + wietsedv = { + email = "wietsedv@proton.me"; + github = "wietsedv"; + githubId = 13139101; + name = "Wietse de Vries"; + }; wigust = { name = "Oleg Pykhalov"; email = "go.wigust@gmail.com"; diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index fb8d802d40b0..37b840539ea4 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -87,6 +87,8 @@ - [tuxedo-rs](https://github.com/AaronErhardt/tuxedo-rs), Rust utilities for interacting with hardware from TUXEDO Computers. +- [audiobookshelf](https://github.com/advplyr/audiobookshelf/), a self-hosted audiobook and podcast server. Available as [services.audiobookshelf](#opt-services.audiobookshelf.enable). + ## Backward Incompatibilities {#sec-release-23.11-incompatibilities} - The `boot.loader.raspberryPi` options have been marked deprecated, with intent for removal for NixOS 24.11. They had a limited use-case, and do not work like people expect. They required either very old installs ([before mid-2019](https://github.com/NixOS/nixpkgs/pull/62462)) or customized builds out of scope of the standard and generic AArch64 support. That option set never supported the Raspberry Pi 4 family of devices. @@ -165,6 +167,10 @@ - PHP now defaults to PHP 8.2, updated from 8.1. +- GraalVM has been updated to the latest version, and this brings significant changes. Upstream don't release multiple versions targeting different JVMs anymore, so now we only have one GraalVM derivation (`graalvm-ce`). While at first glance the version may seem a downgrade (22.3.1 -> 21.0.0), the major version is now following the JVM it targets (so this latest version targets JVM 21). Also some products like `llvm-installable-svm` and `native-image-svm` were incorporate to the main GraalVM derivation, so they're included by default. + +- GraalPy (`graalCEPackages.graalpy`), TruffleRuby (`graalCEPackages.truffleruby`), GraalJS (`graalCEPackages.graaljs`) and GraalNodeJS (`grallCEPackages.graalnodejs`) are now indepedent from the main GraalVM derivation. + - The ISC DHCP package and corresponding module have been removed, because they are end of life upstream. See https://www.isc.org/blogs/isc-dhcp-eol/ for details and switch to a different DHCP implementation like kea or dnsmasq. - `prometheus-unbound-exporter` has been replaced by the Let's Encrypt maintained version, since the previous version was archived. This requires some changes to the module configuration, most notable `controlInterface` needs migration @@ -196,6 +202,10 @@ - `spamassassin` no longer supports the `Hashcash` module. The module needs to be removed from the `loadplugin` list if it was copied over from the default `initPreConf` option. +- `nano` was removed from `environment.defaultPackages`. To not leave systems without a editor, now `programs.nano.enable` is enabled by default. + +- `programs.nano.nanorc` and `programs.nano.syntaxHighlight` no longer have an effect unless `programs.nano.enable` is set to true which is the default. + - `services.outline.sequelizeArguments` has been removed, as `outline` no longer executes database migrations via the `sequelize` cli. - The binary of the package `cloud-sql-proxy` has changed from `cloud_sql_proxy` to `cloud-sql-proxy`. diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index 2afcbc95c667..4accd2f9d195 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -843,6 +843,9 @@ class Machine: while True: chunk = self.shell.recv(1024) + # No need to print empty strings, it means we are waiting. + if len(chunk) == 0: + continue self.log(f"Guest shell says: {chunk!r}") # NOTE: for this to work, nothing must be printed after this line! if b"Spawning backdoor root shell..." in chunk: diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 222da3e02e86..7e623dec4b1c 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -42,8 +42,7 @@ let ]; defaultPackageNames = - [ "nano" - "perl" + [ "perl" "rsync" "strace" ]; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index cbd5e6467f82..66782d046914 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1211,6 +1211,7 @@ ./services/web-apps/atlassian/confluence.nix ./services/web-apps/atlassian/crowd.nix ./services/web-apps/atlassian/jira.nix + ./services/web-apps/audiobookshelf.nix ./services/web-apps/bookstack.nix ./services/web-apps/calibre-web.nix ./services/web-apps/coder.nix diff --git a/nixos/modules/programs/nano.nix b/nixos/modules/programs/nano.nix index 7705bf0ddc72..28ddb4aaf66f 100644 --- a/nixos/modules/programs/nano.nix +++ b/nixos/modules/programs/nano.nix @@ -2,14 +2,16 @@ let cfg = config.programs.nano; - LF = "\n"; in { - ###### interface - options = { programs.nano = { + enable = lib.mkEnableOption (lib.mdDoc "nano") // { + default = true; + }; + + package = lib.mkPackageOptionMD pkgs "nano" { }; nanorc = lib.mkOption { type = lib.types.lines; @@ -24,28 +26,22 @@ in set tabsize 2 ''; }; + syntaxHighlight = lib.mkOption { type = lib.types.bool; - default = true; + default = false; description = lib.mdDoc "Whether to enable syntax highlight for various languages."; }; }; }; - ###### implementation - - config = lib.mkIf (cfg.nanorc != "" || cfg.syntaxHighlight) { - environment.etc.nanorc.text = lib.concatStringsSep LF ( - ( lib.optionals cfg.syntaxHighlight [ - "# The line below is added because value of programs.nano.syntaxHighlight is set to true" - ''include "${pkgs.nano}/share/nano/*.nanorc"'' - "" - ]) - ++ ( lib.optionals (cfg.nanorc != "") [ - "# The lines below have been set from value of programs.nano.nanorc" - cfg.nanorc - ]) - ); + config = lib.mkIf cfg.enable { + environment = { + etc.nanorc.text = (lib.optionalString cfg.syntaxHighlight '' + # load syntax highlighting files + include "${cfg.package}/share/nano/*.nanorc" + '') + cfg.nanorc; + systemPackages = [ cfg.package ]; + }; }; - } diff --git a/nixos/modules/services/backup/btrbk.nix b/nixos/modules/services/backup/btrbk.nix index b838c174553d..9b7f1566eb1e 100644 --- a/nixos/modules/services/backup/btrbk.nix +++ b/nixos/modules/services/backup/btrbk.nix @@ -166,7 +166,7 @@ in { command = "${pkgs.coreutils}/bin/mkdir"; options = [ "NOPASSWD" ]; } { command = "${pkgs.coreutils}/bin/readlink"; options = [ "NOPASSWD" ]; } # for ssh, they are not the same than the one hard coded in ${pkgs.btrbk} - { command = "/run/current-system/bin/btrfs"; options = [ "NOPASSWD" ]; } + { command = "/run/current-system/sw/bin/btrfs"; options = [ "NOPASSWD" ]; } { command = "/run/current-system/sw/bin/mkdir"; options = [ "NOPASSWD" ]; } { command = "/run/current-system/sw/bin/readlink"; options = [ "NOPASSWD" ]; } ]; @@ -182,7 +182,7 @@ in (doasCmdNoPass "${pkgs.coreutils}/bin/mkdir") (doasCmdNoPass "${pkgs.coreutils}/bin/readlink") # for ssh, they are not the same than the one hard coded in ${pkgs.btrbk} - (doasCmdNoPass "/run/current-system/bin/btrfs") + (doasCmdNoPass "/run/current-system/sw/bin/btrfs") (doasCmdNoPass "/run/current-system/sw/bin/mkdir") (doasCmdNoPass "/run/current-system/sw/bin/readlink") diff --git a/nixos/modules/services/misc/xmr-stak.nix b/nixos/modules/services/misc/xmr-stak.nix index 6e123cf0380c..54efae48d5d2 100644 --- a/nixos/modules/services/misc/xmr-stak.nix +++ b/nixos/modules/services/misc/xmr-stak.nix @@ -7,7 +7,7 @@ let cfg = config.services.xmr-stak; pkg = pkgs.xmr-stak.override { - inherit (cfg) openclSupport cudaSupport; + inherit (cfg) openclSupport; }; in @@ -17,7 +17,6 @@ in services.xmr-stak = { enable = mkEnableOption (lib.mdDoc "xmr-stak miner"); openclSupport = mkEnableOption (lib.mdDoc "support for OpenCL (AMD/ATI graphics cards)"); - cudaSupport = mkEnableOption (lib.mdDoc "support for CUDA (NVidia graphics cards)"); extraArgs = mkOption { type = types.listOf types.str; @@ -64,15 +63,12 @@ in wantedBy = [ "multi-user.target" ]; bindsTo = [ "network-online.target" ]; after = [ "network-online.target" ]; - environment = mkIf cfg.cudaSupport { - LD_LIBRARY_PATH = "${pkgs.linuxPackages_latest.nvidia_x11}/lib"; - }; preStart = concatStrings (flip mapAttrsToList cfg.configFiles (fn: content: '' ln -sf '${pkgs.writeText "xmr-stak-${fn}" content}' '${fn}' '')); - serviceConfig = let rootRequired = cfg.openclSupport || cfg.cudaSupport; in { + serviceConfig = let rootRequired = cfg.openclSupport; in { ExecStart = "${pkg}/bin/xmr-stak ${concatStringsSep " " cfg.extraArgs}"; # xmr-stak generates cpu and/or gpu configuration files WorkingDirectory = "/tmp"; diff --git a/nixos/modules/services/web-apps/audiobookshelf.nix b/nixos/modules/services/web-apps/audiobookshelf.nix new file mode 100644 index 000000000000..84dffc5f9d3c --- /dev/null +++ b/nixos/modules/services/web-apps/audiobookshelf.nix @@ -0,0 +1,90 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.audiobookshelf; +in +{ + options = { + services.audiobookshelf = { + enable = mkEnableOption "Audiobookshelf, self-hosted audiobook and podcast server."; + + package = mkPackageOption pkgs "audiobookshelf" { }; + + dataDir = mkOption { + description = "Path to Audiobookshelf config and metadata inside of /var/lib."; + default = "audiobookshelf"; + type = types.str; + }; + + host = mkOption { + description = "The host Audiobookshelf binds to."; + default = "127.0.0.1"; + example = "0.0.0.0"; + type = types.str; + }; + + port = mkOption { + description = "The TCP port Audiobookshelf will listen on."; + default = 8000; + type = types.port; + }; + + user = mkOption { + description = "User account under which Audiobookshelf runs."; + default = "audiobookshelf"; + type = types.str; + }; + + group = mkOption { + description = "Group under which Audiobookshelf runs."; + default = "audiobookshelf"; + type = types.str; + }; + + openFirewall = mkOption { + description = "Open ports in the firewall for the Audiobookshelf web interface."; + default = false; + type = types.bool; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.audiobookshelf = { + description = "Audiobookshelf is a self-hosted audiobook and podcast server"; + + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "simple"; + User = cfg.user; + Group = cfg.group; + StateDirectory = cfg.dataDir; + WorkingDirectory = "/var/lib/${cfg.dataDir}"; + ExecStart = "${cfg.package}/bin/audiobookshelf --host ${cfg.host} --port ${toString cfg.port}"; + Restart = "on-failure"; + }; + }; + + users.users = mkIf (cfg.user == "audiobookshelf") { + audiobookshelf = { + isSystemUser = true; + group = cfg.group; + home = "/var/lib/${cfg.dataDir}"; + }; + }; + + users.groups = mkIf (cfg.group == "audiobookshelf") { + audiobookshelf = { }; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.port ]; + }; + }; + + meta.maintainers = with maintainers; [ wietsedv ]; +} diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 24bd011fd8b6..ef8204e2cf53 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -517,17 +517,24 @@ let (assertValueOneOf "Unmanaged" boolValues) (assertInt "Group") (assertRange "Group" 0 2147483647) - (assertValueOneOf "RequiredForOnline" (boolValues ++ [ - "missing" - "off" - "no-carrier" - "dormant" - "degraded-carrier" - "carrier" - "degraded" - "enslaved" - "routable" - ])) + (assertValueOneOf "RequiredForOnline" (boolValues ++ ( + let + # https://freedesktop.org/software/systemd/man/networkctl.html#missing + operationalStates = [ + "missing" + "off" + "no-carrier" + "dormant" + "degraded-carrier" + "carrier" + "degraded" + "enslaved" + "routable" + ]; + operationalStateRanges = concatLists (imap0 (i: min: map (max: "${min}:${max}") (drop i operationalStates)) operationalStates); + in + operationalStates ++ operationalStateRanges + ))) (assertValueOneOf "RequiredFamilyForOnline" [ "ipv4" "ipv6" diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 66a6aa252b88..5b2e12a501bf 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -119,6 +119,7 @@ in { atd = handleTest ./atd.nix {}; atop = handleTest ./atop.nix {}; atuin = handleTest ./atuin.nix {}; + audiobookshelf = handleTest ./audiobookshelf.nix {}; auth-mysql = handleTest ./auth-mysql.nix {}; authelia = handleTest ./authelia.nix {}; avahi = handleTest ./avahi.nix {}; diff --git a/nixos/tests/audiobookshelf.nix b/nixos/tests/audiobookshelf.nix new file mode 100644 index 000000000000..64bd415160ee --- /dev/null +++ b/nixos/tests/audiobookshelf.nix @@ -0,0 +1,23 @@ +import ./make-test-python.nix ({ lib, ... }: + +with lib; + +{ + name = "audiobookshelf"; + meta.maintainers = with maintainers; [ wietsedv ]; + + nodes.machine = + { pkgs, ... }: + { + services.audiobookshelf = { + enable = true; + port = 1234; + }; + }; + + testScript = '' + machine.wait_for_unit("audiobookshelf.service") + machine.wait_for_open_port(1234) + machine.succeed("curl --fail http://localhost:1234/") + ''; +}) diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index 18e0cfe257f8..52ddd5302191 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tauon"; - version = "7.6.6"; + version = "7.6.7"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${finalAttrs.version}"; - hash = "sha256-yt5sMvYau43WwVerQlaOrvzJ4HnBOEVQqbql9UH8jnM="; + hash = "sha256-d25JM2LUQw6KYPojc+Pn40IwCYWLE9un0YAMIBC1NVg="; }; postUnpack = '' diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index afb8547afc17..abeea41cfd4a 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.11.4"; + version = "1.11.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-PJhc+Kv/iZ73DkM9KXzujTsIc071wqn/NKhuUPs/7dA="; + sha256 = "sha256-PORzTbvB9HriilaBCsC6R323RFvsI55WgSojJJ6uoIs="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index 392a7e15e451..6cc22d122fbc 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -11,7 +11,6 @@ (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.31"; sha256 = "1yxg2651m649ha99rzjv7pnphx42bxzf5sc86czj6ng4rpp8rnkb"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.20"; sha256 = "0nk82hkgs67mxfxkgbav8yxxd79m0xyqaan7vay00gg33pjqdjvj"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.28"; sha256 = "05jkdds1g0xfvf8spakwbyndz8an2kadwybg6dwz6q5rlk0aj7m8"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.16"; sha256 = "1g37736b4k0ncpyy2qycbk4l85fqvgwac3k98nbdj0dvhfghp1dn"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.21"; sha256 = "042xwfsxd30zgwiz0w14ynb755w5sldkplxgw1fkw68lrz66x5s4"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.20"; sha256 = "093w82mcxxxbvx66j0sp3lsfm2bkbi3igm80iz9zdghy85845kc9"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.26"; sha256 = "1kfl88psjbsh88l98kc6dyxqjghnzyffi070v2ifkdjcdgdbawfs"; }) @@ -38,7 +37,7 @@ (fetchNuGet { pname = "HtmlSanitizer"; version = "5.0.372"; sha256 = "1gllp58vdbql2ybwf05i2178x7p4g8zyyk64317d1pyss5217g7r"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.8.26"; sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm"; }) (fetchNuGet { pname = "libsodium"; version = "1.0.18"; sha256 = "15qzl5k31yaaapqlijr336lh4lzz1qqxlimgxy8fdyig8jdmgszn"; }) - (fetchNuGet { pname = "LNURL"; version = "0.0.30"; sha256 = "1sph5vkl0794aky21inp8b9dz2v2clxxx6whfg2g71c0cxrxa3r5"; }) + (fetchNuGet { pname = "LNURL"; version = "0.0.34"; sha256 = "1sbkqsln7wq5fsbw63wdha8kqwxgd95j0iblv4kxa1shyg3c5d9x"; }) (fetchNuGet { pname = "MailKit"; version = "3.3.0"; sha256 = "18l0jkrc4d553kiw4vdjzzpafpvsgjs1n19kjbi8isnhzidmsl4j"; }) (fetchNuGet { pname = "Microsoft.AspNet.SignalR.Client"; version = "2.4.3"; sha256 = "1whxcmxydcxjkw84sqk5idd406v3ia0xj2m4ia4b6wqbvkdqn7rf"; }) (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.9"; sha256 = "1sy1q36bm9fz3gi780w4jgysw3dwaz2f3a5gcn6jxw1gkmdasb08"; }) @@ -164,6 +163,7 @@ (fetchNuGet { pname = "NBXplorer.Client"; version = "4.2.5"; sha256 = "0kycvnxgqrkxig8k6mp1897sqbq2xarc8429vnjh79644nakdas4"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) (fetchNuGet { pname = "NicolasDorier.CommandLine"; version = "2.0.0"; sha256 = "0gywvl0gqs3crlzwgwzcqf0qsrbhk3dxjycpimxqvs1ihg4dhb1f"; }) diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index 6bd443e428b5..6de7cf7578c4 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "nbxplorer"; - version = "2.3.65"; + version = "2.3.66"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-7m9gf+enOtE5VWuBNLFf11ofLGBRAYWvmkrekUVQQaQ="; + sha256 = "sha256-DcSY2hnzJexsrRw4k57uOBfDkveEvXccN8GDUR/QmKw="; }; projectFile = "NBXplorer/NBXplorer.csproj"; diff --git a/pkgs/applications/blockchains/nbxplorer/deps.nix b/pkgs/applications/blockchains/nbxplorer/deps.nix index e9b1de7ed900..cd3098010505 100644 --- a/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -34,8 +34,8 @@ (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) - (fetchNuGet { pname = "NBitcoin"; version = "7.0.24"; sha256 = "0yc6cgwp2xr2dzjsrkawyh43whixv66nvvq6rh1pi6gi14iaqmfa"; }) - (fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.18"; sha256 = "054i15qan5154iy8m13jmhnz1w5rs208i1xhlfnivwiq2v1c2qby"; }) + (fetchNuGet { pname = "NBitcoin"; version = "7.0.27"; sha256 = "0s2i6bjbiz5jlgydn4hja0b42s0yzw0cal0pv2a57hfcd948zc1f"; }) + (fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.19"; sha256 = "16bv3314flq6ildsjzxzw4ih2wbryvkjpkcwkvf2lh2smqhnvr11"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "10.0.3"; sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) diff --git a/pkgs/applications/blockchains/quorum/default.nix b/pkgs/applications/blockchains/quorum/default.nix index 1424ddc9516f..b50d91a07e89 100644 --- a/pkgs/applications/blockchains/quorum/default.nix +++ b/pkgs/applications/blockchains/quorum/default.nix @@ -1,41 +1,35 @@ -{ lib, fetchFromGitHub, buildGoPackage, git, which, removeReferencesTo, go }: +{ lib, fetchFromGitHub, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "quorum"; - version = "2.5.0"; - - goPackagePath = "github.com/jpmorganchase/quorum"; + version = "23.4.0"; src = fetchFromGitHub { - owner = "jpmorganchase"; + owner = "Consensys"; repo = pname; rev = "v${version}"; - sha256 = "0xfdaqp9bj5dkw12gy19lxj73zh7w80j051xclsvnd41sfah86ll"; + hash = "sha256-N8MlDHo6LQ/m9xFUeOCm6bqDtjnCc86i/s4ebFLjUT0="; }; - buildInputs = [ git which ]; + vendorHash = "sha256-dTYKGFqVaAnspvKhfBU10bpSzhtQHGTm6KxnNKUVAIg="; - buildPhase = '' - cd "go/src/$goPackagePath" - make geth bootnode swarm - ''; + patches = [ + # Add missing requirements + ./go.mod.patch + ]; - installPhase = '' - mkdir -pv $out/bin - cp -v build/bin/geth build/bin/bootnode build/bin/swarm $out/bin - ''; + subPackages = [ + "cmd/geth" + "cmd/bootnode" + ]; - # fails with `GOFLAGS=-trimpath` - allowGoReference = true; - preFixup = '' - find $out -type f -exec ${removeReferencesTo}/bin/remove-references-to -t ${go} '{}' + - ''; + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "A permissioned implementation of Ethereum supporting data privacy"; - homepage = "https://www.goquorum.com/"; + homepage = "https://consensys.net/quorum/"; license = licenses.lgpl3; maintainers = with maintainers; [ mmahut ]; - platforms = subtractLists ["aarch64-linux"] platforms.linux; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/applications/blockchains/quorum/go.mod.patch b/pkgs/applications/blockchains/quorum/go.mod.patch new file mode 100644 index 000000000000..7161371ac60c --- /dev/null +++ b/pkgs/applications/blockchains/quorum/go.mod.patch @@ -0,0 +1,12 @@ +diff --git a/go.mod b/go.mod +index ace412f41..3336c1e08 100644 +--- a/go.mod ++++ b/go.mod +@@ -89,6 +89,7 @@ require ( + golang.org/x/text v0.3.7 + golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 + google.golang.org/grpc v1.46.0 ++ google.golang.org/protobuf v1.28.0 + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c + gopkg.in/karalabe/cookiejar.v2 v2.0.0-20150724131613-8dcd6a7f4951 + gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 686ec3681183..fb02345379b5 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -6,19 +6,18 @@ , callPackage }: -# https://download.eclipse.org/eclipse/downloads/ is the main place to -# find the downloads needed for new versions +# use ./update.sh to help with updating for each quarterly release # -# to test: +# then, to test: # for e in cpp modeling platform sdk java jee committers rcp; do for s in pkgs pkgsCross.aarch64-multiplatform; do echo; echo $s $e; nix build -f default.nix ${s}.eclipses.eclipse-${e} -o eclipse-${s}-${e}; done; done let platform_major = "4"; - platform_minor = "27"; + platform_minor = "28"; year = "2023"; - month = "03"; #release month - buildmonth = "03"; #sometimes differs from release month - timestamp = "${year}${buildmonth}020300"; + month = "06"; #release month + buildmonth = "06"; #sometimes differs from release month + timestamp = "${year}${buildmonth}050440"; gtk = gtk3; arch = if stdenv.hostPlatform.isx86_64 then "x86_64" @@ -44,8 +43,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-MBng3ETarHMlUUPpVvMIZxVqpe9JW5xNHonnN6CHRcw="; - aarch64 = "sha256-7FgpPzp5MY/fB6Q/wvrvi+Lpcm3tmH7bUTLh7q2Rjek="; + x86_64 = "sha256-0VFg68+M84SEPbLv2f3hNTK1tvUjN3u0X3DYFCMAFX8="; + aarch64 = "sha256-K1e1Q//X+R4FfY60eE4nPgEaF0wUkUIO/AFzzjIrGRY="; }.${arch}; }; }; @@ -59,8 +58,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-BXofrKElgCG3+WUCanpX1sGLhirj2pLi+pi24Z+WjBk="; - aarch64 = "sha256-CdePRa6jmWlt3Wismt3RahGzYOm1ZDwQRt82kRVXSdM="; + x86_64 = "sha256-wdZninKynNQ5o2nxyOxA7GDQ75tWs1TB2jh21O0fEpg="; + aarch64 = "sha256-5iAoMyesBjmdAy/eSMkgtuYv5rnXAEjgLb0yNX02mdw="; }.${arch}; }; }; @@ -74,8 +73,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-aprXjNv2NMoIDCNkFxwmMKcGUt2ssRonzTZ/hH57Mig="; - aarch64 = "sha256-Aq9PDVo/9zTeQ2j6q5bf1aIKjKM7oonIr1mEQ7rX48Y="; + x86_64 = "sha256-SYeCXWGSi8bPbqngGC+ZSBQaKyZrDTFeT+RLKC+ZsDk="; + aarch64 = "sha256-DN6fl7p+q96wsg9Mq6v3lTV0/7b87MFKTJSFuNrjLgs="; }.${arch}; }; }; @@ -106,8 +105,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-39DXU7wIsdxkUpNKnYPT7+qPJ2DrF7G7UJqPfhEDGGs="; - aarch64 = "sha256-7GwKGNHWPZ3uOFyzQj1dftFFz/3oa2j8XWkRn0wnllY="; + x86_64 = "sha256-QY16KSNZj6rq7YL+gOajI80XVtSdCh7MJGPscRJuf1o="; + aarch64 = "sha256-oZXx87dlLZ61ezwDD0WnV48ZMjcK0FkSGl83LhkJvmc="; }.${arch}; }; }; @@ -121,8 +120,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-zNBzFHmNaxUutzMh/5pOglJiKh5NAvSVwvPYyA6RVr4="; - aarch64 = "sha256-RtLXB9kgpLERfhpvDTaJG84qVyN1Puud1PTZtk/WIO0="; + x86_64 = "sha256-FC4zgx+75S9TJVp0azWgON/wNmoEy0074tj+DOdvNOg="; + aarch64 = "sha256-wnRQKqg1V4hrD9VAg6sw8yypB97Wcivt4cH6MFP4KPs="; }.${arch}; }; }; @@ -136,8 +135,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-vpvmKZKVl6ubfq8QMDr0xprXYMWl576hu+ovvREN4ak="; - aarch64 = "sha256-5Yqxgl4kkN3Bb7hsTnd9q5TsCpVBVkEVvqPbL5MYEyg="; + x86_64 = "sha256-eSYWuw6s3H1ht4zPDwjd4oZ49KhIn1OaywtwKHyS0wI="; + aarch64 = "sha256-9O0+S3G3vtjN1Vd4euf3gYRPPtrVxoBB+Uj7BlDAS5M="; }.${arch}; }; }; @@ -151,8 +150,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-4SAiEZWSUaiK8QO2Hg39FBcj1aYRtbOJkeF1W1AMQBo="; - aarch64 = "sha256-+KGDlo6QK3o/n2vSiD0HpIkBwqwIiMXzdFUpfE48gps="; + x86_64 = "sha256-kJoXaSwsjArpe4tqeSkZiU4AcR5dLBvdsyU7tBTiTdc="; + aarch64 = "sha256-qydFxa0lQEwsxZQPlBXV/wiuXGuIcBHRasKZEmXJaOk="; }.${arch}; }; }; @@ -166,8 +165,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-bhcpzsS9cci3Y3Pk9DOrtPonKjRg/vzDqDr3Be/xfks="; - aarch64 = "sha256-YCb4leFWRtx4VPwK/5vgwwDH3/f0/0OWEy4ueAS7sUw="; + x86_64 = "sha256-BAEXN6sx4f+BJnKz0lkPoAmRXnlbl5s5ETAyfE/AZak="; + aarch64 = "sha256-xayvsFAglBxAB49j2tnt52d6KX6LxMBRfx0wR/p8K70="; }.${arch}; }; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 67c071b5b938..2eb87c8394d8 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -255,12 +255,12 @@ rec { cdt = buildEclipseUpdateSite rec { name = "cdt-${version}"; # find current version at https://github.com/eclipse-cdt/cdt/releases - version = "11.1.1"; + version = "11.2.0"; src = fetchzip { stripRoot = false; url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/${lib.versions.majorMinor version}/${name}/${name}.zip"; - hash = "sha256-k78QKPIb3Lr0Wcg2tTlX1abdpcvxspjaxJiP2Hrgb4A="; + hash = "sha256-YEmoAFzyGOyreg8FiL/gcwXROHT5VoLb1DfHhBp1tsQ="; }; meta = with lib; { diff --git a/pkgs/applications/editors/eclipse/update.sh b/pkgs/applications/editors/eclipse/update.sh new file mode 100755 index 000000000000..7e100ccfbcd7 --- /dev/null +++ b/pkgs/applications/editors/eclipse/update.sh @@ -0,0 +1,72 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash --pure -p curl cacert libxml2 yq nix jq +#! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/3c7487575d9445185249a159046cc02ff364bff8.tar.gz +# ^ +# | +# nixos-unstable ~ 2023-07-06 -----------------/ + +set -o errexit +set -o nounset + +# scrape the downloads page for release info + +curl -s -o eclipse-dl.html https://download.eclipse.org/eclipse/downloads/ +trap "rm eclipse-dl.html" EXIT + +dlquery() { + q=$1 + xmllint --html eclipse-dl.html --xmlout 2>/dev/null | xq -r ".html.body.main.div.table[3].tr[1].td[0].a${q}"; +} + +# extract release info from download page HTML + +platform_major=$(dlquery '."#text" | split(".") | .[0]' -r); +platform_minor=$(dlquery '."#text" | split(".") | .[1]' -r); + +year=$(dlquery '."@href" | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[0:4]') +buildmonth=$(dlquery '."@href" | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[4:6]') +builddaytime=$(dlquery '."@href" | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[6:12]') +timestamp="${year}${buildmonth}${builddaytime}"; + +# account for possible release-month vs. build-month mismatches + +month=$buildmonth; +case "$buildmonth" in + '02'|'04') month='03' ;; + '05'|'07') month='06' ;; + '08'|'10') month='09' ;; + '11'|'01') month='12' ;; +esac + +cat < ./Tools/src/checkstyle.sh substituteInPlace agent/platform/platform_unix.go \ - --replace "/usr/bin/uname" "${coreutils}/bin/uname" \ - --replace '"/bin", "hostname"' '"${nettools}/bin/hostname"' \ - --replace '"lsb_release"' '"${fake-lsb-release}/bin/lsb_release"' - - substituteInPlace agent/managedInstances/fingerprint/hardwareInfo_unix.go \ - --replace /usr/sbin/dmidecode ${dmidecode}/bin/dmidecode + --replace "/usr/bin/uname" "${coreutils}/bin/uname" \ + --replace '"/bin", "hostname"' '"${nettools}/bin/hostname"' \ + --replace '"lsb_release"' '"${fake-lsb-release}/bin/lsb_release"' substituteInPlace agent/session/shell/shell_unix.go \ - --replace '"script"' '"${util-linux}/bin/script"' + --replace '"script"' '"${util-linux}/bin/script"' + + substituteInPlace agent/rebooter/rebooter_unix.go \ + --replace "/sbin/shutdown" "shutdown" echo "${version}" > VERSION '' + lib.optionalString overrideEtc '' substituteInPlace agent/appconfig/constants_unix.go \ --replace '"/etc/amazon/ssm/"' '"${placeholder "out"}/etc/amazon/ssm/"' + '' + lib.optionalString stdenv.isLinux '' + substituteInPlace agent/managedInstances/fingerprint/hardwareInfo_unix.go \ + --replace /usr/sbin/dmidecode ${dmidecode}/bin/dmidecode ''; preBuild = '' @@ -129,11 +137,23 @@ buildGoPackage rec { wrapProgram $out/bin/amazon-ssm-agent --prefix PATH : ${bashInteractive}/bin ''; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = ssm-agent; + command = "amazon-ssm-agent --version"; + }; + }; + meta = with lib; { description = "Agent to enable remote management of your Amazon EC2 instance configuration"; + changelog = "https://github.com/aws/amazon-ssm-agent/releases/tag/${version}"; homepage = "https://github.com/aws/amazon-ssm-agent"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ copumpkin manveru ]; + maintainers = with maintainers; [ copumpkin manveru anthonyroussel ]; + + # Darwin support is broken + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index adc1b508d862..9c0fbdf11748 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.50.17"; + version = "0.51.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-N/6l2hFb8jlq6NdGShXgr2BijOfWpfVziVFQRkz0Cu8="; + hash = "sha256-aCgJGoRJUALs94J/2zoRgCIiY9D6SquIX5FOIQiGytU="; }; vendorHash = "sha256-HWcm8y8bySMV3ue1RpxiXfYyV33cXGFII1/d+XD2Iro="; diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index f3ec46f3641c..7611f4dfa03f 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -7,6 +7,7 @@ , yarn , nodejs , fetchYarnDeps +, jq , electron , element-web , sqlcipher @@ -40,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { sha256 = desktopYarnHash; }; - nativeBuildInputs = [ yarn fixup_yarn_lock nodejs makeWrapper ] + nativeBuildInputs = [ yarn fixup_yarn_lock nodejs makeWrapper jq ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; inherit seshat; diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix index ef8b1e4b584b..5f0506b0220c 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.43"; + "version" = "1.11.45"; "hashes" = { - "desktopSrcHash" = "sha256-mFI3+IRBrJT6wTxoggLTGoB48FyBoRhQSmUKbC8sASI="; - "desktopYarnHash" = "1w5blpdk61yqai6gwk9n28cf57crnahs6hr0p3xvwchbc9x50dfq"; - "webSrcHash" = "sha256-LF6SMHYP2mxxHnh1YcLYoTEME7SgTVMKa8lz1rVZ+HA="; - "webYarnHash" = "0qvvhbj5mrrry2zcslz5n3pv4bpmdr5vsv446fm4cfvrj4awbz06"; + "desktopSrcHash" = "sha256-SxpnvIctV738mMRmMiuLgr1InMrlWH39/6lTO0wu+vQ="; + "desktopYarnHash" = "09a2swngqjz4hahzvczhw0lh38y39glc1dkkhjkp4jqvmds9ni7n"; + "webSrcHash" = "sha256-hImwZ7vzpupRulk9g5jhfv0sgZqmPXnggJjUUwZ+UCE="; + "webYarnHash" = "0r2xzq9630vky32hqp3h1skdgv3jiiffi8553yzzk4zr45nlvf9d"; }; } diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index e5ac878846d9..9c49d1f594f6 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ (if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec { pname = "signalbackup-tools"; - version = "20230928-1"; + version = "20230929"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-wL9Yv6+7PynbBr+GgA8ohS5w5/iVTtrC3R2SG5MWJVQ="; + hash = "sha256-5U8znPKCe4auQRfysVUzXawnvnSj86MD3J2vfAwxofE="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index 601643edcfd6..c79b6f0b03da 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -24,11 +24,9 @@ let pname = "teams"; versions = { - linux = "1.5.00.23861"; darwin = "1.6.00.4464"; }; hashes = { - linux = "sha256-h0YnCeJX//l4TegJVZtavV3HrxjYUF2Fa5KmaYmZW8E="; darwin = "sha256-DvXMrXotKWUqFCb7rZj8wU7mmZJKuTLGyx8qOB/aQtg="; }; meta = with lib; { @@ -38,112 +36,10 @@ let sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ liff tricktron ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "teams"; }; - linux = stdenv.mkDerivation rec { - inherit pname meta; - version = versions.linux; - - src = fetchurl { - urls = [ - "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${versions.linux}_amd64.deb" - # NOTE: the archive.org timestamp must also be updated if the version changes. - "https://web.archive.org/web/20221130115842if_/https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${versions.linux}_amd64.deb" - ]; - hash = hashes.linux; - }; - - nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook asar ]; - - unpackCmd = "dpkg -x $curSrc ."; - - buildInputs = atomEnv.packages ++ [ - libuuid - at-spi2-atk - ]; - - runtimeDependencies = [ - (lib.getLib systemd) - pulseaudio - libappindicator-gtk3 - ]; - - preFixup = '' - gappsWrapperArgs+=( - --prefix PATH : "${coreutils}/bin:${gawk}/bin" - - # fix for https://docs.microsoft.com/en-us/answers/questions/298724/open-teams-meeting-link-on-linux-doens39t-work.html?childToView=309406#comment-309406 - --append-flags '--disable-namespace-sandbox --disable-setuid-sandbox' - ) - ''; - - - buildPhase = '' - runHook preBuild - - asar extract share/teams/resources/app.asar "$TMP/work" - substituteInPlace $TMP/work/main.bundle.js \ - --replace "/usr/share/pixmaps/" "$out/share/pixmaps" \ - --replace "/usr/bin/xdg-mime" "${xdg-utils}/bin/xdg-mime" \ - --replace "Exec=/usr/bin/" "Exec=" # Remove usage of absolute path in autostart. - asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" share/teams/resources/app.asar - - runHook postBuild - ''; - - preferLocalBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{opt,bin} - - mv share/teams $out/opt/ - mv share $out/share - - mkdir -p $out/share/icons/hicolor/512x512/apps - mv $out/share/pixmaps/teams.png $out/share/icons/hicolor/512x512/apps - rmdir $out/share/pixmaps - - substituteInPlace $out/share/applications/teams.desktop \ - --replace /usr/bin/ "" - - ln -s $out/opt/teams/teams $out/bin/ - - ${lib.optionalString (!enableRectOverlay) '' - # Work-around screen sharing bug - # https://docs.microsoft.com/en-us/answers/questions/42095/sharing-screen-not-working-anymore-bug.html - rm $out/opt/teams/resources/app.asar.unpacked/node_modules/slimcore/bin/rect-overlay - ''} - - runHook postInstall - ''; - - dontAutoPatchelf = true; - - # Includes runtimeDependencies in the RPATH of the included Node modules - # so that dynamic loading works. We cannot use directly runtimeDependencies - # here, since the libraries from runtimeDependencies are not propagated - # to the dynamically loadable node modules because of a condition in - # autoPatchElfHook since *.node modules have Type: DYN (Shared object file) - # instead of EXEC or INTERP it expects. - # Fixes: https://github.com/NixOS/nixpkgs/issues/85449 - postFixup = '' - autoPatchelf "$out" - - runtime_rpath="${lib.makeLibraryPath runtimeDependencies}" - - for mod in $(find "$out/opt/teams" -name '*.node'); do - mod_rpath="$(patchelf --print-rpath "$mod")" - - echo "Adding runtime dependencies to RPATH of Node module $mod" - patchelf --set-rpath "$runtime_rpath:$mod_rpath" "$mod" - done; - ''; - }; - appName = "Teams.app"; darwin = stdenv.mkDerivation { @@ -178,4 +74,4 @@ let in if stdenv.isDarwin then darwin -else linux +else throw "Teams app for Linux has been removed as it is unmaintained by upstream. (2023-09-29)" diff --git a/pkgs/applications/networking/utahfs/default.nix b/pkgs/applications/networking/utahfs/default.nix deleted file mode 100644 index e867ff46e7de..000000000000 --- a/pkgs/applications/networking/utahfs/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ buildGoPackage, lib, fetchFromGitHub }: - -buildGoPackage rec { - pname = "utahfs"; - version = "1.0"; - src = fetchFromGitHub { - owner = "cloudflare"; - repo = pname; - rev = "v${version}"; - sha256 = "1hpwch5fsqlxwpk5afawa1k5s0bx5c1cw0hvdllp7257lgly19fb"; - }; - - goPackagePath = "github.com/cloudflare/utahfs"; - - meta = with lib; { - homepage = "https://github.com/cloudflare/utahfs"; - description = - "Encrypted storage system that provides a user-friendly FUSE drive backed by cloud storage"; - license = licenses.bsd3; - maintainers = [ maintainers.snglth ]; - platforms = platforms.unix; - # does not build with go 1.17: https://github.com/cloudflare/utahfs/issues/46 - broken = true; - }; -} diff --git a/pkgs/applications/radio/direwolf/default.nix b/pkgs/applications/radio/direwolf/default.nix index d3c01aff7695..e5af2fc0206a 100644 --- a/pkgs/applications/radio/direwolf/default.nix +++ b/pkgs/applications/radio/direwolf/default.nix @@ -1,7 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, cmake, alsa-lib, espeak, gpsd -, hamlib, perl, python3, udev }: - -with lib; +{ lib +, stdenv +, fetchFromGitHub +, cmake +, alsa-lib +, gpsd +, gpsdSupport ? false +, hamlib +, hamlibSupport ? true +, perl +, python3 +, espeak +, udev +, extraScripts ? false +}: stdenv.mkDerivation rec { pname = "direwolf"; @@ -18,9 +29,14 @@ stdenv.mkDerivation rec { strictDeps = true; - buildInputs = [ - espeak gpsd hamlib perl python3 - ] ++ (optionals stdenv.isLinux [alsa-lib udev]); + buildInputs = lib.optionals stdenv.isLinux [ alsa-lib udev ] + ++ lib.optionals gpsdSupport [ gpsd ] + ++ lib.optionals hamlibSupport [ hamlib ] + ++ lib.optionals extraScripts [ python3 perl espeak ]; + + preConfigure = lib.optionals (!extraScripts) '' + echo "" > scripts/CMakeLists.txt + ''; postPatch = '' substituteInPlace conf/CMakeLists.txt \ @@ -31,21 +47,23 @@ stdenv.mkDerivation rec { substituteInPlace src/decode_aprs.c \ --replace /usr/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt \ --replace /opt/local/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt - patchShebangs scripts/dwespeak.sh - substituteInPlace scripts/dwespeak.sh \ - --replace espeak ${espeak}/bin/espeak substituteInPlace cmake/cpack/direwolf.desktop.in \ --replace 'Terminal=false' 'Terminal=true' \ --replace 'Exec=@APPLICATION_DESKTOP_EXEC@' 'Exec=direwolf' substituteInPlace src/dwgpsd.c \ --replace 'GPSD_API_MAJOR_VERSION > 11' 'GPSD_API_MAJOR_VERSION > 14' + '' + + lib.optionalString extraScripts '' + patchShebangs scripts/dwespeak.sh + substituteInPlace scripts/dwespeak.sh \ + --replace espeak ${espeak}/bin/espeak ''; - meta = { + meta = with lib; { description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway"; homepage = "https://github.com/wb2osz/direwolf/"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ lasandell ]; + maintainers = with maintainers; [ lasandell sarcasticadmin ]; }; } diff --git a/pkgs/applications/radio/pat/default.nix b/pkgs/applications/radio/pat/default.nix index 58eefd0dbcd0..991df60b24bc 100644 --- a/pkgs/applications/radio/pat/default.nix +++ b/pkgs/applications/radio/pat/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, libax25 +, installShellFiles +}: buildGoModule rec { pname = "pat"; @@ -15,10 +21,25 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; + nativeBuildInputs = [ + installShellFiles + ]; + + buildInputs = lib.optional stdenv.isLinux [ libax25 ]; + + # Needed by wl2k-go go module for libax25 to include support for Linux' AX.25 stack by linking against libax25. + # ref: https://github.com/la5nta/wl2k-go/blob/abe3ae5bf6a2eec670a21672d461d1c3e1d4c2f3/transport/ax25/ax25.go#L11-L17 + tags = lib.optionals stdenv.isLinux [ "libax25" ]; + + postInstall = '' + installManPage man/pat-configure.1 man/pat.1 + ''; + meta = with lib; { description = "Pat is a cross platform Winlink client written in Go."; homepage = "https://getpat.io/"; license = licenses.mit; - maintainers = with maintainers; [ dotemup ]; + maintainers = with maintainers; [ dotemup sarcasticadmin ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/biology/dssp/default.nix b/pkgs/applications/science/biology/dssp/default.nix index 1281643fe794..78f226350f60 100644 --- a/pkgs/applications/science/biology/dssp/default.nix +++ b/pkgs/applications/science/biology/dssp/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , cmake +, eigen , fetchFromGitHub , libcifpp , libmcfp @@ -8,24 +9,24 @@ }: let libcifpp' = libcifpp.overrideAttrs (oldAttrs: { - # dssp 4.3.1 requires specific version "5.1.0" of libcifpp - version = "5.1.0"; + # dssp 4.4.3 requires specific version "5.2.0" of libcifpp + version = "5.2.0"; src = fetchFromGitHub { inherit (oldAttrs.src) owner repo rev; - hash = "sha256-PUsi4T6huSqwaa6RnBP1Vj+0a1ePrvrHD0641Lkkc5s="; + hash = "sha256-Sj10j6HxUoUvQ66cd2B8CO7CVBRd7w9CTovxkwPDOvs="; }; }); in stdenv.mkDerivation (finalAttrs: { pname = "dssp"; - version = "4.4.2"; + version = "4.4.3"; src = fetchFromGitHub { owner = "PDB-REDO"; repo = "dssp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-Gic/rE/G24P5g4Uhf2lcvVa6i/4KGQzCpK4KlpjXcS0="; + hash = "sha256-zPmRR7sxVNErwabLqA5CNMO4K1qHdmC9FBPjcx91KuM="; }; nativeBuildInputs = [ @@ -33,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + eigen libcifpp' libmcfp zlib diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index ce084c1f4a73..eb7637f7f2ff 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -1,47 +1,35 @@ -{ fetchFromGitHub, fetchpatch, lib, which, ocamlPackages }: +{ fetchurl, fetchpatch, lib, ocamlPackages }: let pname = "alt-ergo"; - version = "2.4.3"; + version = "2.5.1"; - configureScript = "ocaml unix.cma configure.ml"; - - src = fetchFromGitHub { - owner = "OCamlPro"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-2XARGr8rLiPMOM0rBBoRv5tZvKYtkLkJctGqLYkMe7Q="; + src = fetchurl { + url = "https://github.com/OCamlPro/alt-ergo/releases/download/v${version}/alt-ergo-${version}.tbz"; + hash = "sha256-nPjWmg5FepObhquioYxhVPq6UdOHtCo2Hs5V0yndYB0="; }; in let alt-ergo-lib = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-lib"; - inherit version src configureScript; - configureFlags = [ pname ]; - nativeBuildInputs = [ which ]; - buildInputs = with ocamlPackages; [ dune-configurator ]; - propagatedBuildInputs = with ocamlPackages; [ dune-build-info num ocplib-simplex seq stdlib-shims zarith ]; - preBuild = '' - substituteInPlace src/lib/util/version.ml --replace 'version="dev"' 'version="${version}"' - ''; + inherit version src; + buildInputs = with ocamlPackages; [ ppx_blob ]; + propagatedBuildInputs = with ocamlPackages; [ camlzip dolmen_loop dune-build-info fmt ocplib-simplex seq stdlib-shims zarith ]; }; in let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-parsers"; - inherit version src configureScript; - configureFlags = [ pname ]; - nativeBuildInputs = [ which ocamlPackages.menhir ]; - propagatedBuildInputs = [ alt-ergo-lib ] ++ (with ocamlPackages; [ camlzip psmt2-frontend ]); + inherit version src; + nativeBuildInputs = [ ocamlPackages.menhir ]; + propagatedBuildInputs = [ alt-ergo-lib ] ++ (with ocamlPackages; [ psmt2-frontend ]); }; in ocamlPackages.buildDunePackage { - inherit pname version src configureScript; + inherit pname version src; - configureFlags = [ pname ]; - - nativeBuildInputs = [ which ocamlPackages.menhir ]; - buildInputs = [ alt-ergo-parsers ocamlPackages.cmdliner ]; + nativeBuildInputs = [ ocamlPackages.menhir ]; + buildInputs = [ alt-ergo-parsers ] ++ (with ocamlPackages; [ cmdliner dune-site ]); meta = { description = "High-performance theorem prover and SMT solver"; diff --git a/pkgs/applications/science/logic/easycrypt/default.nix b/pkgs/applications/science/logic/easycrypt/default.nix index abd2b0cb2758..32243455ae5f 100644 --- a/pkgs/applications/science/logic/easycrypt/default.nix +++ b/pkgs/applications/science/logic/easycrypt/default.nix @@ -1,25 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, ocamlPackages, why3 }: +{ lib, stdenv, fetchFromGitHub, ocamlPackages, why3 }: stdenv.mkDerivation rec { pname = "easycrypt"; - version = "2022.04"; + version = "2023.09"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "r${version}"; - sha256 = "sha256:09rdwcj70lkamkhd895p284rfpz4bcnsf55mcimhiqncd2a21ml7"; + hash = "sha256-9xavU9jRisZekPqC87EyiLXtZCGu/9QeGzq6BJGt1+Y="; }; - patches = lib.lists.map fetchpatch [ - # Fix build with Why3 1.5 - { url = "https://github.com/EasyCrypt/easycrypt/commit/d226387432deb7f22738e1d5579346a2cbc9be7a.patch"; - hash = "sha256:1zvxij35fnr3h9b5wdl8ml17aqfx3a39rd4mgwmdvkapbg3pa4lm"; } - # Fix build with Why3 1.6 - { url = "https://github.com/EasyCrypt/easycrypt/commit/876f2ed50a0434afdf2fb20e7c50b8a3e26bb06e.patch"; - hash = "sha256-UycfLZWYHNsppb7qHSRaAF4Y0UnwoFueEG0wUcBUPYE="; } - ]; - nativeBuildInputs = with ocamlPackages; [ dune_3 findlib diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix index 4662f0da5128..b495652a3364 100644 --- a/pkgs/applications/version-management/git-mit/default.nix +++ b/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.12.152"; + version = "5.12.153"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-FW7vstYJNJ29v3BNsyRFk57sW3jjA7aurXzz6je1nuo="; + hash = "sha256-bYSWNNMDH1iTGmpLB3m/LCS8GltTdjfjeMwtB5Ss7dk="; }; - cargoHash = "sha256-FQmWAvSuif0/mTVl2xzI4JVLCxn7CXYubGdi55kk2Mk="; + cargoHash = "sha256-FAihHJTnnHYCphEVMPA1YPT/Nj9m4DwkbhGbZJOlm0o="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/video/dmlive/default.nix b/pkgs/applications/video/dmlive/default.nix index 5c198ae0dcfa..43e659bbfcc7 100644 --- a/pkgs/applications/video/dmlive/default.nix +++ b/pkgs/applications/video/dmlive/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "dmlive"; - version = "5.3.0"; + version = "5.3.1"; src = fetchFromGitHub { owner = "THMonster"; repo = pname; - rev = "92ce90163c3d84f0fab99e6dc192a65c616ffd81"; # no tag - hash = "sha256-3eRC/XmvZXe3DyXOqSkNpTbddtGr/lcaTaFYqZLZq+w="; + rev = "0a07fd1b831bc9e9d34e474284430297b63446c7"; # no tag + hash = "sha256-Jvxbdm9Swh8m03uZEMTkUhIHNfhE+N2a3w7j+liweKE="; }; - cargoHash = "sha256-TQTdz+ZC5cZxWhccnUmXnq+j2EYM5486mIjn6Poe5a8="; + cargoHash = "sha256-/84T7K6WUt2Bfx9qdZjyOHcJEGoquCfRX1ctQBuUjEc="; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix index 9d32d9864ac0..a174c3031227 100644 --- a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix +++ b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix @@ -2,7 +2,7 @@ , glibc , fetchFromGitLab , makeWrapper -, buildGoPackage +, buildGoModule , linkFarm , writeShellScript , containerRuntimePath @@ -24,7 +24,7 @@ let fi ''; in -buildGoPackage rec { +buildGoModule rec { pname = "container-toolkit/container-toolkit"; version = "1.9.0"; @@ -32,20 +32,30 @@ buildGoPackage rec { owner = "nvidia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b4mybNB5FqizFTraByHk5SCsNO66JaISj18nLgLN7IA="; + hash = "sha256-b4mybNB5FqizFTraByHk5SCsNO66JaISj18nLgLN7IA="; }; - goPackagePath = "github.com/NVIDIA/nvidia-container-toolkit"; + vendorHash = null; + + postPatch = '' + # replace the default hookDefaultFilePath to the $out path + substituteInPlace cmd/nvidia-container-runtime/main.go \ + --replace '/usr/bin/nvidia-container-runtime-hook' '${placeholder "out"}/bin/nvidia-container-runtime-hook' + ''; ldflags = [ "-s" "-w" ]; nativeBuildInputs = [ makeWrapper ]; - preBuild = '' - # replace the default hookDefaultFilePath to the $out path - substituteInPlace go/src/github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-container-runtime/main.go \ - --replace '/usr/bin/nvidia-container-runtime-hook' '${placeholder "out"}/bin/nvidia-container-runtime-hook' - ''; + checkFlags = + let + skippedTests = [ + # Disable tests executing nvidia-container-runtime command. + "TestGoodInput" + "TestDuplicateHook" + ]; + in + [ "-skip" "${builtins.concatStringsSep "|" skippedTests}" ]; postInstall = '' mkdir -p $out/etc/nvidia-container-runtime diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix index c3c4a7b1e57b..7212ffa40dcb 100644 --- a/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -71,7 +71,5 @@ stdenv.mkDerivation ({ platforms = graalvmDrv.meta.platforms; # default to executable name mainProgram = executable; - # need to have native-image-installable-svm available - broken = !(builtins.any (p: (p.product or "") == "native-image-installable-svm") graalvmDrv.products); } // meta; } // extraArgs) diff --git a/pkgs/build-support/php/pkgs/composer-phar.nix b/pkgs/build-support/php/pkgs/composer-phar.nix index 3efd9098d6df..7269d3029b6b 100644 --- a/pkgs/build-support/php/pkgs/composer-phar.nix +++ b/pkgs/build-support/php/pkgs/composer-phar.nix @@ -14,11 +14,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "composer-phar"; - version = "2.6.3"; + version = "2.6.4"; src = fetchurl { url = "https://github.com/composer/composer/releases/download/${finalAttrs.version}/composer.phar"; - hash = "sha256-5Yo5DKwN9FzPWj2VrpT6I57e2LeQf6LI91LwIDBPybE="; + hash = "sha256-Wjnz4s5bo5HuP+yyJ/ryE5D1t+1cVvFMq54cMEi8+Lg="; }; dontUnpack = true; diff --git a/pkgs/by-name/ca/cargo-i18n/package.nix b/pkgs/by-name/ca/cargo-i18n/package.nix new file mode 100644 index 000000000000..158d22f97b03 --- /dev/null +++ b/pkgs/by-name/ca/cargo-i18n/package.nix @@ -0,0 +1,34 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-i18n"; + version = "0.2.12"; + + src = fetchFromGitHub { + owner = "kellpossible"; + repo = "cargo-i18n"; + rev = "v${version}"; + hash = "sha256-ck0GYy9DLngOunpItGQ4+qrlzaWDk0zTnIzuRQt2/Gw="; + }; + + cargoHash = "sha256-nvZx2wJDs7PZQLCl8Hrf2blR+lNUBVr6k664VSVQ5iI="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + ]; + + cargoTestFlags = [ "--lib" ]; + + meta = with lib; { + description = "Rust Cargo sub-command and libraries to extract and build localization resources to embed in your application/library"; + homepage = "https://github.com/kellpossible/cargo-i18n"; + license = licenses.mit; + maintainers = with maintainers; [ xrelkd ]; + mainProgram = "cargo-i18n"; + }; +} diff --git a/pkgs/by-name/co/colorized-logs/package.nix b/pkgs/by-name/co/colorized-logs/package.nix new file mode 100644 index 000000000000..9913d0d765ba --- /dev/null +++ b/pkgs/by-name/co/colorized-logs/package.nix @@ -0,0 +1,30 @@ +{ cmake +, fetchFromGitHub +, lib +, stdenv +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "colorized-logs"; + version = "2.6"; + + src = fetchFromGitHub { + owner = "kilobyte"; + repo = "colorized-logs"; + rev = "v${finalAttrs.version}"; + hash = "sha256-QiZeIYeIWA3C7wYi2G2EItdW+jLjVrCbIYllur/RtY8="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = { + description = "Tools for logs with ANSI color"; + homepage = "https://github.com/kilobyte/colorized-logs"; + changelog = "https://github.com/kilobyte/colorized-logs/blob/v${finalAttrs.version}/ChangeLog"; + license = with lib.licenses; [ mit ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ CobaltCause ]; + }; +}) diff --git a/pkgs/by-name/co/controku/package.nix b/pkgs/by-name/co/controku/package.nix new file mode 100644 index 000000000000..a52d2e326464 --- /dev/null +++ b/pkgs/by-name/co/controku/package.nix @@ -0,0 +1,4 @@ +{ python3Packages +}: + +with python3Packages; toPythonApplication (controku.override { buildApplication = true; }) diff --git a/pkgs/tools/misc/eza/default.nix b/pkgs/by-name/ez/eza/package.nix similarity index 95% rename from pkgs/tools/misc/eza/default.nix rename to pkgs/by-name/ez/eza/package.nix index e675cd1b7608..52d7ad5bc804 100644 --- a/pkgs/tools/misc/eza/default.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -7,7 +7,7 @@ , pandoc , pkg-config , zlib -, Security +, darwin , libiconv , installShellFiles # once eza upstream gets support for setting up a compatibilty symlink for exa, we should change @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] - ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; buildNoDefaultFeatures = true; buildFeatures = lib.optional gitSupport "git"; diff --git a/pkgs/by-name/ga/game-rs/package.nix b/pkgs/by-name/ga/game-rs/package.nix new file mode 100644 index 000000000000..127e06f7129e --- /dev/null +++ b/pkgs/by-name/ga/game-rs/package.nix @@ -0,0 +1,32 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, steam-run +}: + +rustPlatform.buildRustPackage rec { + pname = "game-rs"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "amanse"; + repo = "game-rs"; + rev = "v${version}"; + hash = "sha256-M9/hFItoCL8fSrc0dFNn43unqkIaD179OGUdbXL6/Rs="; + }; + + cargoHash = "sha256-aq58sFK4/Zd8S4dOWjag+g5PmTeaVAK3FS3fW/YlCLs="; + + buildFeatures = [ "nixos" ]; + + propagatedBuildInputs = [ steam-run ]; + + meta = with lib; { + description = "Minimal CLI game launcher for linux"; + homepage = "https://github.com/amanse/game-rs"; + changelog = "https://github.com/Amanse/game-rs/releases/tag/v${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ amanse ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/gh/gh-screensaver/package.nix b/pkgs/by-name/gh/gh-screensaver/package.nix new file mode 100644 index 000000000000..b5466c791333 --- /dev/null +++ b/pkgs/by-name/gh/gh-screensaver/package.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "gh-screensaver"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "vilmibm"; + repo = "gh-screensaver"; + rev = "v${version}"; + hash = "sha256-MqwaqXGP4E+46vpgftZ9bttmMyENuojBnS6bWacmYLE="; + }; + + vendorHash = "sha256-o9B6Q07GP/CFekG3av01boZA7FdZg4x8CsLC3lwhn2A="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "gh extension with animated terminal screensavers"; + homepage = "https://github.com/vilmibm/gh-screensaver"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ foo-dogsquared ]; + mainProgram = "gh-screensaver"; + }; +} diff --git a/pkgs/by-name/gu/guile-avahi/package.nix b/pkgs/by-name/gu/guile-avahi/package.nix new file mode 100644 index 000000000000..3ad6ff9dd2c3 --- /dev/null +++ b/pkgs/by-name/gu/guile-avahi/package.nix @@ -0,0 +1,39 @@ +{ stdenv +, lib +, fetchgit +, avahi +, gmp +, autoreconfHook +, pkg-config +, texinfo +, guile +}: + +stdenv.mkDerivation rec { + pname = "guile-avahi"; + version = "0.4.1"; + + src = fetchgit { + url = "git://git.sv.gnu.org/guile-avahi.git"; + rev = "v${version}"; + hash = "sha256-Yr+OiqaGv6DgsjxSoc4sAjy4OO/D+Q50vdSTPEeIrV8="; + }; + + strictDeps = true; + nativeBuildInputs = [ autoreconfHook guile pkg-config texinfo ]; + buildInputs = [ guile ]; + propagatedBuildInputs = [ avahi gmp ]; + + doCheck = true; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-unused-function"; + + meta = with lib; { + description = "Bindings to Avahi for GNU Guile"; + homepage = "https://www.nongnu.org/guile-avahi/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ foo-dogsquared ]; + platforms = guile.meta.platforms; + }; +} + diff --git a/pkgs/by-name/gu/guile-lzma/package.nix b/pkgs/by-name/gu/guile-lzma/package.nix new file mode 100644 index 000000000000..d9be1253acb6 --- /dev/null +++ b/pkgs/by-name/gu/guile-lzma/package.nix @@ -0,0 +1,37 @@ +{ stdenv +, lib +, fetchurl +, xz +, pkg-config +, guile +, scheme-bytestructures +}: + +stdenv.mkDerivation rec { + pname = "guile-lzma"; + version = "0.1.1"; + + src = fetchurl { + url = "https://files.ngyro.com/guile-lzma/guile-lzma-${version}.tar.gz"; + hash = "sha256-K4ZoltZy7U05AI9LUzZ1DXiXVgoGZ4Nl9cWnK9L8zl4="; + }; + + strictDeps = true; + nativeBuildInputs = [ + guile + pkg-config + scheme-bytestructures + ]; + buildInputs = [ guile ]; + propagatedBuildInputs = [ xz ]; + + doCheck = true; + + meta = with lib; { + homepage = "https://ngyro.com/software/guile-lzma.html"; + description = "Guile wrapper for lzma library"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ foo-dogsquared ]; + platforms = guile.meta.platforms; + }; +} diff --git a/pkgs/by-name/gu/guile-semver/package.nix b/pkgs/by-name/gu/guile-semver/package.nix new file mode 100644 index 000000000000..ac2a95b09f1a --- /dev/null +++ b/pkgs/by-name/gu/guile-semver/package.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchurl +, autoreconfHook +, pkg-config +, texinfo +, guile +}: + +stdenv.mkDerivation rec { + pname = "guile-semver"; + version = "0.1.1"; + + src = fetchurl { + url = "https://files.ngyro.com/guile-semver/${pname}-${version}.tar.gz"; + hash = "sha256-T3kJGTdf6yBKjqLtqSopHZu03kyOscZ3Z4RYmoYlN4E="; + }; + + strictDeps = true; + nativeBuildInputs = [ autoreconfHook guile pkg-config texinfo ]; + buildInputs = [ guile ]; + + doCheck = true; + + meta = with lib; { + description = + "A GNU Guile library implementing Semantic Versioning 2.0.0"; + homepage = "https://ngyro.com/software/guile-semver.html"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ foo-dogsquared ]; + platforms = guile.meta.platforms; + }; +} diff --git a/pkgs/by-name/gu/guile-zlib/package.nix b/pkgs/by-name/gu/guile-zlib/package.nix new file mode 100644 index 000000000000..a7559ebfbba5 --- /dev/null +++ b/pkgs/by-name/gu/guile-zlib/package.nix @@ -0,0 +1,39 @@ +{ stdenv +, lib +, fetchFromGitea +, autoreconfHook +, pkg-config +, guile +, texinfo +, zlib +}: + +stdenv.mkDerivation rec { + pname = "guile-zlib"; + version = "0.1.0"; + + src = fetchFromGitea { + domain = "notabug.org"; + owner = "guile-zlib"; + repo = "guile-zlib"; + rev = "v${version}"; + hash = "sha256-+5tdp4WcnVuhfMwkr8t3Jd6/U539X5Ys9Pgzy79F4cY="; + }; + + strictDeps = true; + nativeBuildInputs = [ autoreconfHook guile pkg-config texinfo ]; + buildInputs = [ guile ]; + propagatedBuildInputs = [ zlib ]; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + + doCheck = true; + + meta = with lib; { + description = + "Guile-zlib is a GNU Guile library providing bindings to zlib"; + homepage = "https://notabug.org/guile-zlib/guile-zlib"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ foo-dogsquared ]; + platforms = guile.meta.platforms; + }; +} diff --git a/pkgs/by-name/oe/oelint-adv/package.nix b/pkgs/by-name/oe/oelint-adv/package.nix new file mode 100644 index 000000000000..357772d5f8ec --- /dev/null +++ b/pkgs/by-name/oe/oelint-adv/package.nix @@ -0,0 +1,40 @@ +{ lib +, nix-update-script +, python3 +, fetchPypi +}: + +python3.pkgs.buildPythonApplication rec { + pname = "oelint-adv"; + version = "3.25.0"; + format = "setuptools"; + + src = fetchPypi { + inherit version; + pname = "oelint_adv"; + hash = "sha256-dhTS2DZ7Usb1jgBv9Wm86w8CCMt64aHyBrxucLZUQjs="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + anytree + colorama + oelint-parser + urllib3 + ]; + + pythonRelaxDeps = [ "urllib3" ]; + pythonImportsCheck = [ "oelint_adv" ]; + + # Fail to run inside the code the build. + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Advanced bitbake-recipe linter"; + homepage = "https://github.com/priv-kweihmann/oelint-adv"; + changelog = "https://github.com/priv-kweihmann/oelint-adv/releases/tag/v${version}"; + license = licenses.bsd2; + maintainers = with maintainers; [ otavio ]; + }; +} diff --git a/pkgs/by-name/op/openpgl/package.nix b/pkgs/by-name/op/openpgl/package.nix new file mode 100644 index 000000000000..6c94e9edfe50 --- /dev/null +++ b/pkgs/by-name/op/openpgl/package.nix @@ -0,0 +1,41 @@ +{ lib +, cmake +, fetchFromGitHub +, ninja +, stdenv +, tbb +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "openpgl"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "OpenPathGuidingLibrary"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + hash = "sha256-dbHmGGiHQkU0KPpQYpY/o0uCWdb3L5namETdOcOREgs="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + tbb + ]; + + cmakeFlags = [ + "-DOPENPGL_BUILD_STATIC=OFF" + "-DTBB_ROOT=${tbb.out}" + ]; + + meta = { + description = "Intel Open Path Guiding Library"; + homepage = "https://github.com/OpenPathGuidingLibrary/openpgl"; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.amarshall ]; + license = lib.licenses.asl20; + }; +}) diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix new file mode 100644 index 000000000000..9f405a88f7ea --- /dev/null +++ b/pkgs/by-name/ui/uiua/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + audioSupport ? true, + darwin, + alsa-lib, + pkg-config +}: +rustPlatform.buildRustPackage { + pname = "uiua"; + version = "unstable-2023-09-28"; + + src = fetchFromGitHub { + owner = "uiua-lang"; + repo = "uiua"; + rev = "9b8c65332396f521f170b0ed3ce104b7a8bcf7c0"; + hash = "sha256-+pleCEEwgRj+p+k9oKIvbsGUWC49qByV/juv76ZdBcc="; + }; + + cargoHash = "sha256-L8TCMe6eHS3QRy6HuTc1WvMfzsDhKx9YYupAkNeBwpk="; + + nativeBuildInputs = lib.optionals stdenv.isDarwin [ + rustPlatform.bindgenHook + ] ++ lib.optionals audioSupport [ + pkg-config + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + ] ++ lib.optionals (audioSupport && stdenv.isDarwin) [ + darwin.apple_sdk.frameworks.AudioUnit + ] ++ lib.optionals (audioSupport && stdenv.isLinux) [ + alsa-lib + ]; + + buildFeatures = lib.optional audioSupport "audio"; + + doCheck = true; + + meta = with lib; { + description = "A stack-oriented array programming language with a focus on simplicity, beauty, and tacit code"; + longDescription = '' + Uiua combines the stack-oriented and array-oriented paradigms in a single + language. Combining these already terse paradigms results in code with a very + high information density and little syntactic noise. + ''; + homepage = "https://www.uiua.org/"; + license = licenses.mit; + mainProgram = "uiua"; + maintainers = with maintainers; [ cafkafk ]; + }; +} diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 4716d217c261..12d0740c4384 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -14,7 +13,6 @@ , libgee , libhandy , granite -, libnotify , pango , elementary-dock , bamf @@ -28,7 +26,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "6.5.0"; + version = "6.5.2"; outputs = [ "out" "dev" ]; @@ -36,18 +34,9 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = "files"; rev = version; - sha256 = "sha256-E1e2eXGpycl2VXEUvUir5G3MRLz/4TQMvmOuWgU9JNc="; + sha256 = "sha256-YwXyqZ0exwQ3Qx+VWWyTTmhqCVr6be8tqzS1k3Luo8o="; }; - patches = [ - # meson: Don't run gtk-update-icon-cache - # https://github.com/elementary/files/pull/2294 - (fetchpatch { - url = "https://github.com/elementary/files/commit/758ece9fb29eb4a25f47065710dad4ac547ca2ce.patch"; - hash = "sha256-+OASDsOPH0g5Cyxw4JmVxA70zQHhcpqLMKKYP4VLTO0="; - }) - ]; - nativeBuildInputs = [ desktop-file-utils meson @@ -68,7 +57,6 @@ stdenv.mkDerivation rec { libgee libgit2-glib libhandy - libnotify pango sqlite systemd diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index d5bb01cecb9b..3e89aa38189d 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , substituteAll , pkg-config @@ -18,24 +17,15 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-network"; - version = "7.0.1"; + version = "7.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-pz2sWN33d20/fMByR+XrNz2lxPdgCA6vxism3E/Fh/I="; + sha256 = "sha256-PqTnopacT1/Ctx8VH6b35tiVI+3ZlrdFcRsDpAWm4a0="; }; - patches = [ - # PopoverWidget: fix flowbox child focus - # https://github.com/elementary/wingpanel-indicator-network/pull/288 - (fetchpatch { - url = "https://github.com/elementary/wingpanel-indicator-network/commit/88db9004249334e1316321e0373a3065900fe6f1.patch"; - sha256 = "sha256-rpAULo4qVPO3yr7cBVeKyT7L43zHVEdYLJD4x0ukBs4="; - }) - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index a3236c14a084..7d62411f5740 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -7,20 +7,23 @@ , darwin , fontconfig , glib +, glibc , gtk3 , makeWrapper +, musl +, runCommandCC , setJavaClassPath , unzip , xorg , zlib # extra params -, javaVersion -, meta ? { } -, products ? [ ] +, extraCLibs ? [ ] , gtkSupport ? stdenv.isLinux +, useMusl ? false , ... } @ args: +assert useMusl -> stdenv.isLinux; let extraArgs = builtins.removeAttrs args [ "lib" @@ -32,24 +35,56 @@ let "darwin" "fontconfig" "glib" + "glibc" "gtk3" "makeWrapper" + "musl" + "runCommandCC" "setJavaClassPath" "unzip" "xorg" "zlib" - "javaVersion" - "meta" - "products" + "extraCLibs" "gtkSupport" + "useMusl" + "passthru" + "meta" ]; + + cLibs = lib.optionals stdenv.isLinux ( + [ glibc zlib.static ] + ++ lib.optionals (!useMusl) [ glibc.static ] + ++ lib.optionals useMusl [ musl ] + ++ extraCLibs + ); + + # GraalVM 21.3.0+ expects musl-gcc as -musl-gcc + musl-gcc = (runCommandCC "musl-gcc" { } '' + mkdir -p $out/bin + ln -s ${lib.getDev musl}/bin/musl-gcc $out/bin/${stdenv.hostPlatform.system}-musl-gcc + ''); + # GraalVM 23.0.0+ (i.e.: JDK 21.0.0+) clean-up the environment inside darwin + # So we need to re-added some env vars to make everything work correctly again + darwin-cc = (runCommandCC "darwin-cc" + { + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ darwin.apple_sdk.frameworks.Foundation zlib ]; + } '' + makeWrapper ${stdenv.cc}/bin/cc $out/bin/cc \ + --prefix NIX_CFLAGS_COMPILE_${stdenv.cc.suffixSalt} : "$NIX_CFLAGS_COMPILE" \ + --prefix NIX_LDFLAGS_${stdenv.cc.suffixSalt} : "$NIX_LDFLAGS" + ''); + binPath = lib.makeBinPath ( + lib.optionals stdenv.isDarwin [ darwin-cc ] + ++ lib.optionals useMusl [ musl-gcc ] + ++ [ stdenv.cc ] + ); + runtimeLibraryPath = lib.makeLibraryPath ([ cups ] ++ lib.optionals gtkSupport [ cairo glib gtk3 ]); - mapProducts = key: default: (map (p: p.graalvmPhases.${key} or default) products); - concatProducts = key: lib.concatStringsSep "\n" (mapProducts key ""); - graalvmXXX-ce = stdenv.mkDerivation ({ - pname = "graalvm${javaVersion}-ce"; + graalvm-ce = stdenv.mkDerivation ({ + pname = "graalvm-ce"; unpackPhase = '' runHook preUnpack @@ -71,22 +106,16 @@ let # Sanity check if [ ! -d "$out/bin" ]; then - echo "The `bin` is directory missing after extracting the graalvm" - echo "tarball, please compare the directory structure of the" - echo "tarball with what happens in the unpackPhase (in particular" - echo "with regards to the `--strip-components` flag)." - exit 1 + echo "The `bin` is directory missing after extracting the graalvm" + echo "tarball, please compare the directory structure of the" + echo "tarball with what happens in the unpackPhase (in particular" + echo "with regards to the `--strip-components` flag)." + exit 1 fi runHook postUnpack ''; - postUnpack = '' - for product in ${toString products}; do - cp -Rv $product/* $out - done - ''; - dontStrip = true; nativeBuildInputs = [ unzip makeWrapper ] @@ -106,7 +135,6 @@ let xorg.libXtst ]; - preInstall = concatProducts "preInstall"; postInstall = '' # jni.h expects jni_md.h to be in the header search path. ln -sf $out/include/linux/*_md.h $out/include/ @@ -115,52 +143,72 @@ let # Set JAVA_HOME automatically. mkdir -p $out/nix-support cat > $out/nix-support/setup-hook << EOF - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi EOF - '' + concatProducts "postInstall"; + + wrapProgram $out/bin/native-image \ + --prefix PATH : ${binPath} \ + ${toString (map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") cLibs)} + ''; preFixup = lib.optionalString (stdenv.isLinux) '' for bin in $(find "$out/bin" -executable -type f); do wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" done - '' + concatProducts "preFixup"; - postFixup = concatProducts "postFixup"; + ''; doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck ${# broken in darwin - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.isLinux '' echo "Testing Jshell" echo '1 + 1' | $out/bin/jshell ''} - echo ${ - lib.escapeShellArg '' - public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello World"); - } + echo ${lib.escapeShellArg '' + public class HelloWorld { + public static void main(String[] args) { + System.out.println("Hello World"); } - '' - } > HelloWorld.java + } + ''} > HelloWorld.java $out/bin/javac HelloWorld.java # run on JVM with Graal Compiler echo "Testing GraalVM" $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' - ${concatProducts "installCheckPhase"} + echo "Ahead-Of-Time compilation" + $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:-CheckToolchain -H:+ReportExceptionStackTraces HelloWorld + ./helloworld | fgrep 'Hello World' + + ${# --static is only available in Linux + lib.optionalString (stdenv.isLinux && !useMusl) '' + echo "Ahead-Of-Time compilation with -H:+StaticExecutableWithDynamicLibC" + $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:+StaticExecutableWithDynamicLibC HelloWorld + ./helloworld | fgrep 'Hello World' + + echo "Ahead-Of-Time compilation with --static" + $out/bin/native-image --static HelloWorld + ./helloworld | fgrep 'Hello World' + ''} + + ${# --static is only available in Linux + lib.optionalString (stdenv.isLinux && useMusl) '' + echo "Ahead-Of-Time compilation with --static and --libc=musl" + $out/bin/native-image --static HelloWorld --libc=musl + ./helloworld | fgrep 'Hello World' + ''} runHook postInstallCheck ''; passthru = { - inherit products; - home = graalvmXXX-ce; - updateScript = ./update.sh; - }; + home = graalvm-ce; + updateScript = [ ./update.sh "graalvm-ce" ]; + } // (args.passhtru or { }); meta = with lib; ({ homepage = "https://www.graalvm.org/"; @@ -169,7 +217,7 @@ let sourceProvenance = with sourceTypes; [ binaryNativeCode ]; mainProgram = "java"; maintainers = with maintainers; teams.graalvm-ce.members ++ [ ]; - } // meta); + } // (args.meta or { })); } // extraArgs); in -graalvmXXX-ce +graalvm-ce diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix index a9eb04cdb3c9..579e40580802 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix @@ -1,20 +1,15 @@ { lib , stdenv , autoPatchelfHook +, darwin , graalvm-ce , makeWrapper -, perl -, unzip , zlib , libxcrypt-legacy # extra params , product -, javaVersion , extraBuildInputs ? [ ] , extraNativeBuildInputs ? [ ] -, graalvmPhases ? { } -, meta ? { } -, passthru ? { } , ... } @ args: @@ -23,24 +18,21 @@ let "lib" "stdenv" "autoPatchelfHook" + "darwin" "graalvm-ce" + "libxcrypt-legacy" "makeWrapper" - "perl" - "unzip" "zlib" "product" - "javaVersion" "extraBuildInputs" "extraNativeBuildInputs" - "graalvmPhases" "meta" - "passthru" ]; in stdenv.mkDerivation ({ - pname = "${product}-java${javaVersion}"; + pname = product; - nativeBuildInputs = [ perl unzip makeWrapper ] + nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isLinux autoPatchelfHook ++ extraNativeBuildInputs; @@ -48,61 +40,37 @@ stdenv.mkDerivation ({ stdenv.cc.cc.lib # libstdc++.so.6 zlib libxcrypt-legacy # libcrypt.so.1 (default is .2 now) - ] ++ extraBuildInputs; + ] + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation + ++ extraBuildInputs; unpackPhase = '' runHook preUnpack - unpack_jar() { - local jar="$1" - unzip -q -o "$jar" -d "$out" - perl -ne 'use File::Path qw(make_path); - use File::Basename qw(dirname); - if (/^(.+) = (.+)$/) { - make_path dirname("$ENV{out}/$1"); - symlink $2, "$ENV{out}/$1"; - }' "$out/META-INF/symlinks" - perl -ne 'if (/^(.+) = ([r-])([w-])([x-])([r-])([w-])([x-])([r-])([w-])([x-])$/) { - my $mode = ($2 eq 'r' ? 0400 : 0) + ($3 eq 'w' ? 0200 : 0) + ($4 eq 'x' ? 0100 : 0) + - ($5 eq 'r' ? 0040 : 0) + ($6 eq 'w' ? 0020 : 0) + ($7 eq 'x' ? 0010 : 0) + - ($8 eq 'r' ? 0004 : 0) + ($9 eq 'w' ? 0002 : 0) + ($10 eq 'x' ? 0001 : 0); - chmod $mode, "$ENV{out}/$1"; - }' "$out/META-INF/permissions" - rm -rf "$out/META-INF" - } + mkdir -p "$out" - unpack_jar "$src" + tar xf "$src" -C "$out" --strip-components=1 + + # Sanity check + if [ ! -d "$out/bin" ]; then + echo "The `bin` is directory missing after extracting the graalvm" + echo "tarball, please compare the directory structure of the" + echo "tarball with what happens in the unpackPhase (in particular" + echo "with regards to the `--strip-components` flag)." + exit 1 + fi runHook postUnpack ''; - # Allow autoPatchelf to automatically fix lib references between products - fixupPhase = '' - runHook preFixup - - mkdir -p $out/lib - shopt -s globstar - ln -s $out/languages/**/lib/*.so $out/lib - - runHook postFixup - ''; - - dontInstall = true; - dontBuild = true; dontStrip = true; passthru = { - inherit product javaVersion; - # build phases that are going to run during GraalVM derivation build, - # since they depend in having the fully setup GraalVM environment - # e.g.: graalvmPhases.installCheckPhase will run the checks only after - # GraalVM+products is build - # see buildGraalvm.nix file for the available phases - inherit graalvmPhases; - } // passthru; + updateScript = [ ./update.sh product ]; + } // (args.passhtru or { }); - meta = with lib; ({ + meta = ({ inherit (graalvm-ce.meta) homepage license sourceProvenance maintainers platforms; description = "High-Performance Polyglot VM (Product: ${product})"; - } // meta); + } // (args.meta or { })); } // extraArgs) diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index 2bc6c0590137..a29a81783c9c 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -4,237 +4,20 @@ , fetchurl }: -let +{ buildGraalvm = callPackage ./buildGraalvm.nix; + buildGraalvmProduct = callPackage ./buildGraalvmProduct.nix; - javaPlatform = { - "aarch64-linux" = "linux-aarch64"; - "x86_64-linux" = "linux-amd64"; - "aarch64-darwin" = "darwin-aarch64"; - "x86_64-darwin" = "darwin-amd64"; - }; - javaPlatformVersion = javaVersion: - "${javaVersion}-${javaPlatform.${stdenv.system} or (throw "Unsupported platform: ${stdenv.system}")}"; - source = product: javaVersion: (import ./hashes.nix).${product}.${javaPlatformVersion javaVersion} - or (throw "Unsupported product combination: product=${product} java=${javaVersion} system=${stdenv.system}"); -in -rec { - inherit buildGraalvm buildGraalvmProduct; + graalvm-ce = callPackage ./graalvm-ce { }; - ### Java 11 ### + graalvm-ce-musl = callPackage ./graalvm-ce { useMusl = true; }; - # Mostly available for build purposes, not to be exposed at the top level - graalvm11-ce-bare = buildGraalvm rec { - version = "22.3.1"; - javaVersion = "11"; - src = fetchurl (source "graalvm-ce" javaVersion); - meta.platforms = builtins.attrNames javaPlatform; - products = [ ]; - }; + graaljs = callPackage ./graaljs { }; - graalvm11-ce = graalvm11-ce-bare.override { - products = [ native-image-installable-svm-java11 ]; - }; + graalnodejs = callPackage ./graalnodejs { }; - # Mostly available for testing, not to be exposed at the top level - graalvm11-ce-full = graalvm11-ce-bare.override { - products = [ - js-installable-svm-java11 - llvm-installable-svm-java11 - native-image-installable-svm-java11 - nodejs-installable-svm-java11 - python-installable-svm-java11 - ruby-installable-svm-java11 - wasm-installable-svm-java11 - ]; - }; + graalpy = callPackage ./graalpy { }; - js-installable-svm-java11 = callPackage ./js-installable-svm.nix rec { - javaVersion = "11"; - version = "22.3.1"; - src = fetchurl (source "js-installable-svm" javaVersion); - }; - - llvm-installable-svm-java11 = callPackage ./llvm-installable-svm.nix rec { - javaVersion = "11"; - version = "22.3.1"; - src = fetchurl (source "llvm-installable-svm" javaVersion); - }; - - native-image-installable-svm-java11 = callPackage ./native-image-installable-svm.nix rec { - javaVersion = "11"; - version = "22.3.1"; - src = fetchurl (source "native-image-installable-svm" javaVersion); - }; - - nodejs-installable-svm-java11 = callPackage ./nodejs-installable-svm.nix rec { - javaVersion = "11"; - version = "22.3.1"; - src = fetchurl (source "nodejs-installable-svm" javaVersion); - graalvm-ce = graalvm11-ce-bare; - }; - - python-installable-svm-java11 = callPackage ./python-installable-svm.nix rec { - javaVersion = "11"; - version = "22.3.1"; - src = fetchurl (source "python-installable-svm" javaVersion); - }; - - ruby-installable-svm-java11 = callPackage ./ruby-installable-svm.nix rec { - javaVersion = "11"; - version = "22.3.1"; - src = fetchurl (source "ruby-installable-svm" javaVersion); - llvm-installable-svm = llvm-installable-svm-java11; - }; - - wasm-installable-svm-java11 = callPackage ./wasm-installable-svm.nix rec { - javaVersion = "11"; - version = "22.3.1"; - src = fetchurl (source "wasm-installable-svm" javaVersion); - }; - - ### Java 17 ### - - # Mostly available for build purposes, not to be exposed at the top level - graalvm17-ce-bare = buildGraalvm rec { - version = "22.3.1"; - javaVersion = "17"; - src = fetchurl (source "graalvm-ce" javaVersion); - meta.platforms = builtins.attrNames javaPlatform; - products = [ ]; - }; - - graalvm17-ce = graalvm17-ce-bare.override { - products = [ native-image-installable-svm-java17 ]; - }; - - # Mostly available for testing, not to be exposed at the top level - graalvm17-ce-full = graalvm17-ce-bare.override { - products = [ - js-installable-svm-java17 - llvm-installable-svm-java17 - native-image-installable-svm-java17 - nodejs-installable-svm-java17 - python-installable-svm-java17 - ruby-installable-svm-java17 - wasm-installable-svm-java17 - ]; - }; - - js-installable-svm-java17 = callPackage ./js-installable-svm.nix rec { - javaVersion = "17"; - version = "22.3.1"; - src = fetchurl (source "js-installable-svm" javaVersion); - }; - - llvm-installable-svm-java17 = callPackage ./llvm-installable-svm.nix rec { - javaVersion = "17"; - version = "22.3.1"; - src = fetchurl (source "llvm-installable-svm" javaVersion); - }; - - native-image-installable-svm-java17 = callPackage ./native-image-installable-svm.nix rec { - javaVersion = "17"; - version = "22.3.1"; - src = fetchurl (source "native-image-installable-svm" javaVersion); - }; - - nodejs-installable-svm-java17 = callPackage ./nodejs-installable-svm.nix rec { - javaVersion = "17"; - version = "22.3.1"; - src = fetchurl (source "nodejs-installable-svm" javaVersion); - graalvm-ce = graalvm17-ce-bare; - }; - - python-installable-svm-java17 = callPackage ./python-installable-svm.nix rec { - javaVersion = "17"; - version = "22.3.1"; - src = fetchurl (source "python-installable-svm" javaVersion); - }; - - ruby-installable-svm-java17 = callPackage ./ruby-installable-svm.nix rec { - javaVersion = "17"; - version = "22.3.1"; - src = fetchurl (source "ruby-installable-svm" javaVersion); - llvm-installable-svm = llvm-installable-svm-java17; - }; - - wasm-installable-svm-java17 = callPackage ./wasm-installable-svm.nix rec { - javaVersion = "17"; - version = "22.3.1"; - src = fetchurl (source "wasm-installable-svm" javaVersion); - }; - - ### Java 19 ### - - # Mostly available for build purposes, not to be exposed at the top level - graalvm19-ce-bare = buildGraalvm rec { - version = "22.3.1"; - javaVersion = "19"; - src = fetchurl (source "graalvm-ce" javaVersion); - meta.platforms = builtins.attrNames javaPlatform; - products = [ ]; - }; - - graalvm19-ce = graalvm19-ce-bare.override { - products = [ native-image-installable-svm-java19 ]; - }; - - # Mostly available for testing, not to be exposed at the top level - graalvm19-ce-full = graalvm19-ce-bare.override { - products = [ - js-installable-svm-java19 - llvm-installable-svm-java19 - native-image-installable-svm-java19 - nodejs-installable-svm-java19 - python-installable-svm-java19 - ruby-installable-svm-java19 - wasm-installable-svm-java19 - ]; - }; - - js-installable-svm-java19 = callPackage ./js-installable-svm.nix rec { - javaVersion = "19"; - version = "22.3.1"; - src = fetchurl (source "js-installable-svm" javaVersion); - }; - - llvm-installable-svm-java19 = callPackage ./llvm-installable-svm.nix rec { - javaVersion = "19"; - version = "22.3.1"; - src = fetchurl (source "llvm-installable-svm" javaVersion); - }; - - native-image-installable-svm-java19 = callPackage ./native-image-installable-svm.nix rec { - javaVersion = "19"; - version = "22.3.1"; - src = fetchurl (source "native-image-installable-svm" javaVersion); - }; - - nodejs-installable-svm-java19 = callPackage ./nodejs-installable-svm.nix rec { - javaVersion = "19"; - version = "22.3.1"; - src = fetchurl (source "nodejs-installable-svm" javaVersion); - graalvm-ce = graalvm19-ce-bare; - }; - - python-installable-svm-java19 = callPackage ./python-installable-svm.nix rec { - javaVersion = "19"; - version = "22.3.1"; - src = fetchurl (source "python-installable-svm" javaVersion); - }; - - ruby-installable-svm-java19 = callPackage ./ruby-installable-svm.nix rec { - javaVersion = "19"; - version = "22.3.1"; - src = fetchurl (source "ruby-installable-svm" javaVersion); - llvm-installable-svm = llvm-installable-svm-java19; - }; - - wasm-installable-svm-java19 = callPackage ./wasm-installable-svm.nix rec { - javaVersion = "19"; - version = "22.3.1"; - src = fetchurl (source "wasm-installable-svm" javaVersion); - }; + truffleruby = callPackage ./truffleruby { }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix b/pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix new file mode 100644 index 000000000000..0a7f04052bb6 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix @@ -0,0 +1,17 @@ +{ stdenv +, fetchurl +, graalvmCEPackages +}: + +graalvmCEPackages.buildGraalvmProduct { + src = fetchurl (import ./hashes.nix).hashes.${stdenv.system}; + version = (import ./hashes.nix).version; + + product = "js-installable-svm"; + + doInstallCheck = true; + installCheckPhase = '' + echo "Testing GraalJS" + echo '1 + 1' | $out/bin/js + ''; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/graaljs/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graaljs/hashes.nix new file mode 100644 index 000000000000..268a9743a025 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/graaljs/hashes.nix @@ -0,0 +1,22 @@ +# Generated by update.sh script +{ + "version" = "23.1.0"; + "hashes" = { + "aarch64-linux" = { + sha256 = "09q88nsbz0lrl866x3hqxm3hb5wpn4x5rp6pk69x1v6xzl58wzq2"; + url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graaljs-community-23.1.0-linux-aarch64.tar.gz"; + }; + "x86_64-linux" = { + sha256 = "0zlk0gpxwjkh4wxsc310kl80ipgk5si1lmyx0q2hqsw9lm98n41g"; + url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graaljs-community-23.1.0-linux-amd64.tar.gz"; + }; + "x86_64-darwin" = { + sha256 = "1y5mc92yync85ywcahvq8x9jlla0rzjd4g7cm6q7p21wvfwp4d5q"; + url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graaljs-community-23.1.0-macos-amd64.tar.gz"; + }; + "aarch64-darwin" = { + sha256 = "0ph3c6jgbvm3cliyqlccd2l292a7p0051l3sv7yf3318r6zrrk7m"; + url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graaljs-community-23.1.0-macos-aarch64.tar.gz"; + }; + }; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix new file mode 100644 index 000000000000..fb6d1595bbf3 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix @@ -0,0 +1,17 @@ +{ stdenv +, fetchurl +, graalvmCEPackages +}: + +graalvmCEPackages.buildGraalvmProduct { + src = fetchurl (import ./hashes.nix).hashes.${stdenv.system}; + version = (import ./hashes.nix).version; + + product = "nodejs-installable-svm"; + + doInstallCheck = true; + installCheckPhase = '' + echo "Testing NodeJS" + $out/bin/npx --help + ''; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/graalnodejs/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/hashes.nix new file mode 100644 index 000000000000..3546a11c2fc8 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/hashes.nix @@ -0,0 +1,22 @@ +# Generated by update.sh script +{ + "version" = "23.1.0"; + "hashes" = { + "aarch64-linux" = { + sha256 = "056x616pp0b25wsryzrfrfnjaxr3444fc3hmv8jspl4pjxjrais2"; + url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graalnodejs-community-23.1.0-linux-aarch64.tar.gz"; + }; + "x86_64-linux" = { + sha256 = "1si2ifwihszv06sqd25mswibiqbxhxgj6yw829f8zrdhs0sra2nz"; + url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graalnodejs-community-23.1.0-linux-amd64.tar.gz"; + }; + "x86_64-darwin" = { + sha256 = "1ffkdavrs92h3f5yil15v3i7r9aggkpfqd13gl5ipqlrk6pykhr7"; + url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graalnodejs-community-23.1.0-macos-amd64.tar.gz"; + }; + "aarch64-darwin" = { + sha256 = "1g6pql0pdxhxwpjqyfkaq07dar8sx2wipsyrjc7hmz3z7pjxcf5i"; + url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graalnodejs-community-23.1.0-macos-aarch64.tar.gz"; + }; + }; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/graalpy/default.nix b/pkgs/development/compilers/graalvm/community-edition/graalpy/default.nix new file mode 100644 index 000000000000..e2b28500f7fe --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/graalpy/default.nix @@ -0,0 +1,18 @@ +{ stdenv +, fetchurl +, graalvmCEPackages +}: + +graalvmCEPackages.buildGraalvmProduct { + src = fetchurl (import ./hashes.nix).hashes.${stdenv.system}; + version = (import ./hashes.nix).version; + + product = "graalpy"; + + doInstallCheck = true; + installCheckPhase = '' + echo "Testing GraalPy" + $out/bin/graalpy -c 'print(1 + 1)' + echo '1 + 1' | $out/bin/graalpy + ''; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix new file mode 100644 index 000000000000..da582e3ea192 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix @@ -0,0 +1,22 @@ +# Generated by update.sh script +{ + "version" = "23.1.0"; + "hashes" = { + "aarch64-linux" = { + sha256 = "0n0zz86h7jsqgdiyj6vj7qw57ny40jpmfvylyxq70riy86a4zp67"; + url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.0/graalpy-community-23.1.0-linux-aarch64.tar.gz"; + }; + "x86_64-linux" = { + sha256 = "0nnv255f2bqc4l88iw48f71874ryjn16bb8qn1yk7daj1pck80vj"; + url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.0/graalpy-community-23.1.0-linux-amd64.tar.gz"; + }; + "x86_64-darwin" = { + sha256 = "16kp66l0176sbd8jzvq3y3z7d9zvkqzdaw8vrvnk2qkipa136n0k"; + url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.0/graalpy-community-23.1.0-macos-amd64.tar.gz"; + }; + "aarch64-darwin" = { + sha256 = "17clq7n1n5ww22rh9gp5h9ljhjvggcik8amhd70pwl4cjgv9mhsv"; + url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.0/graalpy-community-23.1.0-macos-aarch64.tar.gz"; + }; + }; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/default.nix b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/default.nix new file mode 100644 index 000000000000..b7f7db61097f --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/default.nix @@ -0,0 +1,12 @@ +{ stdenv +, fetchurl +, graalvmCEPackages +, useMusl ? false +}: + +graalvmCEPackages.buildGraalvm { + inherit useMusl; + src = fetchurl (import ./hashes.nix).hashes.${stdenv.system}; + version = (import ./hashes.nix).version; + meta.platforms = builtins.attrNames (import ./hashes.nix).hashes; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix new file mode 100644 index 000000000000..377a05426c9b --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix @@ -0,0 +1,22 @@ +# Generated by update.sh script +{ + "version" = "21.0.0"; + "hashes" = { + "aarch64-linux" = { + sha256 = "199h3d6zayw28xlyggldap6nafh5fnpfbshs0rsf94dfgv7r4kmv"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.0/graalvm-community-jdk-21.0.0_linux-aarch64_bin.tar.gz"; + }; + "x86_64-linux" = { + sha256 = "06dkb1yimk5q3yzjk6kjsrs2pkbjxgz9jr5vj6wfb2y5ri0jjhkc"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.0/graalvm-community-jdk-21.0.0_linux-x64_bin.tar.gz"; + }; + "x86_64-darwin" = { + sha256 = "1qbz3xfxj7nwb01cy99hd22k3pim8j43blcdcys48l8xcb234nlk"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.0/graalvm-community-jdk-21.0.0_macos-x64_bin.tar.gz"; + }; + "aarch64-darwin" = { + sha256 = "0dqgsp0bhqvv07b9kb0cxqm5cw47kapzbfbw13570ydgc0gfg3f5"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.0/graalvm-community-jdk-21.0.0_macos-aarch64_bin.tar.gz"; + }; + }; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/hashes.nix deleted file mode 100644 index b8d157a2399c..000000000000 --- a/pkgs/development/compilers/graalvm/community-edition/hashes.nix +++ /dev/null @@ -1,391 +0,0 @@ -# Generated by pkgs/development/compilers/graalvm/community-edition/update.sh script -{ - "llvm-installable-svm" = { - "11-linux-aarch64" = { - sha256 = "0h8xkvsixcwak5dymkj3jgjv11w3ivnd6d45v5pdbymd0m2ifia8"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java11-linux-aarch64-22.3.1.jar"; - }; - "17-linux-aarch64" = { - sha256 = "1zww45z7m3mvzg47fwc3jgqz3hkra220isf4ih8sv6kjg1jc4y14"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-linux-aarch64-22.3.1.jar"; - }; - "19-linux-aarch64" = { - sha256 = "13gg5hqg3pzn3qprl76i2wpmfagf5zw4w9hl18993ing21k5d0kq"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java19-linux-aarch64-22.3.1.jar"; - }; - "11-linux-amd64" = { - sha256 = "133m9vg9rlp2xkndh3d6b8ybq8vwch99rj1b50xr6bz8r6306ara"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java11-linux-amd64-22.3.1.jar"; - }; - "17-linux-amd64" = { - sha256 = "0nz09idp8wawm3yinsplzvxhld8yav06l1nqj02gxrc1kxd5nsr1"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-linux-amd64-22.3.1.jar"; - }; - "19-linux-amd64" = { - sha256 = "1b5jsazjxkqlswl0h5yx7nx16zjjlvw967i6kypp4js80zg79s8m"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java19-linux-amd64-22.3.1.jar"; - }; - "11-darwin-aarch64" = { - sha256 = "0ngcm3ara7g1xz4kh515igpyrjhr1k5z9nf4vsaw4lpa5sqljv7z"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java11-darwin-aarch64-22.3.1.jar"; - }; - "17-darwin-aarch64" = { - sha256 = "1lr8kk82c3l9hx7wc5hqmpqfgvpk72xg1h07b6cgibry1bm6baj6"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-darwin-aarch64-22.3.1.jar"; - }; - "19-darwin-aarch64" = { - sha256 = "0mdiiag4hkddfgjamqn8y63s7xrfhq1wjvc7rw2sldykg7x0813i"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java19-darwin-aarch64-22.3.1.jar"; - }; - "11-darwin-amd64" = { - sha256 = "058pzrd90xx4yi7mm2fvs2npqcdkb2nzhqfwfz5v202038igi61g"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java11-darwin-amd64-22.3.1.jar"; - }; - "17-darwin-amd64" = { - sha256 = "10rfz8ddq82zpf6cy2y0gx1bx0zhjzm3gwwdb1j7mll0hvwp84sg"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-darwin-amd64-22.3.1.jar"; - }; - "19-darwin-amd64" = { - sha256 = "0h5sf99ypwz0bafq4jm71ynszfgsrlnhmcjh0kl6sy5g1q8ij0jf"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java19-darwin-amd64-22.3.1.jar"; - }; - }; - "nodejs-installable-svm" = { - "11-linux-aarch64" = { - sha256 = "0slzvbmxwa4a6m9c0hbdp8ryh9crfq7mv6y2j4hik5m457jq98cp"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-linux-aarch64-22.3.1.jar"; - }; - "17-linux-aarch64" = { - sha256 = "1ldivy5hmq2mxmzh40hglzngylahnzyqh9rav73nicl5mz8hk4l2"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-linux-aarch64-22.3.1.jar"; - }; - "19-linux-aarch64" = { - sha256 = "12chjbfz530kyp46bya8wcwciwlhp873hc6mvsjcf5swa3g7cwcl"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java19-linux-aarch64-22.3.1.jar"; - }; - "11-linux-amd64" = { - sha256 = "1p1y52b4lky2fbkml5vqy7dn9vqzj19jq5f3c90mgsfk4c7xhi66"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-linux-amd64-22.3.1.jar"; - }; - "17-linux-amd64" = { - sha256 = "0j1gkpszklzm069bccm6wgq8iq0k41bcrca0kf8pbl2y11hwywpc"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-linux-amd64-22.3.1.jar"; - }; - "19-linux-amd64" = { - sha256 = "1gdkn0srkh8bn7c81f8s7ykd12pnz5r75rif76zhzdllhx63nn5v"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java19-linux-amd64-22.3.1.jar"; - }; - "11-darwin-aarch64" = { - sha256 = "1fbqc3a7i91as1sbwg2yr1zx0wz4jsaxcz9pfqy8a0z88m8vivbs"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-darwin-aarch64-22.3.1.jar"; - }; - "17-darwin-aarch64" = { - sha256 = "1swzkp0imcv30fxfwblgad57fvpsvhfpv93s8zj1lwrbarggl2y3"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-darwin-aarch64-22.3.1.jar"; - }; - "19-darwin-aarch64" = { - sha256 = "11kpgd6vxc8dm9z5ihkwbjbbspk53m3k9b550zf0zs3as9yjbp22"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java19-darwin-aarch64-22.3.1.jar"; - }; - "11-darwin-amd64" = { - sha256 = "0n3hm8dd0ya86hxbxv07sfp22y02vhhzahkxk2j2162n9hcdmkwk"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-darwin-amd64-22.3.1.jar"; - }; - "17-darwin-amd64" = { - sha256 = "0xkjqcch22bm32mczj6xs8rzsl2n6vy9hmzwfy9a71w1kpkbjn3a"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-darwin-amd64-22.3.1.jar"; - }; - "19-darwin-amd64" = { - sha256 = "1yrh6iahai3aw7lpz89mrq782b1bysqqr9vkqdgcv00by1a7yd10"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java19-darwin-amd64-22.3.1.jar"; - }; - }; - "wasm-installable-svm" = { - "11-linux-aarch64" = { - sha256 = "1d67jm41psypkhpy77cb2l00smhni3pgkybwx79z7dzcyid7p2l1"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java11-linux-aarch64-22.3.1.jar"; - }; - "17-linux-aarch64" = { - sha256 = "1cg9zxyjirfl0afr9cppg2h17j8qdidi4llbal2g5w1p2v9zq78b"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java17-linux-aarch64-22.3.1.jar"; - }; - "19-linux-aarch64" = { - sha256 = "1vaqf3ilp3kg280adynww4l07sbcd5hih86akpd25rbxn45khz9s"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java19-linux-aarch64-22.3.1.jar"; - }; - "11-linux-amd64" = { - sha256 = "19v7jqhvijmzzb0i9q6hbvrmqnmmzbyvai3il9f357qvv6r6lylb"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java11-linux-amd64-22.3.1.jar"; - }; - "17-linux-amd64" = { - sha256 = "0sfnsy0r4qf7ni9mh437dad1d8sidajcra2azsmy5qdmh091zhj5"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java17-linux-amd64-22.3.1.jar"; - }; - "19-linux-amd64" = { - sha256 = "1k7jqsh5wg7c7a6mhqgxghn20qwx70bky49p2a6imcsygnilqgim"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java19-linux-amd64-22.3.1.jar"; - }; - "11-darwin-amd64" = { - sha256 = "0764d97mla5cii4iyvyb43v62dk8ff3plqjmdc69qqxx8mdzpwqv"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java11-darwin-amd64-22.3.1.jar"; - }; - "17-darwin-amd64" = { - sha256 = "1ip6ybm7p28bs2lifxqhq6fyvfm3wmacv6dqziyl2v7v7yl0iw4i"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java17-darwin-amd64-22.3.1.jar"; - }; - "19-darwin-amd64" = { - sha256 = "14d3djmacj81rj5sqf30z060iywndn6kw1n58kg12jvmgipbm3iq"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java19-darwin-amd64-22.3.1.jar"; - }; - }; - "js-installable-svm" = { - "11-linux-aarch64" = { - sha256 = "1b8vnjjsa548c6j3dycxp57i9xmyvndiz2xhv7fm10izcplyspxq"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java11-linux-aarch64-22.3.1.jar"; - }; - "17-linux-aarch64" = { - sha256 = "1kcy3mjk908zs7f3k95awp6294cwr06hand4cbw1lsnfvp0qwhk7"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-linux-aarch64-22.3.1.jar"; - }; - "19-linux-aarch64" = { - sha256 = "1mk8qzdfsbjhfx0ds8rk9jm2g6g2lv8bppmnwpgrkm232c8i0dgw"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java19-linux-aarch64-22.3.1.jar"; - }; - "11-linux-amd64" = { - sha256 = "0sq80a4nnvik560whgv5vwlsszi8z02idvpd92p0caf03bra9x2b"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java11-linux-amd64-22.3.1.jar"; - }; - "17-linux-amd64" = { - sha256 = "0fd160yxsi09m97z7vqh5kwf1g0p0hn4niy48glj9jhirfqzzw0c"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-linux-amd64-22.3.1.jar"; - }; - "19-linux-amd64" = { - sha256 = "0ghx41aldb30yjd0sdrfm89i7d6q0aca18bm7j1qyg9gnmkvxnmn"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java19-linux-amd64-22.3.1.jar"; - }; - "11-darwin-aarch64" = { - sha256 = "18g0xixzk45yrxv3zfs7qrdyj0b3ksp59jhbcis0vwy9gx8094wq"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java11-darwin-aarch64-22.3.1.jar"; - }; - "17-darwin-aarch64" = { - sha256 = "0cf4iivkniilvbqyniqxcz1qf49cs4lxi0axjsk9sz1zmxcq0bnk"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-darwin-aarch64-22.3.1.jar"; - }; - "19-darwin-aarch64" = { - sha256 = "03wxaim069rp69njh4gdchsm3b9s7crxihbk1arvz2cpgy9x1zvc"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java19-darwin-aarch64-22.3.1.jar"; - }; - "11-darwin-amd64" = { - sha256 = "0ibcz6ivx068ndf45j9pghm8qwq287glqxf0xx08kjxnhms67p52"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java11-darwin-amd64-22.3.1.jar"; - }; - "17-darwin-amd64" = { - sha256 = "16q7whnvdrk8lb4fp96qr3p567kggyk9q5iqcn081qk8xjkbx0zv"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-darwin-amd64-22.3.1.jar"; - }; - "19-darwin-amd64" = { - sha256 = "13nx6kwcx100166ba4h7h97ravw4hyiqnvhszqbdffn54y0x5dwl"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java19-darwin-amd64-22.3.1.jar"; - }; - }; - "python-installable-svm" = { - "11-linux-aarch64" = { - sha256 = "1yl36x5svld7qnm3m6vmacm2n4d6l9vhdxhaypvlv2bbfbnym3c5"; - url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java11-linux-aarch64-22.3.1.jar"; - }; - "17-linux-aarch64" = { - sha256 = "0ggx5rwz3qnnxgz407r8yx12556pcbirhnc44972l77r320rdmqc"; - url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-linux-aarch64-22.3.1.jar"; - }; - "19-linux-aarch64" = { - sha256 = "1d0a7didgzgn45q7zg4iidmy2gckhaf796mbraqz5hjlig4vscr7"; - url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java19-linux-aarch64-22.3.1.jar"; - }; - "11-linux-amd64" = { - sha256 = "11c19a20v3ff83dxzs9hf1z89kh0qich41b03gx8mancf12jfwnl"; - url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java11-linux-amd64-22.3.1.jar"; - }; - "17-linux-amd64" = { - sha256 = "0pga44whhvm98d8j2v2bpl9rkbvr9bv947rc4imlbf01cyxjwl71"; - url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-linux-amd64-22.3.1.jar"; - }; - "19-linux-amd64" = { - sha256 = "0nwa1nrclh3p12cacp98wbx9p3zhs44b8srbr27vqgc10z78c1wz"; - url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java19-linux-amd64-22.3.1.jar"; - }; - "11-darwin-aarch64" = { - sha256 = "0qnh8i9nazrv25jhn13wp7qqm9wwhcz4kpp2ygvsdmf9s3d2f5lf"; - url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java11-darwin-aarch64-22.3.1.jar"; - }; - "17-darwin-aarch64" = { - sha256 = "0j13xvy9d19glipz4wdma2y02g0cnksg1iij4247fjhpqh0axkdz"; - url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-darwin-aarch64-22.3.1.jar"; - }; - "19-darwin-aarch64" = { - sha256 = "0n7vx5lxbgpjvzv0y1fqsrk0j61vrzjm2ksh0lkdnz1zrr5mqgsh"; - url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java19-darwin-aarch64-22.3.1.jar"; - }; - "11-darwin-amd64" = { - sha256 = "1ny5664h7pibvskmm51mlxrxkbbj2dvxsv2yqbq6v51a57wm1yzn"; - url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java11-darwin-amd64-22.3.1.jar"; - }; - "17-darwin-amd64" = { - sha256 = "01jjncx8jm1yrps2nj217vgcmjaqclmpb27rdp3qn7k64w5wzipg"; - url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-darwin-amd64-22.3.1.jar"; - }; - "19-darwin-amd64" = { - sha256 = "00agpvp1yw884lm6d88d2l8629qpbpdlik2g621yz4vf9y7qki83"; - url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java19-darwin-amd64-22.3.1.jar"; - }; - }; - "native-image-installable-svm" = { - "11-linux-aarch64" = { - sha256 = "0z9rbmci6yz7f7mqd3xzsxc5ih4hq72lyzqfchan7fr6mh38d6gw"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java11-linux-aarch64-22.3.1.jar"; - }; - "17-linux-aarch64" = { - sha256 = "03v20fc9famlnbrznpasnd5gdl5k9nl4dlj3pp6bad4y6l7rqnx5"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java17-linux-aarch64-22.3.1.jar"; - }; - "19-linux-aarch64" = { - sha256 = "13gg1zj7ivzrgwvyvsbwbrchryjqmi00km7jxajjjbr1k7jkdc5v"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java19-linux-aarch64-22.3.1.jar"; - }; - "11-linux-amd64" = { - sha256 = "1yb7kpbs7hrzlysvrqjzgfz678p1hbg6237jzb35zmwdaczav51n"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java11-linux-amd64-22.3.1.jar"; - }; - "17-linux-amd64" = { - sha256 = "00fbyqsj4xj9ay8bki1190lf59bgrzvla8lzzq51p53a1bdrhhmv"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java17-linux-amd64-22.3.1.jar"; - }; - "19-linux-amd64" = { - sha256 = "1ayx0ag00i9868xz5xzc9fmwipkhz5qsldfmxk16cxp5vi71yhb1"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java19-linux-amd64-22.3.1.jar"; - }; - "11-darwin-aarch64" = { - sha256 = "1kaqvkbhj3iifq6asyrpy225a89y7klzbh7an1ycnvc2hvqkv4nz"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java11-darwin-aarch64-22.3.1.jar"; - }; - "17-darwin-aarch64" = { - sha256 = "09l7x4x8yanq55v6y6wpfx94mvsq1bpbnihknjc6dnq3vcrci77n"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java17-darwin-aarch64-22.3.1.jar"; - }; - "19-darwin-aarch64" = { - sha256 = "0dfddqgkz9b5akpgfw7sj4sl9wwknmh7qzk3pq2dpvf6892168wb"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java19-darwin-aarch64-22.3.1.jar"; - }; - "11-darwin-amd64" = { - sha256 = "036w9dmdcs46kmjqr3086mg389fgr3h1zysavfq8cbh199x0ibia"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java11-darwin-amd64-22.3.1.jar"; - }; - "17-darwin-amd64" = { - sha256 = "1hvjfvcn878bzvi944v3x23sby72hbfvg5s3zzspyc37l5cdpqi3"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java17-darwin-amd64-22.3.1.jar"; - }; - "19-darwin-amd64" = { - sha256 = "1829fnyz62gcnj0664hl9w3vjyb3xfc84gpnblhhdx77c9y8gf6b"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java19-darwin-amd64-22.3.1.jar"; - }; - }; - "graalvm-ce" = { - "11-linux-aarch64" = { - sha256 = "1g4a3z9993pq52j3jf25pbcq9rvl8jz1yar8c859jw5chaf3ysml"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java11-linux-aarch64-22.3.1.tar.gz"; - }; - "17-linux-aarch64" = { - sha256 = "06288dwbql943nii74i9mngzb38h2nzrxzzgs346mgk2965gwm59"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java17-linux-aarch64-22.3.1.tar.gz"; - }; - "19-linux-aarch64" = { - sha256 = "03bakx00rl2c0hyvp5skfha57cijlpvmsnfgv2ancn3ypyqx1c4m"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java19-linux-aarch64-22.3.1.tar.gz"; - }; - "11-linux-amd64" = { - sha256 = "1f6xkdnxn6xsm24sqw24rsca72wm7v6q96m23l5fng5ym0jpfm2m"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java11-linux-amd64-22.3.1.tar.gz"; - }; - "17-linux-amd64" = { - sha256 = "0aci9i28rq5nk2qya9dcg5hxr3sgsbv7f5x8679hrjrqmrclmkrs"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java17-linux-amd64-22.3.1.tar.gz"; - }; - "19-linux-amd64" = { - sha256 = "0byxf2d4c3vwygjg5rbwwi22k1pv0yqjz03n8m67v2vsbs09vnbw"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java19-linux-amd64-22.3.1.tar.gz"; - }; - "11-darwin-aarch64" = { - sha256 = "0cbcm9d211m4b6g1bkpfksma917lzqkl4kx38vm1nrwjkll357y5"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java11-darwin-aarch64-22.3.1.tar.gz"; - }; - "17-darwin-aarch64" = { - sha256 = "1qbw3hlmqcrmd70xk56463scdxr50n66z2n3c24h68qlwwlpqc73"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java17-darwin-aarch64-22.3.1.tar.gz"; - }; - "19-darwin-aarch64" = { - sha256 = "09n9qz58lfwl2ag8s3n6dm11p5nnbz6gfralfyfj72wwfghcsckc"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java19-darwin-aarch64-22.3.1.tar.gz"; - }; - "11-darwin-amd64" = { - sha256 = "0a12rzf99x5l29f6bwm6myk18dgnrx2c9rwmii2pm864y7azlnij"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java11-darwin-amd64-22.3.1.tar.gz"; - }; - "17-darwin-amd64" = { - sha256 = "02lclv2j3v850izh84wdvksi3d3xmgpfl7x85vzifhgsvagm6sz4"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java17-darwin-amd64-22.3.1.tar.gz"; - }; - "19-darwin-amd64" = { - sha256 = "1b3r43jpgip12if1fld41qiigqgn32zqs6992ji206dxq6xwli23"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java19-darwin-amd64-22.3.1.tar.gz"; - }; - }; - "ruby-installable-svm" = { - "11-linux-aarch64" = { - sha256 = "10wm1sq7smywy63mzlsbn21kzd65yaqj8yismpq8bz19h9skas7w"; - url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java11-linux-aarch64-22.3.1.jar"; - }; - "17-linux-aarch64" = { - sha256 = "0kh1w49yp3kpfvhqw19bbx51ay1wgzq80gsrfqax4zm5ixz4wsbz"; - url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-linux-aarch64-22.3.1.jar"; - }; - "19-linux-aarch64" = { - sha256 = "1c3xw9h85g3p5w12zrlvl036ay3218g5405hkh7qaah00affgx5l"; - url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java19-linux-aarch64-22.3.1.jar"; - }; - "11-linux-amd64" = { - sha256 = "0avsawgfkqbgqc2hm8zmz37qg9ag3ddni3my8g73kvzfkghsdabh"; - url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java11-linux-amd64-22.3.1.jar"; - }; - "17-linux-amd64" = { - sha256 = "1ib00pqdhzl24y97j16mm86qwrijqjnmhjmk3g5vdhyhh099vjp1"; - url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-linux-amd64-22.3.1.jar"; - }; - "19-linux-amd64" = { - sha256 = "1j42y6gwf84xgjnawwqymxv4702gsy0vriwdfd09nbp600sjzga5"; - url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java19-linux-amd64-22.3.1.jar"; - }; - "11-darwin-aarch64" = { - sha256 = "1im75qad89xa2nbl80csnwn56k6n11zv5g91xlkqq4xk300v1saj"; - url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java11-darwin-aarch64-22.3.1.jar"; - }; - "17-darwin-aarch64" = { - sha256 = "1pfzsisf4sgzxmk3r1p4apzqkwipjpf8naly3v94i5v3b5gbnczx"; - url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-darwin-aarch64-22.3.1.jar"; - }; - "19-darwin-aarch64" = { - sha256 = "0xysf43q0zpin3lmffmb3n7y4rsm1zm19ndys1vrn8szz4jcxpsq"; - url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java19-darwin-aarch64-22.3.1.jar"; - }; - "11-darwin-amd64" = { - sha256 = "1jfls71y92hw09s869v2qw8pypgl1fciqz3m9zcd2602hikysq6c"; - url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java11-darwin-amd64-22.3.1.jar"; - }; - "17-darwin-amd64" = { - sha256 = "03x2h4sw72l05xxg73xj9mzzkxffbjpv8hdi59rgxxljnz0ai6rx"; - url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-darwin-amd64-22.3.1.jar"; - }; - "19-darwin-amd64" = { - sha256 = "02nkjlv306wyms7swibn5rz0w8sx6pwvh1lilgvv4xnbj7wps2q7"; - url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java19-darwin-amd64-22.3.1.jar"; - }; - }; -} diff --git a/pkgs/development/compilers/graalvm/community-edition/js-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/js-installable-svm.nix deleted file mode 100644 index 45cf50e90fee..000000000000 --- a/pkgs/development/compilers/graalvm/community-edition/js-installable-svm.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib -, stdenv -, graalvmCEPackages -, javaVersion -, src -, version -}: - -graalvmCEPackages.buildGraalvmProduct rec { - inherit src javaVersion version; - product = "js-installable-svm"; - - graalvmPhases.installCheckPhase = '' - echo "Testing GraalJS" - echo '1 + 1' | $out/bin/js - ''; -} diff --git a/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix deleted file mode 100644 index 9fc8fb3db95e..000000000000 --- a/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib -, stdenv -, graalvmCEPackages -, javaVersion -, src -, version -}: - -graalvmCEPackages.buildGraalvmProduct rec { - inherit src javaVersion version; - product = "llvm-installable-svm"; - - # TODO: improve this test - graalvmPhases.installCheckPhase = '' - echo "Testing llvm" - $out/bin/lli --help - ''; -} diff --git a/pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix deleted file mode 100644 index 427c5ffef5b5..000000000000 --- a/pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib -, stdenv -, graalvmCEPackages -, gcc -, glibc -, javaVersion -, musl -, src -, version -, writeShellScriptBin -, zlib -, useMusl ? false -, extraCLibs ? [ ] -}: - -assert useMusl -> stdenv.isLinux; -let - cLibs = [ glibc zlib.static ] - ++ lib.optionals (!useMusl) [ glibc.static ] - ++ lib.optionals useMusl [ musl ] - ++ extraCLibs; - # GraalVM 21.3.0+ expects musl-gcc as -musl-gcc - musl-gcc = (writeShellScriptBin "${stdenv.hostPlatform.system}-musl-gcc" ''${lib.getDev musl}/bin/musl-gcc "$@"''); - binPath = lib.makeBinPath ([ gcc ] ++ lib.optionals useMusl [ musl-gcc ]); -in -graalvmCEPackages.buildGraalvmProduct rec { - inherit src javaVersion version; - product = "native-image-installable-svm"; - - graalvmPhases.postInstall = lib.optionalString stdenv.isLinux '' - wrapProgram $out/bin/native-image \ - --prefix PATH : ${binPath} \ - ${lib.concatStringsSep " " - (map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") cLibs)} - ''; - - graalvmPhases.installCheckPhase = '' - echo "Ahead-Of-Time compilation" - $out/bin/native-image -H:-CheckToolchain -H:+ReportExceptionStackTraces HelloWorld - ./helloworld | fgrep 'Hello World' - - ${# --static is only available in Linux - lib.optionalString (stdenv.isLinux && !useMusl) '' - echo "Ahead-Of-Time compilation with -H:+StaticExecutableWithDynamicLibC" - $out/bin/native-image -H:+StaticExecutableWithDynamicLibC HelloWorld - ./helloworld | fgrep 'Hello World' - - echo "Ahead-Of-Time compilation with --static" - $out/bin/native-image --static HelloWorld - ./helloworld | fgrep 'Hello World' - ''} - - ${# --static is only available in Linux - lib.optionalString (stdenv.isLinux && useMusl) '' - echo "Ahead-Of-Time compilation with --static and --libc=musl" - $out/bin/native-image --static HelloWorld --libc=musl - ./helloworld | fgrep 'Hello World' - ''} - ''; -} diff --git a/pkgs/development/compilers/graalvm/community-edition/nodejs-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/nodejs-installable-svm.nix deleted file mode 100644 index 022ac0a44fe1..000000000000 --- a/pkgs/development/compilers/graalvm/community-edition/nodejs-installable-svm.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib -, stdenv -, graalvmCEPackages -, graalvm-ce -, javaVersion -, src -, version -}: - -graalvmCEPackages.buildGraalvmProduct rec { - inherit src javaVersion version; - product = "nodejs-installable-svm"; - - extraNativeBuildInputs = [ graalvm-ce ]; - - # TODO: improve test - graalvmPhases.installCheckPhase = '' - echo "Testing NodeJS" - $out/bin/npx --help - ''; -} diff --git a/pkgs/development/compilers/graalvm/community-edition/python-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/python-installable-svm.nix deleted file mode 100644 index 43d6e85ef560..000000000000 --- a/pkgs/development/compilers/graalvm/community-edition/python-installable-svm.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib -, stdenv -, graalvmCEPackages -, javaVersion -, src -, version -}: - -graalvmCEPackages.buildGraalvmProduct rec { - inherit src javaVersion version; - product = "python-installable-svm"; - - graalvmPhases.installCheckPhase = '' - echo "Testing GraalPython" - $out/bin/graalpy -c 'print(1 + 1)' - echo '1 + 1' | $out/bin/graalpy - ''; -} diff --git a/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix similarity index 64% rename from pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix rename to pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix index 30d0739b4b1d..95e9c56fc23c 100644 --- a/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix @@ -1,29 +1,30 @@ { lib , stdenv +, fetchurl , graalvmCEPackages -, llvm-installable-svm +, libyaml , openssl -, javaVersion -, src -, version }: -graalvmCEPackages.buildGraalvmProduct rec { - inherit src javaVersion version; - product = "ruby-installable-svm"; +graalvmCEPackages.buildGraalvmProduct { + src = fetchurl (import ./hashes.nix).hashes.${stdenv.system}; + version = (import ./hashes.nix).version; + + product = "truffleruby"; extraBuildInputs = [ - llvm-installable-svm + libyaml openssl ]; preFixup = lib.optionalString stdenv.isLinux '' - patchelf $out/languages/ruby/lib/mri/openssl.so \ + patchelf $out/lib/mri/openssl.so \ --replace-needed libssl.so.10 libssl.so \ --replace-needed libcrypto.so.10 libcrypto.so ''; - graalvmPhases.installCheckPhase = '' + doInstallCheck = true; + installCheckPhase = '' echo "Testing TruffleRuby" # Fixup/silence warnings about wrong locale export LANG=C diff --git a/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix new file mode 100644 index 000000000000..addd6749e7d6 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix @@ -0,0 +1,22 @@ +# Generated by update.sh script +{ + "version" = "23.1.0"; + "hashes" = { + "aarch64-linux" = { + sha256 = "05q0xqm7qa9mw7v4kwyhbqsx27x19msf9rbbzq60dinp5724r721"; + url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.0/truffleruby-community-23.1.0-linux-aarch64.tar.gz"; + }; + "x86_64-linux" = { + sha256 = "0bfcqcax9424vsdqzr18mxkhi2wpzc4xaji98anm8mcjkyl1r89q"; + url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.0/truffleruby-community-23.1.0-linux-amd64.tar.gz"; + }; + "x86_64-darwin" = { + sha256 = "1yj9nk670hgh9104s1j207mqldagfvvvscj4bfgf3jlbcq5hvlhn"; + url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.0/truffleruby-community-23.1.0-macos-amd64.tar.gz"; + }; + "aarch64-darwin" = { + sha256 = "1nmqyn4vzwjsvq7dly8qn1xx973jg027xfbs988vf3nljnhkpq5l"; + url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.0/truffleruby-community-23.1.0-macos-aarch64.tar.gz"; + }; + }; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/update.sh b/pkgs/development/compilers/graalvm/community-edition/update.sh index ad523fbd6b33..65d36514bcd0 100755 --- a/pkgs/development/compilers/graalvm/community-edition/update.sh +++ b/pkgs/development/compilers/graalvm/community-edition/update.sh @@ -1,10 +1,23 @@ #!/usr/bin/env nix-shell #!nix-shell -p coreutils curl.out nix jq gnused -i bash +# Usage: +# ./update.sh [PRODUCT] +# +# Examples: +# $ ./update.sh graalvm-ce # will generate ./graalvm-ce/hashes.nix +# $ ./update.sh # same as above +# $ ./update.sh graalpy # will generate ./graalpy/hashes.nix +# +# Environment variables: +# FORCE=1 to force the update of a product (e.g.: skip up-to-date checks) +# VERSION=xx.xx will assume that xx.xx is the new version + set -eou pipefail cd "$(dirname "${BASH_SOURCE[0]}")" tmpfile="$(mktemp --suffix=.nix)" +readonly tmpfile trap 'rm -rf "$tmpfile"' EXIT @@ -16,92 +29,102 @@ verlte() { [ "$1" = "$(echo -e "$1\n$2" | sort -V | head -n1)" ] } -readonly hashes_nix="hashes.nix" +readonly product="${1:-graalvm-ce}" +readonly hashes_nix="$product/hashes.nix" readonly nixpkgs=../../../../.. -readonly current_version="$(nix-instantiate "$nixpkgs" --eval --strict -A graalvm-ce.version --json | jq -r)" +mkdir -p "$product" -if [[ -z "${1:-}" ]]; then - readonly gh_version="$(curl \ +declare -r -A update_urls=( + [graalvm-ce]="https://api.github.com/repos/graalvm/graalvm-ce-builds/releases/latest" + [graaljs]="https://api.github.com/repos/oracle/graaljs/releases/latest" + [graalnodejs]="https://api.github.com/repos/oracle/graaljs/releases/latest" + [graalpy]="https://api.github.com/repos/oracle/graalpython/releases/latest" + [truffleruby]="https://api.github.com/repos/oracle/truffleruby/releases/latest" +) + +current_version="$(nix-instantiate "$nixpkgs" --eval --strict -A "graalvmCEPackages.${product}.version" --json | jq -r)" +readonly current_version + +if [[ -z "${VERSION:-}" ]]; then + gh_version="$(curl \ ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ - -s https://api.github.com/repos/graalvm/graalvm-ce-builds/releases/latest | \ + -s "${update_urls[$product]}" | \ jq --raw-output .tag_name)" - readonly new_version="${gh_version//vm-/}" + new_version="${gh_version//jdk-/}" + new_version="${new_version//graal-/}" else - readonly new_version="$1" + new_version="$VERSION" fi +readonly new_version info "Current version: $current_version" info "New version: $new_version" if verlte "$new_version" "$current_version"; then - info "graalvm-ce $current_version is up-to-date." + info "$product $current_version is up-to-date." [[ -z "${FORCE:-}" ]] && exit 0 else - info "graalvm-ce $current_version is out-of-date. Updating..." + info "$product $current_version is out-of-date. Updating..." fi +# Make sure to get the `-community` versions! declare -r -A products_urls=( - [graalvm-ce]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/graalvm-ce-java@platform@-${new_version}.tar.gz" - [js-installable-svm]="https://github.com/graalvm/graaljs/releases/download/vm-${new_version}/js-installable-svm-java@platform@-${new_version}.jar" - [llvm-installable-svm]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/llvm-installable-svm-java@platform@-${new_version}.jar" - [native-image-installable-svm]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/native-image-installable-svm-java@platform@-${new_version}.jar" - [nodejs-installable-svm]="https://github.com/graalvm/graaljs/releases/download/vm-${new_version}/nodejs-installable-svm-java@platform@-${new_version}.jar" - [python-installable-svm]="https://github.com/graalvm/graalpython/releases/download/vm-${new_version}/python-installable-svm-java@platform@-${new_version}.jar" - [ruby-installable-svm]="https://github.com/oracle/truffleruby/releases/download/vm-${new_version}/ruby-installable-svm-java@platform@-${new_version}.jar" - [wasm-installable-svm]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/wasm-installable-svm-java@platform@-${new_version}.jar" + [graalvm-ce]="https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${new_version}/graalvm-community-jdk-${new_version}_@platform@_bin.tar.gz" + [graaljs]="https://github.com/oracle/graaljs/releases/download/graal-${new_version}/graaljs-community-${new_version}-@platform@.tar.gz" + [graalnodejs]="https://github.com/oracle/graaljs/releases/download/graal-${new_version}/graalnodejs-community-${new_version}-@platform@.tar.gz" + [graalpy]="https://github.com/oracle/graalpython/releases/download/graal-${new_version}/graalpy-community-${new_version}-@platform@.tar.gz" + [truffleruby]="https://github.com/oracle/truffleruby/releases/download/graal-${new_version}/truffleruby-community-${new_version}-@platform@.tar.gz" ) -readonly platforms=( - "11-linux-aarch64" - "17-linux-aarch64" - "19-linux-aarch64" - "11-linux-amd64" - "17-linux-amd64" - "19-linux-amd64" - "11-darwin-aarch64" - "17-darwin-aarch64" - "19-darwin-aarch64" - "11-darwin-amd64" - "17-darwin-amd64" - "19-darwin-amd64" -) +# Argh, this is really inconsistent... +if [[ "$product" == "graalvm-ce" ]]; then + declare -r -A platforms=( + [aarch64-linux]="linux-aarch64" + [x86_64-linux]="linux-x64" + [aarch64-darwin]="macos-aarch64" + [x86_64-darwin]="macos-x64" + ) +else + declare -r -A platforms=( + [aarch64-linux]="linux-aarch64" + [x86_64-linux]="linux-amd64" + [aarch64-darwin]="macos-aarch64" + [x86_64-darwin]="macos-amd64" + ) +fi -info "Generating '$hashes_nix' file for 'graalvm-ce' $new_version. This will take a while..." +info "Generating '$hashes_nix' file for '$product' $new_version. This will take a while..." # Indentation of `echo_file` function is on purpose to make it easier to visualize the output -echo_file "# Generated by $0 script" +echo_file "# Generated by $(basename $0) script" echo_file "{" -for product in "${!products_urls[@]}"; do - url="${products_urls["${product}"]}" -echo_file " \"$product\" = {" - for platform in "${platforms[@]}"; do - args=("${url//@platform@/$platform}") - # Get current hashes to skip derivations already in /nix/store to reuse cache when the version is the same - # e.g.: when adding a new product and running this script with FORCE=1 - if [[ "$current_version" == "$new_version" ]] && \ - previous_hash="$(nix-instantiate --eval "$hashes_nix" -A "$product.$platform.sha256" --json | jq -r)"; then - args+=("$previous_hash" "--type" "sha256") - else - info "Hash in '$product' for '$platform' not found. Re-downloading it..." - fi - if hash="$(nix-prefetch-url "${args[@]}")"; then -echo_file " \"$platform\" = {" +echo_file " \"version\" = \"$new_version\";" +url="${products_urls["${product}"]}" +echo_file " \"hashes\" = {" +for nix_platform in "${!platforms[@]}"; do + product_platform="${platforms[$nix_platform]}" + args=("${url//@platform@/$product_platform}") + # Get current hashes to skip derivations already in /nix/store to reuse cache when the version is the same + # e.g.: when adding a new product and running this script with FORCE=1 + if [[ "$current_version" == "$new_version" ]] && \ + previous_hash="$(nix-instantiate --eval "$hashes_nix" -A "hashes.$nix_platform.sha256" --json | jq -r)"; then + args+=("$previous_hash" "--type" "sha256") + else + info "Hash in '$product' for '$nix_platform' not found. Re-downloading it..." + fi + if hash="$(nix-prefetch-url "${args[@]}")"; then +echo_file " \"$nix_platform\" = {" echo_file " sha256 = \"$hash\";" -echo_file " url = \"${url//@platform@/${platform}}\";" +echo_file " url = \"${url//@platform@/${product_platform}}\";" echo_file " };" - else - info "Error while downloading '$product' for '$platform'. Skipping it..." - fi - done -echo_file " };" + else + info "Error while downloading '$product' for '$nix_platform'. Skipping it..." + fi done +echo_file " };" echo_file "}" -info "Updating graalvm-ce version..." -# update-source-version does not work here since it expects src attribute -sed "s|$current_version|$new_version|" -i default.nix - -info "Moving the temporary file to hashes.nix" +info "Moving the temporary file to '$hashes_nix'" mv "$tmpfile" "$hashes_nix" info "Done!" diff --git a/pkgs/development/compilers/graalvm/community-edition/wasm-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/wasm-installable-svm.nix deleted file mode 100644 index 9a5bef7c1e35..000000000000 --- a/pkgs/development/compilers/graalvm/community-edition/wasm-installable-svm.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib -, stdenv -, graalvm-ce -, graalvmCEPackages -, javaVersion -, src -, version -}: - -graalvmCEPackages.buildGraalvmProduct rec { - inherit src javaVersion version; - product = "wasm-installable-svm"; - - # TODO: improve this test - graalvmPhases.installCheckPhase = '' - echo "Testing wasm" - $out/bin/wasm --help - ''; - - # Not supported in aarch64-darwin yet as GraalVM 22.3.1 release - meta.platforms = builtins.filter (p: p != "aarch64-darwin") graalvm-ce.meta.platforms; -} diff --git a/pkgs/development/compilers/sbcl/2.x.nix b/pkgs/development/compilers/sbcl/2.x.nix index cfd6166d0456..a4de7b8b876f 100644 --- a/pkgs/development/compilers/sbcl/2.x.nix +++ b/pkgs/development/compilers/sbcl/2.x.nix @@ -19,12 +19,12 @@ let sha256 = "189gjqzdz10xh3ybiy4ch1r98bsmkcb4hpnrmggd4y2g5kqnyx4y"; }; - "2.3.7" = { - sha256 = "sha256-aYFE+4BaMZGaYQ3pmauYOR1S62mK2qjKGbKPxu0Nmfc="; - }; "2.3.8" = { sha256 = "sha256-QhVxsqyRbli+jrzqXvSr+NeQKGPbah0KXvqVAK3KDSk="; }; + "2.3.9" = { + sha256 = "sha256-fSiakSMgIgKL8BKJAMMr8A5MVDDDLyivBZTIpZKphlQ="; + }; }; in with versionMap.${version}; diff --git a/pkgs/development/interpreters/babashka/default.nix b/pkgs/development/interpreters/babashka/default.nix index b7d78892103d..1ae30244b205 100644 --- a/pkgs/development/interpreters/babashka/default.nix +++ b/pkgs/development/interpreters/babashka/default.nix @@ -15,7 +15,7 @@ buildGraalvmNativeImage rec { sha256 = "sha256-O3pLELYmuuB+Bf1vHTWQ+u7Ymi3qYiMRpCwvEq+GeBQ="; }; - graalvmDrv = graalvmCEPackages.graalvm19-ce; + graalvmDrv = graalvmCEPackages.graalvm-ce; executable = "bb"; @@ -38,7 +38,7 @@ buildGraalvmNativeImage rec { # As of v1.2.174, this will remove references to ${graalvmDrv}/conf/chronology, # not sure the implications of this but this file is not available in - # graalvm19-ce anyway. + # graalvm-ce anyway. postInstall = '' remove-references-to -t ${graalvmDrv} $out/bin/${executable} ''; diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index cb0e547331c0..ac6257164cb7 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -25,8 +25,8 @@ , xorgproto , coreutils # build options -, threadSupport ? stdenv.hostPlatform.isx86 -, x11Support ? stdenv.hostPlatform.isx86 +, threadSupport ? (stdenv.hostPlatform.isx86 && ! stdenv.hostPlatform.isDarwin) +, x11Support ? (stdenv.hostPlatform.isx86 && ! stdenv.hostPlatform.isDarwin) , dllSupport ? true , withModules ? [ "pcre" @@ -82,13 +82,16 @@ stdenv.mkDerivation { ''; preConfigure = lib.optionalString stdenv.isDarwin ('' - cd src - autoreconf -f -i -I m4 -I glm4 - cd - + ( + cd src + autoreconf -f -i -I m4 -I glm4 + ) '' + lib.concatMapStrings (x: '' - cd modules/${x} - autoreconf -f -i -I ../../src -I ../../src/m4 -I ../../src/glm4 - cd - + ( + root="$PWD" + cd modules/${x} + autoreconf -f -i -I "$root/src" -I "$root/src/m4" -I "$root/src/glm4" + ) '') withModules); configureFlags = [ "builddir" ] diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index d5548087f3cd..ed6f3d27157f 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.23"; - hash = "sha256-kppieFF32okt3/ygdLqy8f9XhHOg1K25FcEvXz407Bs="; + version = "8.1.24"; + hash = "sha256-sK5YBKmtU6fijQoyYpSV+Bb5NbEIMMcfTsFYJxhac8k="; }); in diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index f5f553c5eba9..a38b0d395712 100644 --- a/pkgs/development/interpreters/php/8.2.nix +++ b/pkgs/development/interpreters/php/8.2.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.2.10"; - hash = "sha256-zJg06PG2E9dneviEPDZR6YKavKjr/pB5JR0Nhdmgqj4="; + version = "8.2.11"; + hash = "sha256-OBktrv+r9K9sQnvxesH4JWXZx1IuDb0yIVFilEQ0sos="; }); in diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix index cbffa6c66ffd..2c48babf3baf 100644 --- a/pkgs/development/interpreters/php/8.3.nix +++ b/pkgs/development/interpreters/php/8.3.nix @@ -2,12 +2,12 @@ let base = (callPackage ./generic.nix (_args // { - version = "8.3.0RC2"; + version = "8.3.0RC3"; hash = null; })).overrideAttrs (oldAttrs: { src = fetchurl { - url = "https://downloads.php.net/~eric/php-8.3.0RC2.tar.xz"; - hash = "sha256-0Lo9msTyjfU9kuq0QkvUv4yeshM2tUizMJb9oCggMtw="; + url = "https://downloads.php.net/~jakub/php-8.3.0RC3.tar.xz"; + hash = "sha256-64JwXVR7WzfeXhq5qOW0cqpzcX09G9t9R2daQyRyRMQ="; }; }); in diff --git a/pkgs/development/interpreters/yabasic/default.nix b/pkgs/development/interpreters/yabasic/default.nix index 9ede197c8144..ee4cb47b6829 100644 --- a/pkgs/development/interpreters/yabasic/default.nix +++ b/pkgs/development/interpreters/yabasic/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "yabasic"; - version = "2.90.3"; + version = "2.90.4"; src = fetchurl { url = "http://www.yabasic.de/download/yabasic-${finalAttrs.version}.tar.gz"; - hash = "sha256-ItmlkraNUE0qlq1RghUJcDq4MHb6HRKNoIRylugjboA="; + hash = "sha256-td54SC1LnO3z07m3BsVDpiAsmokzB4xn4dbVdfeYH8M="; }; buildInputs = [ diff --git a/pkgs/development/libraries/functionalplus/default.nix b/pkgs/development/libraries/functionalplus/default.nix index 4fc6c745cf62..b456dd887344 100644 --- a/pkgs/development/libraries/functionalplus/default.nix +++ b/pkgs/development/libraries/functionalplus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "functionalplus"; - version = "0.2.18-p0"; + version = "0.2.20-p0"; src = fetchFromGitHub { owner = "Dobiasd"; repo = "FunctionalPlus"; rev = "v${version}"; - sha256 = "sha256-jypBQjFdVEktB8Q71RTg+3RJoeFwD5Wxw+fq+4QG38g="; + sha256 = "sha256-PKd3gx63VTxyq1q0v7WaKXVA0oICpZQfVsKsgUml9wk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 2a77677680d9..3df8cce6f4b4 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, perl, yasm +{ lib, stdenv, fetchFromGitHub, fetchpatch, perl, yasm , vp8DecoderSupport ? true # VP8 decoder , vp8EncoderSupport ? true # VP8 encoder , vp9DecoderSupport ? true # VP9 decoder @@ -84,6 +84,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-IH+ZWbBUlU5fbciYe+dNGnTFFCte2BXxAlLcvmzdAeY="; }; + patches = [ + (fetchpatch { + # https://www.openwall.com/lists/oss-security/2023/09/28/5 + name = "CVE-2023-5217.patch"; + url = "https://github.com/webmproject/libvpx/commit/3fbd1dca6a4d2dad332a2110d646e4ffef36d590.patch"; + hash = "sha256-1hHUd/dNGm8dmdYYN60j1aOgC2pdIIq7vqJZ7mTXfps="; + includes = [ + "vp8/encoder/onyx_if.c" + ]; + }) + ]; + postPatch = '' patchShebangs --build \ build/make/*.sh \ diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix index 6298a1dfef63..3cc6d9ce3510 100644 --- a/pkgs/development/libraries/mps/default.nix +++ b/pkgs/development/libraries/mps/default.nix @@ -1,12 +1,19 @@ -{ lib, stdenv, fetchurl, autoreconfHook, sqlite }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, sqlite +}: stdenv.mkDerivation rec { pname = "mps"; - version = "1.117.0"; + version = "1.118.0"; - src = fetchurl { - url = "https://www.ravenbrook.com/project/mps/release/${version}/mps-kit-${version}.tar.gz"; - sha256 = "04ix4l7lk6nxxk9sawpnxbybvqb82lks5606ym10bc1qbc2kqdcz"; + src = fetchFromGitHub { + owner = "Ravenbrook"; + repo = "mps"; + rev = "refs/tags/release-${version}"; + hash = "sha256-3ql3jWLccgnQHKf23B1en+nJ9rxqmHcWd7aBr93YER0="; }; nativeBuildInputs = [ autoreconfHook ]; @@ -21,7 +28,6 @@ stdenv.mkDerivation rec { meta = { - broken = true; description = "A flexible memory management and garbage collection library"; homepage = "https://www.ravenbrook.com/project/mps"; license = lib.licenses.sleepycat; diff --git a/pkgs/development/libraries/pipewire/wireplumber.nix b/pkgs/development/libraries/pipewire/wireplumber.nix index 4e249459d7ae..2fbbb2a1c01c 100644 --- a/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/pkgs/development/libraries/pipewire/wireplumber.nix @@ -2,28 +2,26 @@ , stdenv , fetchFromGitLab , nix-update-script -, # base build deps - meson +# base build deps +, meson , pkg-config , ninja -, # docs build deps - python3 +# docs build deps +, python3 , doxygen , graphviz -, # GI build deps - gobject-introspection -, # runtime deps - glib +# GI build deps +, gobject-introspection +# runtime deps +, glib , systemd , lua5_4 , pipewire -, # options - enableDocs ? true +# options +, enableDocs ? true , enableGI ? true }: -let - mesonEnableFeature = b: if b then "enabled" else "disabled"; -in + stdenv.mkDerivation rec { pname = "wireplumber"; version = "0.4.14"; @@ -49,8 +47,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (enableDocs || enableGI) [ doxygen (python3.pythonForBuild.withPackages (ps: with ps; - lib.optionals enableDocs [ sphinx sphinx-rtd-theme breathe ] ++ - lib.optionals enableGI [ lxml ] + lib.optionals enableDocs [ sphinx sphinx-rtd-theme breathe ] + ++ lib.optionals enableGI [ lxml ] )) ]; @@ -62,13 +60,13 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dsystem-lua=true" - "-Delogind=disabled" - "-Ddoc=${mesonEnableFeature enableDocs}" - "-Dintrospection=${mesonEnableFeature enableGI}" - "-Dsystemd-system-service=true" - "-Dsystemd-system-unit-dir=${placeholder "out"}/lib/systemd/system" - "-Dsysconfdir=/etc" + (lib.mesonBool "system-lua" true) + (lib.mesonEnable "elogind" false) + (lib.mesonEnable "doc" enableDocs) + (lib.mesonEnable "introspection" enableGI) + (lib.mesonBool "systemd-system-service" true) + (lib.mesonOption "systemd-system-unit-dir" "${placeholder "out"}/lib/systemd/system") + (lib.mesonOption "sysconfdir" "/etc") ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 0dd6cd75df08..840d3adc6dca 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -109,8 +109,8 @@ let patches = [ (fetchpatch2 { # fix compatibility with protobuf 23 - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-grpc/-/raw/d6b33bd915dc6e63b30db2cd29150d55b289d7ed/protobuf-23.patch"; - hash = "sha256-KQAcrjQ3rK9pDQUOUK6AS4ej8YvtRv9WZOxby31Y5r4="; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-grpc/-/raw/5cfb8728ca626af41d5dc2b1f642d026c011ec56/protobuf-23.patch"; + hash = "sha256-msVQEAt0DewOnZIgymGijJEpIXbfmMUkdbIyJ0ZNuok="; }) ]; }; diff --git a/pkgs/development/libraries/qt-6/fetch.sh b/pkgs/development/libraries/qt-6/fetch.sh index 519f2f887d1f..5102cfa8e407 100644 --- a/pkgs/development/libraries/qt-6/fetch.sh +++ b/pkgs/development/libraries/qt-6/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.qt.io/official_releases/qt/6.5/6.5.3/submodules/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix index 43c6dade7de3..1a112d7c6f93 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix @@ -5,12 +5,12 @@ qtModule rec { pname = "qtmqtt"; - version = "6.5.2"; + version = "6.5.3"; src = fetchFromGitHub { owner = "qt"; repo = "qtmqtt"; rev = "v${version}"; - hash = "sha256-yyerVzz+nGT5kjNo24zYqZcJmrE50KCp38s3+samjd0="; + hash = "sha256-F0rq72Cvnwy2cJmw3wUL9t8ZsnI61HBRMMWRwKdSEs8="; }; qtInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/qt-6/srcs.nix b/pkgs/development/libraries/qt-6/srcs.nix index a0ac367f162c..bad7dee1e105 100644 --- a/pkgs/development/libraries/qt-6/srcs.nix +++ b/pkgs/development/libraries/qt-6/srcs.nix @@ -4,315 +4,307 @@ { qt3d = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qt3d-everywhere-src-6.5.2.tar.xz"; - sha256 = "047rwawrlm7n0vifxmsqvs3w3j5c16x8qkpx8xazq6xd47dn9w11"; - name = "qt3d-everywhere-src-6.5.2.tar.xz"; - }; - }; - qt5 = { - version = "6.5.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qt5-everywhere-src-6.5.2.tar.xz"; - sha256 = "15da8xd213fg2yfna3zvvr5mnhdfdai0i4m1paqfxr10sl81p515"; - name = "qt5-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qt3d-everywhere-src-6.5.3.tar.xz"; + sha256 = "1p7x70wnqynsvd7w4jkz31amf02hwh49gqsccv5hhlpx50h9ydhd"; + name = "qt3d-everywhere-src-6.5.3.tar.xz"; }; }; qt5compat = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qt5compat-everywhere-src-6.5.2.tar.xz"; - sha256 = "1i4izabbmf1dayzlj1miz7hsm4cy0qb7i72pwyl2fp05w8pf9axr"; - name = "qt5compat-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qt5compat-everywhere-src-6.5.3.tar.xz"; + sha256 = "0r34h35w0m17zyncxq2a0kichv5l4j01mximg6m5mqbifziakcpf"; + name = "qt5compat-everywhere-src-6.5.3.tar.xz"; }; }; qtactiveqt = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtactiveqt-everywhere-src-6.5.2.tar.xz"; - sha256 = "04zhbwhnjlc561bs2f4y82mzlf18byy6g5gh37yq9r3gfz54002x"; - name = "qtactiveqt-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtactiveqt-everywhere-src-6.5.3.tar.xz"; + sha256 = "1lawc0jq5w0jqjagkf7d0g9i8rrsdgrd4k34ylriy27djpd53b1j"; + name = "qtactiveqt-everywhere-src-6.5.3.tar.xz"; }; }; qtbase = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtbase-everywhere-src-6.5.2.tar.xz"; - sha256 = "0s8jwzdcv97dfy8n3jjm8zzvllv380l73mwdva7rs2nqnhlwgd1x"; - name = "qtbase-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtbase-everywhere-src-6.5.3.tar.xz"; + sha256 = "0imm0x9j7102ymcz7gl0dbnbi8qk2jmijb4gg7wh9sp41cillbyz"; + name = "qtbase-everywhere-src-6.5.3.tar.xz"; }; }; qtcharts = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtcharts-everywhere-src-6.5.2.tar.xz"; - sha256 = "0bddlrwda5bh5bdwdx86ixdpm3zg5nygzb754y5nkjlw06zgfnkp"; - name = "qtcharts-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtcharts-everywhere-src-6.5.3.tar.xz"; + sha256 = "1n9fflfh47wm0fk1995dw56vyqfprwv5ialjfpcxxgzm187816sa"; + name = "qtcharts-everywhere-src-6.5.3.tar.xz"; }; }; qtconnectivity = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtconnectivity-everywhere-src-6.5.2.tar.xz"; - sha256 = "16fwbz9pr6pi19119mp6w0crq9nsb35fw8cgpfpkq99d6li4jbnv"; - name = "qtconnectivity-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtconnectivity-everywhere-src-6.5.3.tar.xz"; + sha256 = "0nrzpqs3cq0inwp3siskxz9yxxqkz15yaf9aicnggvvic2q328i4"; + name = "qtconnectivity-everywhere-src-6.5.3.tar.xz"; }; }; qtdatavis3d = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtdatavis3d-everywhere-src-6.5.2.tar.xz"; - sha256 = "1s8wlpc4nibnxaghkxmaxda5dkkn64jw6qgmzw39vi5vvhc3khb8"; - name = "qtdatavis3d-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtdatavis3d-everywhere-src-6.5.3.tar.xz"; + sha256 = "0qf07m3bplqpm7pkn3145l2k9h0npv9qbw9gcnydzp0qdsqc1dhi"; + name = "qtdatavis3d-everywhere-src-6.5.3.tar.xz"; }; }; qtdeclarative = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtdeclarative-everywhere-src-6.5.2.tar.xz"; - sha256 = "06c7xfqn2a5s2m8j1bcvx3pyjqg1rgqkjvp49737gb4z9vjiz8gk"; - name = "qtdeclarative-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtdeclarative-everywhere-src-6.5.3.tar.xz"; + sha256 = "05fjb70n35y42dp7g0sd99rbvmn9133z08k6rlp8ifq6sb9dcka0"; + name = "qtdeclarative-everywhere-src-6.5.3.tar.xz"; }; }; qtdoc = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtdoc-everywhere-src-6.5.2.tar.xz"; - sha256 = "0cydg39f4cpv965pr97qn3spm5fzlxvhamifjfdsrzgskc5nm0v3"; - name = "qtdoc-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtdoc-everywhere-src-6.5.3.tar.xz"; + sha256 = "1k430zc8khakpcjbj7vmkgrdyrz0y6bfcfgw4dzc68gcvbwbq27g"; + name = "qtdoc-everywhere-src-6.5.3.tar.xz"; }; }; qtgrpc = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtgrpc-everywhere-src-6.5.2.tar.xz"; - sha256 = "016jw2ny7paky54pk4pa499273919s8ag2ksx361ir6d0ydrdcks"; - name = "qtgrpc-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtgrpc-everywhere-src-6.5.3.tar.xz"; + sha256 = "10wbq5zcr263g1hi06xpyvh7y2advhhy07asx4aqwf56v9rpmgvf"; + name = "qtgrpc-everywhere-src-6.5.3.tar.xz"; }; }; qthttpserver = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qthttpserver-everywhere-src-6.5.2.tar.xz"; - sha256 = "1b6w0999n5vw5xb93m0rc896l6ci3jld657y8645rl3q29fjpypq"; - name = "qthttpserver-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qthttpserver-everywhere-src-6.5.3.tar.xz"; + sha256 = "0ivcaqf39k7mawd17wf2db3kn8ch2ajm4gqm6wl1iqkp45aqjm05"; + name = "qthttpserver-everywhere-src-6.5.3.tar.xz"; }; }; qtimageformats = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtimageformats-everywhere-src-6.5.2.tar.xz"; - sha256 = "0hv7mkn72126rkhy5gmjmbvzy7v17mkk3q2pkmzy99f64j4w1q5a"; - name = "qtimageformats-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtimageformats-everywhere-src-6.5.3.tar.xz"; + sha256 = "1jwc2gzlymxx82khwbaav83ma8y1rl2v593jq0jd13kkkb22dh29"; + name = "qtimageformats-everywhere-src-6.5.3.tar.xz"; }; }; qtlanguageserver = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtlanguageserver-everywhere-src-6.5.2.tar.xz"; - sha256 = "196iicwpqca2ydpca41qs6aqxxq8ycknw6lm2v00h1w3m86frdbk"; - name = "qtlanguageserver-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtlanguageserver-everywhere-src-6.5.3.tar.xz"; + sha256 = "12i1g8inp667w95gx4ldc3shb3pjd65c1x74qhmr6k2mq1sc3h60"; + name = "qtlanguageserver-everywhere-src-6.5.3.tar.xz"; }; }; qtlocation = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtlocation-everywhere-src-6.5.2.tar.xz"; - sha256 = "1yvdv1gqj7dij7v4cq9rlnqfb77c0v9b7n56jccvy5v6q9j7s7c9"; - name = "qtlocation-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtlocation-everywhere-src-6.5.3.tar.xz"; + sha256 = "1k77ck556wkcjzly2z2p9da54hpf8x5mjhyjvn6039xzjzax232k"; + name = "qtlocation-everywhere-src-6.5.3.tar.xz"; }; }; qtlottie = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtlottie-everywhere-src-6.5.2.tar.xz"; - sha256 = "16z8fhaa40ig0cggb689zf8j3cid6fk6pmh91b8342ymy1fdqfh0"; - name = "qtlottie-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtlottie-everywhere-src-6.5.3.tar.xz"; + sha256 = "08jpm4vhcwh0a72np6fmws79v9k3dpsji5gd3ws1rh04n62lcb1x"; + name = "qtlottie-everywhere-src-6.5.3.tar.xz"; }; }; qtmultimedia = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtmultimedia-everywhere-src-6.5.2.tar.xz"; - sha256 = "0xc9k4mlncscxqbp8q46yjd89k4jb8j0ggbi5ad874lycym013wl"; - name = "qtmultimedia-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtmultimedia-everywhere-src-6.5.3.tar.xz"; + sha256 = "09zzl3wywhnz5a0ym3q7nbydjcq2vj2bz7gi5p8hrhlqpg9g6r7d"; + name = "qtmultimedia-everywhere-src-6.5.3.tar.xz"; }; }; qtnetworkauth = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtnetworkauth-everywhere-src-6.5.2.tar.xz"; - sha256 = "0g18kh3zhcfi9ni8cqbbjdc1l6jf99ijv5shcl42jk6219b4pk2f"; - name = "qtnetworkauth-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtnetworkauth-everywhere-src-6.5.3.tar.xz"; + sha256 = "00m71302b1m4hjzn0hv222yz1d8dvm9n5djgyn38ikazb5smvd1n"; + name = "qtnetworkauth-everywhere-src-6.5.3.tar.xz"; }; }; qtpositioning = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtpositioning-everywhere-src-6.5.2.tar.xz"; - sha256 = "1yhlfs8izc054qv1krf5qv6zzjlvmz013h74fwamn74dfh1kyjbh"; - name = "qtpositioning-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtpositioning-everywhere-src-6.5.3.tar.xz"; + sha256 = "13vdklh87jz2p3miaifffi6r0ciw191b9ciaicwk0wry5fdhj6mb"; + name = "qtpositioning-everywhere-src-6.5.3.tar.xz"; }; }; qtquick3d = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquick3d-everywhere-src-6.5.2.tar.xz"; - sha256 = "1nh0vg2m1lf8m40bxbwsam5pwdzjammhal69k2pb5s0rjifs7q3m"; - name = "qtquick3d-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtquick3d-everywhere-src-6.5.3.tar.xz"; + sha256 = "0pffi1wcai6d5w18v39fdwp74za6ydjjcgbgn84y939h7xham0k6"; + name = "qtquick3d-everywhere-src-6.5.3.tar.xz"; }; }; qtquick3dphysics = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquick3dphysics-everywhere-src-6.5.2.tar.xz"; - sha256 = "0dri8v0pmvc1h1cdhdchvd4xi5f62c1wrk0jd01lh95i6sc1403m"; - name = "qtquick3dphysics-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtquick3dphysics-everywhere-src-6.5.3.tar.xz"; + sha256 = "1fm4ll8cjbdjn35pbi4763sfxzj49gml2rkdr7mrzwrz4hfk149j"; + name = "qtquick3dphysics-everywhere-src-6.5.3.tar.xz"; }; }; qtquickeffectmaker = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquickeffectmaker-everywhere-src-6.5.2.tar.xz"; - sha256 = "1gvcszqj6khqisxkpwi67xad0247hpq5zcz4v2vhbgkxq8kwfiym"; - name = "qtquickeffectmaker-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtquickeffectmaker-everywhere-src-6.5.3.tar.xz"; + sha256 = "19wwmal5k00l54ybb1ml2c40r4y5a1cwkd36zlri9jycs6x9nrxr"; + name = "qtquickeffectmaker-everywhere-src-6.5.3.tar.xz"; }; }; qtquicktimeline = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquicktimeline-everywhere-src-6.5.2.tar.xz"; - sha256 = "1fhmy01nqcr9q1193m9fkhbvqd9208kaigprqxkjjm61bn8awif9"; - name = "qtquicktimeline-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtquicktimeline-everywhere-src-6.5.3.tar.xz"; + sha256 = "0nvv5v5dy3ga1c1whrqdwvicmkys0psb720jycq833yqazn4qgpv"; + name = "qtquicktimeline-everywhere-src-6.5.3.tar.xz"; }; }; qtremoteobjects = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtremoteobjects-everywhere-src-6.5.2.tar.xz"; - sha256 = "0k29sk02n54vj1w6vh6xycsjpyfqlijc13fnxh1q7wpgg4gizx60"; - name = "qtremoteobjects-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtremoteobjects-everywhere-src-6.5.3.tar.xz"; + sha256 = "18g78q2b9iabc1a9sgbksxj2nsiizaq4lfmxqljjq2cbzd09x74d"; + name = "qtremoteobjects-everywhere-src-6.5.3.tar.xz"; }; }; qtscxml = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtscxml-everywhere-src-6.5.2.tar.xz"; - sha256 = "1jxx9p7zi40r990ky991xd43mv6i8hdpnj2fhl7sf4q9fpng4c58"; - name = "qtscxml-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtscxml-everywhere-src-6.5.3.tar.xz"; + sha256 = "0ld7i84nxxzp3bm96v2ymg53kkb8fpws2vq8b5bibs2zq0m6gn7k"; + name = "qtscxml-everywhere-src-6.5.3.tar.xz"; }; }; qtsensors = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtsensors-everywhere-src-6.5.2.tar.xz"; - sha256 = "19iamfl4znqbfflnnpis6qk3cqri7kzbg0nsgf42lc5lzdybs1j0"; - name = "qtsensors-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtsensors-everywhere-src-6.5.3.tar.xz"; + sha256 = "14y25lp296vddk3n4wpf8glshfww73dg47khhvw4s4l3b8rsgl8r"; + name = "qtsensors-everywhere-src-6.5.3.tar.xz"; }; }; qtserialbus = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtserialbus-everywhere-src-6.5.2.tar.xz"; - sha256 = "1zndnw1zx5x9daidcm0jq7jcr06ihw0nf6iksrx591f1rl3n6hph"; - name = "qtserialbus-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtserialbus-everywhere-src-6.5.3.tar.xz"; + sha256 = "13fhm8r0zp8rhbcn9i01s73kdng8afdvh5y0grqw8xqd2ncrav91"; + name = "qtserialbus-everywhere-src-6.5.3.tar.xz"; }; }; qtserialport = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtserialport-everywhere-src-6.5.2.tar.xz"; - sha256 = "17nc5kmha6fy3vzkxfr2gxyzdsahs1x66d5lhcqk0szak8b58g06"; - name = "qtserialport-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtserialport-everywhere-src-6.5.3.tar.xz"; + sha256 = "1njfhj063gw7v05ynw4frgwisl2cnlkd4xk2yf22hhmiihwsvjwr"; + name = "qtserialport-everywhere-src-6.5.3.tar.xz"; }; }; qtshadertools = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtshadertools-everywhere-src-6.5.2.tar.xz"; - sha256 = "0g8aziqhds2fkx11y4p2akmyn2p1qqf2fjxv72f9pibnhpdv0gya"; - name = "qtshadertools-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtshadertools-everywhere-src-6.5.3.tar.xz"; + sha256 = "0wrm1yp90fdqwvw8chxd2diic8zl1akr1yyyqmw8w14z80x7n6r0"; + name = "qtshadertools-everywhere-src-6.5.3.tar.xz"; }; }; qtspeech = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtspeech-everywhere-src-6.5.2.tar.xz"; - sha256 = "1cnlc9x0wswzl7j2imi4kvs9zavs4z1mhzzfpwr6d9zlfql9rzw8"; - name = "qtspeech-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtspeech-everywhere-src-6.5.3.tar.xz"; + sha256 = "170bdch6hvmqkf4y3071ym9aqbmknn0mdbayh9rpw6lj9lng9hkr"; + name = "qtspeech-everywhere-src-6.5.3.tar.xz"; }; }; qtsvg = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtsvg-everywhere-src-6.5.2.tar.xz"; - sha256 = "18v337lfk8krg0hff5jx6fi7gn6x3djn03x3psrhlbmgjc8crd28"; - name = "qtsvg-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtsvg-everywhere-src-6.5.3.tar.xz"; + sha256 = "1vsvbpwh8k863nb94lrl0l8phma176b1kcfl7i3q07yad5xw8hgw"; + name = "qtsvg-everywhere-src-6.5.3.tar.xz"; }; }; qttools = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qttools-everywhere-src-6.5.2.tar.xz"; - sha256 = "0ha3v488vnm4pgdpyjgf859sak0z2fwmbgcyivcd93qxflign7sm"; - name = "qttools-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qttools-everywhere-src-6.5.3.tar.xz"; + sha256 = "0dsy82k7ds5yziy648mxwfz6nq2vq90g43cbnjxjarv97wmx74gw"; + name = "qttools-everywhere-src-6.5.3.tar.xz"; }; }; qttranslations = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qttranslations-everywhere-src-6.5.2.tar.xz"; - sha256 = "1sxy2ljn5ajvn4yjb8fx86l56viyvqh5r9hf5x67azkmgrilaz1k"; - name = "qttranslations-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qttranslations-everywhere-src-6.5.3.tar.xz"; + sha256 = "1qs9x52fqnsgk1wzrvihnr6c5cigx8zimhk3dy1qxhprvh6lrd43"; + name = "qttranslations-everywhere-src-6.5.3.tar.xz"; }; }; qtvirtualkeyboard = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtvirtualkeyboard-everywhere-src-6.5.2.tar.xz"; - sha256 = "0sb2c901ma30dcbf4yhznw0pad09iz55alvkzyw2d992gqwf0w05"; - name = "qtvirtualkeyboard-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtvirtualkeyboard-everywhere-src-6.5.3.tar.xz"; + sha256 = "0bg678dirmw5b3d46abbidkch0p5hchmqgiwvcvxfh3928aqz01i"; + name = "qtvirtualkeyboard-everywhere-src-6.5.3.tar.xz"; }; }; qtwayland = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwayland-everywhere-src-6.5.2.tar.xz"; - sha256 = "16iwar19sgjvxgmbr6hmd3hsxp6ahdjwl1lra2wapl3zzf3bw81h"; - name = "qtwayland-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtwayland-everywhere-src-6.5.3.tar.xz"; + sha256 = "17rnaap0xa0c6q8b0drm020qny0i3ia8nb0z66xq36zzny48aapp"; + name = "qtwayland-everywhere-src-6.5.3.tar.xz"; }; }; qtwebchannel = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebchannel-everywhere-src-6.5.2.tar.xz"; - sha256 = "0qwfnwva7v5f2g5is17yy66mnmc9c1yf9aagaw5qanskdvxdk261"; - name = "qtwebchannel-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtwebchannel-everywhere-src-6.5.3.tar.xz"; + sha256 = "0jphdg711lhxbxg4dqrxnvkmfr2q9xzrd0h525zw94m7mfk8k7qj"; + name = "qtwebchannel-everywhere-src-6.5.3.tar.xz"; }; }; qtwebengine = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebengine-everywhere-src-6.5.2.tar.xz"; - sha256 = "17qxf3asyxq6kcqqvml170n7rnzih3nr4srp9r5v80pmas5l7jg7"; - name = "qtwebengine-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtwebengine-everywhere-src-6.5.3.tar.xz"; + sha256 = "1ra5hyyg4vymp8pgzv08smjc3fl1axdavnkpj1i5zxym1ndww513"; + name = "qtwebengine-everywhere-src-6.5.3.tar.xz"; }; }; qtwebsockets = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebsockets-everywhere-src-6.5.2.tar.xz"; - sha256 = "0xjwifxj2ssshys6f6kjr6ri2vq1wfshxky6mcscjm7vvyqdfjr0"; - name = "qtwebsockets-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtwebsockets-everywhere-src-6.5.3.tar.xz"; + sha256 = "1hx7qy7rgs46ggzifp249d8zz27bjwmbv7f960lwymjdb4bsxqh4"; + name = "qtwebsockets-everywhere-src-6.5.3.tar.xz"; }; }; qtwebview = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebview-everywhere-src-6.5.2.tar.xz"; - sha256 = "0cgn1px8zk2khmswi9zawi9cnx9p26y4lb3a0kr4kfklm1rf00jr"; - name = "qtwebview-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtwebview-everywhere-src-6.5.3.tar.xz"; + sha256 = "0jbiwwhjp4lz4r3ym3a4wr3s966d6imffmpb0jlvkah9ji6g276g"; + name = "qtwebview-everywhere-src-6.5.3.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index d29ea557b1f2..5074aed98d70 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -1,6 +1,19 @@ -{ fetchurl, stdenv, unixODBC, cmake, postgresql, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, libkrb5, libuuid, patchelf, libiconv, fetchFromGitHub }: +{ fetchurl, stdenv, unixODBC, cmake, postgresql, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, libkrb5, libuuid, patchelf, libiconv, fixDarwinDylibNames, fetchFromGitHub }: -# I haven't done any parameter tweaking.. So the defaults provided here might be bad +# Each of these ODBC drivers can be configured in your odbcinst.ini file using +# the various passthru and meta values. Of note are: +# +# * `passthru.fancyName`, the typical name used to reference the driver +# * `passthru.driver`, the path to the driver within the built package +# * `meta.description`, a short description of the ODBC driver +# +# For example, you might generate it as follows: +# +# '' +# [${package.fancyName}] +# Description = ${package.meta.description} +# Driver = ${package}/${package.driver} +# '' { psql = stdenv.mkDerivation rec { @@ -14,6 +27,7 @@ buildInputs = [ unixODBC postgresql ]; + # see the top of the file for an explanation passthru = { fancyName = "PostgreSQL"; driver = "lib/psqlodbcw.so"; @@ -59,6 +73,7 @@ "-DWITH_IODBC=OFF" ]; + # see the top of the file for an explanation passthru = { fancyName = "MariaDB"; driver = "lib/libmaodbc${stdenv.hostPlatform.extensions.sharedLibrary}"; @@ -87,6 +102,7 @@ cmakeFlags = [ "-DWITH_UNIXODBC=1" ]; + # see the top of the file for an explanation passthru = { fancyName = "MySQL"; driver = "lib/libmyodbc3-3.51.12.so"; @@ -122,6 +138,7 @@ mv "$out"/*.* "$out/lib" ''; + # see the top of the file for an explanation passthru = { fancyName = "SQLite"; driver = "lib/libsqlite3odbc.so"; @@ -165,14 +182,15 @@ $out/lib/libmsodbcsql-${versionMajor}.${versionMinor}.so.${versionAdditional} ''; + # see the top of the file for an explanation passthru = { - fancyName = "ODBC Driver 17 for SQL Server"; + fancyName = "ODBC Driver ${versionMajor} for SQL Server"; driver = "lib/libmsodbcsql-${versionMajor}.${versionMinor}.so.${versionAdditional}"; }; meta = with lib; { broken = stdenv.isDarwin; - description = "ODBC Driver 17 for SQL Server"; + description = "ODBC Driver ${versionMajor} for SQL Server"; homepage = "https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-2017"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; @@ -181,6 +199,90 @@ }; }; + msodbcsql18 = stdenv.mkDerivation(finalAttrs: { + pname = "msodbcsql${finalAttrs.versionMajor}"; + version = "${finalAttrs.versionMajor}.${finalAttrs.versionMinor}.${finalAttrs.versionAdditional}${finalAttrs.versionSuffix}"; + + versionMajor = "18"; + versionMinor = "1"; + versionAdditional = "1.1"; + versionSuffix = lib.optionalString stdenv.isLinux "-1"; + + src = fetchurl { + url = { + x86_64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/${finalAttrs.pname}/${finalAttrs.pname}_${finalAttrs.version}_amd64.deb"; + aarch64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/${finalAttrs.pname}/${finalAttrs.pname}_${finalAttrs.version}_arm64.deb"; + x86_64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/${finalAttrs.pname}-${finalAttrs.version}-amd64.tar.gz"; + aarch64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/${finalAttrs.pname}-${finalAttrs.version}-arm64.tar.gz"; + }.${stdenv.system} or (throw "Unsupported platform"); + hash = { + x86_64-linux = "sha256:1f0rmh1aynf1sqmjclbsyh2wz5jby0fixrwz71zp6impxpwvil52"; + aarch64-linux = "sha256:0zphnbvkqdbkcv6lvv63p7pyl68h5bs2dy6vv44wm6bi89svms4a"; + x86_64-darwin = "sha256:1fn80byn1yihflznxcm9cpj42mpllnz54apnk9n46vzm2ng2lj6d"; + aarch64-darwin = "sha256:116xl8r2apr5b48jnq6myj9fwqs88yccw5176yfyzh4534fznj5x"; + }.${stdenv.system} or (throw "Unsupported platform"); + }; + + nativeBuildInputs = + if stdenv.isDarwin + then + [ + # Fix up the names encoded into the dylib, and make them absolute. + fixDarwinDylibNames + ] + else + [ + dpkg + patchelf + ]; + + unpackPhase = lib.optionalString stdenv.isLinux '' + dpkg -x $src ./ + ''; + + installPhase = + if stdenv.isDarwin + then + '' + mkdir -p $out + tar xf $src --strip-components=1 -C $out + '' + else + '' + mkdir -p $out + mkdir -p $out/lib + cp -r opt/microsoft/msodbcsql${finalAttrs.versionMajor}/lib64 opt/microsoft/msodbcsql${finalAttrs.versionMajor}/share $out/ + ''; + + # Replace the hard-coded paths in the dylib with nixpkgs equivalents. + fixupPhase = lib.optionalString stdenv.isDarwin '' + ${stdenv.cc.bintools.targetPrefix}install_name_tool \ + -change /usr/lib/libiconv.2.dylib ${libiconv}/lib/libiconv.2.dylib \ + -change /opt/homebrew/lib/libodbcinst.2.dylib ${unixODBC}/lib/libodbcinst.2.dylib \ + $out/${finalAttrs.passthru.driver} + ''; + + postFixup = lib.optionalString stdenv.isLinux '' + patchelf --set-rpath ${lib.makeLibraryPath [ unixODBC openssl libkrb5 libuuid stdenv.cc.cc ]} \ + $out/${finalAttrs.passthru.driver} + ''; + + # see the top of the file for an explanation + passthru = { + fancyName = "ODBC Driver ${finalAttrs.versionMajor} for SQL Server"; + driver = "lib/libmsodbcsql${if stdenv.isDarwin then ".${finalAttrs.versionMajor}.dylib" else "-${finalAttrs.versionMajor}.${finalAttrs.versionMinor}.so.${finalAttrs.versionAdditional}"}"; + }; + + meta = with lib; { + description = finalAttrs.passthru.fancyName; + homepage = "https://learn.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver16"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + platforms = platforms.unix; + license = licenses.unfree; + maintainers = with maintainers; [ SamirTalwar ]; + }; + }); + redshift = stdenv.mkDerivation rec { pname = "redshift-odbc"; version = "1.4.49.1000"; @@ -210,6 +312,7 @@ buildInputs = [ unixODBC ]; + # see the top of the file for an explanation passthru = { fancyName = "Amazon Redshift (x64)"; driver = "lib/libamazonredshiftodbc64.so"; diff --git a/pkgs/development/libraries/utf8cpp/default.nix b/pkgs/development/libraries/utf8cpp/default.nix index c32c6e1e52f5..764f991c4467 100644 --- a/pkgs/development/libraries/utf8cpp/default.nix +++ b/pkgs/development/libraries/utf8cpp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "utf8cpp"; - version = "3.2.4"; + version = "3.2.5"; src = fetchFromGitHub { owner = "nemtrif"; repo = "utfcpp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-cpy1lg/9pWgI5uyOO9lfSt8llfGEjnu/O4P9688XVEA="; + sha256 = "sha256-cWiGggn2GP25K/8eopvnFPq6iwcBteNI3i9Lo1Sr+ig="; }; cmakeFlags = [ @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/nemtrif/utfcpp"; + changelog = "https://github.com/nemtrif/utfcpp/releases/tag/v${version}"; description = "UTF-8 with C++ in a Portable Way"; license = licenses.boost; maintainers = with maintainers; [ jobojeha ]; diff --git a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix index 474f69546d1a..768c0baa6d22 100644 --- a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix @@ -1,33 +1,24 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, ocaml, findlib }: +{ lib, fetchFromGitHub, buildDunePackage, logs, num }: -let +buildDunePackage rec { pname = "ocplib-simplex"; - version = "0.4"; -in - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-${pname}-${version}"; + version = "0.5"; src = fetchFromGitHub { owner = "OCamlPro-Iguernlala"; repo = pname; rev = "v${version}"; - sha256 = "09niyidrjzrj8g1qwx4wgsdf5m6cwrnzg7zsgala36jliic4di60"; + hash = "sha256-sy5QUmghG28tXlwbKWx3PpBGTtzXarTSzd1WLSYyvbc="; }; - nativeBuildInputs = [ autoreconfHook ocaml findlib ]; + propagatedBuildInputs = [ logs num ]; - strictDeps = true; - - installFlags = [ "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; - - createFindlibDestdir = true; + doCheck = true; meta = { description = "An OCaml library implementing a simplex algorithm, in a functional style, for solving systems of linear inequalities"; homepage = "https://github.com/OCamlPro-Iguernlala/ocplib-simplex"; - inherit (ocaml.meta) platforms; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index 5244aaf9edd0..2f5d2cd603b3 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -3,8 +3,8 @@ let version_sha = if lib.versionAtLeast ocaml.version "4.08" then { - version = "1.10.4"; - sha256 = "sha256-g+s+QwCqmx3HggdJAQ9DYuqDUkdCEwUk14wgzpnKdHw="; + version = "1.11.0"; + sha256 = "sha256-AfwkR4DA9r5yrnlrH7dQ82feGGJP110H7nl4LtbfjU8="; } else { diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index d4ce6fc256c3..d9d431aecccd 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -4,13 +4,13 @@ php.buildComposerProject (finalAttrs: { composer = callPackage ../../../build-support/php/pkgs/composer-phar.nix { }; pname = "composer"; - version = "2.6.3"; + version = "2.6.4"; src = fetchFromGitHub { owner = "composer"; repo = "composer"; rev = finalAttrs.version; - hash = "sha256-yzpkdtfok22yMvRdv4jYrd8x8MgNZbSDOsg+sVl/JqE="; + hash = "sha256-o7z2GBiYjTwDQR9ZFuOOV8zsKUuGqyA52dvwTzo4hVA="; }; nativeBuildInputs = [ makeBinaryWrapper ]; @@ -20,7 +20,7 @@ php.buildComposerProject (finalAttrs: { --prefix PATH : ${lib.makeBinPath [ _7zz cacert curl git unzip xz ]} ''; - vendorHash = "sha256-SG5RsKaP7zqJY2vjvULuNdf7w6tAGh7/dlxx2Pkfj2A="; + vendorHash = "sha256-S6LprixkLIbD+qqvg+eYjWsDe+jFl9NO1qWztWYKPXs="; meta = { changelog = "https://github.com/composer/composer/releases/tag/${finalAttrs.version}"; diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index 045168b8d162..77016c323d98 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "aiomisc"; - version = "17.3.21"; + version = "17.3.23"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NaSwjU4SfUYeUe/3nWQxfgMYrN4Ez1Dc/PE4ffJmlSs="; + hash = "sha256-9Df/eGMnXFdv3RUh4LmlPm7STlUcVBw4flfH+bZ6q9Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 67e7acde59a6..495b448c4c99 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-mgmt-compute"; - version = "30.2.0"; + version = "30.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pd1tAbhn1ot2sAM+x8yKGgEpCtlp7vVyCAcAzMZhyYE="; + hash = "sha256-5Sl4Y0D4YqpqIYp61qW+trn7VYM8XKoIUcwzFNBJO2M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index a65ad69731f5..5f666c1fdfc8 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.68"; + version = "0.2.69"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = pname; rev = version; - hash = "sha256-/W9Z1LjHpiAupA+D1tD+B0jmGhNbSo5aSv/nL2WSc8M="; + hash = "sha256-NXn92a+dhJhAfh92zvNQyrfNE7ZCCIl2er5569IXff8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index de6de6af7a69..fe802ac196c5 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.31.56"; + version = "1.31.57"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-4VEL02Gs91XsrOQu6YQoGt/qb5ZpXtIqCKTO6r/mb18="; + hash = "sha256-4o88p6YnnwHc7EZjmAvoCqk9xOsu/MI5aFnOtkdiO4M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/controku/default.nix b/pkgs/development/python-modules/controku/default.nix new file mode 100644 index 000000000000..4fd2e762b9c4 --- /dev/null +++ b/pkgs/development/python-modules/controku/default.nix @@ -0,0 +1,52 @@ +{ lib +, python3Packages +, fetchFromGitHub +, setuptools +, requests +, ssdpy +, appdirs +, pygobject3 +, gobject-introspection +, gtk3 +, wrapGAppsHook +, buildApplication ? false +}: + +python3Packages.buildPythonPackage rec { + pname = "controku"; + version = "1.1.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "benthetechguy"; + repo = "controku"; + rev = version; + hash = "sha256-sye2GtL3a77pygllZc6ylaIP7faPb+NFbyKKyqJzIXw="; + }; + + nativeBuildInputs = [ + setuptools + ] ++ lib.optionals buildApplication [ + gobject-introspection + wrapGAppsHook + ]; + + propagatedBuildInputs = [ + requests + ssdpy + ] ++ lib.optionals buildApplication [ + gtk3 + appdirs + pygobject3 + ]; + + pythonImportsCheck = [ "controku" ]; + + meta = with lib; { + changelog = "https://github.com/benthetechguy/controku/releases/tag/${version}"; + description = "Control Roku devices from the comfort of your own desktop"; + homepage = "https://github.com/benthetechguy/controku"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ mjm ]; + }; +} diff --git a/pkgs/development/python-modules/django-sesame/default.nix b/pkgs/development/python-modules/django-sesame/default.nix index 531d26158d17..b0671d789510 100644 --- a/pkgs/development/python-modules/django-sesame/default.nix +++ b/pkgs/development/python-modules/django-sesame/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "django-sesame"; - version = "3.1"; + version = "3.2.1"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "aaugustin"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Pyyhm0th0cNEkM0sd6maCnf4qELsSO82c9CQuqQdn0w="; + hash = "sha256-R7ySuop7E1lkxtRSVNFfzyb3Ba1mW0o6PDiTxTztK/Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/docformatter/default.nix b/pkgs/development/python-modules/docformatter/default.nix index 52bdb7ccc9d7..5e0240034413 100644 --- a/pkgs/development/python-modules/docformatter/default.nix +++ b/pkgs/development/python-modules/docformatter/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "docformatter"; - version = "1.6.4"; + version = "1.7.5"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OQNE6Is1Pl0uoAkFYh4M+c8oNWL/uIh4X0hv8X0Qt/g="; + hash = "sha256-QUjeG84KwI5Y3MU1wrmjHBXU2tEJ0CuiR3Y/S+dX7Gs="; }; patches = [ diff --git a/pkgs/development/python-modules/docformatter/test-path.patch b/pkgs/development/python-modules/docformatter/test-path.patch index bd61c0ca829b..2959d84704e8 100644 --- a/pkgs/development/python-modules/docformatter/test-path.patch +++ b/pkgs/development/python-modules/docformatter/test-path.patch @@ -1,13 +1,13 @@ diff --git a/tests/conftest.py b/tests/conftest.py -index 5f5a9aa..3289222 100644 +index 762d246..7f86763 100644 --- a/tests/conftest.py +++ b/tests/conftest.py -@@ -92,21 +92,9 @@ def run_docformatter(arguments, temporary_file): +@@ -101,21 +101,9 @@ def run_docformatter(arguments, temporary_file): Return subprocess object. """ - if "DOCFORMATTER_COVERAGE" in os.environ and int( -- os.environ["DOCFORMATTER_COVERAGE"] +- os.environ["DOCFORMATTER_COVERAGE"] - ): - DOCFORMATTER_COMMAND = [ - "coverage", diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 709e022c816f..7b7575801128 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "2.16.4"; + version = "2.17.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-DvG1SFYDzLXhftfyCVbO9WNSZeRE2tRU1nbkIayJYv4="; + hash = "sha256-Mb2dX2PXQVLI5HEOyxpfVh/9vL9BkQ8o8Ly3lYZ2eYI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix index f6568e691fa1..76ff49c6a4c0 100644 --- a/pkgs/development/python-modules/enlighten/default.nix +++ b/pkgs/development/python-modules/enlighten/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "enlighten"; - version = "1.11.2"; + version = "1.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-koSGHe5aJy4OGjdYzT87cYCxvRdUh12naHbyp/Rsy2E="; + hash = "sha256-a4r20HG13gUBOjjoDhaHJtxv+yhY3oF/d+QV+Fss6Bk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/garth/default.nix b/pkgs/development/python-modules/garth/default.nix index ff3ec741b318..c8d67961e67c 100644 --- a/pkgs/development/python-modules/garth/default.nix +++ b/pkgs/development/python-modules/garth/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "garth"; - version = "0.4.29"; + version = "0.4.31"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-R0FoxA/ogxZGVmGNiPtnReaBa5RoSsOw5bnowCGGSbE="; + hash = "sha256-8Suo/BxKmergzKcD62rsmo3MHG0qCdJfqxbkrQdAxxo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/get-video-properties/default.nix b/pkgs/development/python-modules/get-video-properties/default.nix index 89e01fedc13d..63b9515cf791 100644 --- a/pkgs/development/python-modules/get-video-properties/default.nix +++ b/pkgs/development/python-modules/get-video-properties/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, ffmpeg +, ffmpeg-headless }: buildPythonPackage rec { @@ -20,7 +20,10 @@ buildPythonPackage rec { postPatch = '' substituteInPlace videoprops/__init__.py \ - --replace "which('ffprobe')" "'${ffmpeg}/bin/ffprobe'" + --replace "which('ffprobe')" "'${ffmpeg-headless}/bin/ffprobe'" + + # unused and vulnerable to various CVEs + rm -r videoprops/binary_dependencies ''; pythonImportsCheck = [ "videoprops" ]; diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 5d5c56188c88..29adb27c72bf 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -33,8 +33,10 @@ buildPythonPackage rec { pytestCheckHook ]; - # some tests require loopback networking - __darwinAllowLocalNetworking = true; + disabledTests = lib.optionals stdenv.isDarwin [ + # This test fails if the hostname is not associated with an IP (e.g., in `/etc/hosts`). + "test_run_local_server_bind_addr" + ]; pythonImportsCheck = [ "google_auth_oauthlib" diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index c94cda768501..959c9d39b3a9 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.36.2"; + version = "0.36.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-21u6QnmFoa3rCeFMkxdEh4OYtE4QmBr5O9PwV5tKgxg="; + hash = "sha256-H4iKxM6uwpAIISSxm4ux+qXsoPfHmpHBRx5MuGxwCE4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index d0751e3acb67..973e30668da4 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "hcloud"; - version = "1.29.0"; + version = "1.29.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-d5LEN7sFoO+R7pGTvLOMRoej/KB17uY3kqF+CY97x1k="; + hash = "sha256-yqwWuRip/QmWqn7Gm3Fth46DooNGhJGLQbnsJE/67bg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/indexed-bzip2/default.nix b/pkgs/development/python-modules/indexed-bzip2/default.nix new file mode 100644 index 000000000000..d6c82e3aec9a --- /dev/null +++ b/pkgs/development/python-modules/indexed-bzip2/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "indexed_bzip2"; + version = "1.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-tKf9odadfQZQYJz//vWYpeB99Z8VLg+hEPvfEHXgdnM="; + }; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "indexed_bzip2" ]; + + meta = with lib; { + description = "Python library for parallel decompression and seeking within compressed bzip2 files"; + homepage = "https://github.com/mxmlnkn/indexed_bzip2"; + license = licenses.mit; # dual MIT and asl20, https://internals.rust-lang.org/t/rationale-of-apache-dual-licensing/8952 + maintainers = with lib.maintainers; [ mxmlnkn ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/indexed-gzip/default.nix b/pkgs/development/python-modules/indexed-gzip/default.nix new file mode 100644 index 000000000000..73ad916f35f8 --- /dev/null +++ b/pkgs/development/python-modules/indexed-gzip/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, cython +, zlib +}: + +buildPythonPackage rec { + pname = "indexed_gzip"; + version = "1.8.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-h9JgYq9KxmknaRuMgq+5YWA8tUaFk+lclkqdNAnr/cI="; + }; + + nativeBuildInputs = [ cython ]; + + buildInputs = [ zlib ]; + + # Too complicated to get to work, not a simple pytest call. + doCheck = false; + + pythonImportsCheck = [ "indexed_gzip" ]; + + meta = with lib; { + description = "Python library to seek within compressed gzip files"; + homepage = "https://github.com/pauldmccarthy/indexed_gzip"; + license = licenses.zlib; + maintainers = with lib.maintainers; [ mxmlnkn ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/indexed-zstd/default.nix b/pkgs/development/python-modules/indexed-zstd/default.nix new file mode 100644 index 000000000000..f9d643c8ff49 --- /dev/null +++ b/pkgs/development/python-modules/indexed-zstd/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, cython +, zstd +}: + +buildPythonPackage rec { + pname = "indexed_zstd"; + version = "1.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-icCerrv6ihBjSTS4Fsw7qhoA5ha8yegfMVRiIOhTvvY="; + }; + + nativeBuildInputs = [ cython ]; + + buildInputs = [ zstd.dev ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "indexed_zstd" ]; + + meta = with lib; { + description = "Python library to seek within compressed zstd files"; + homepage = "https://github.com/martinellimarco/indexed_zstd"; + license = licenses.mit; + maintainers = with lib.maintainers; [ mxmlnkn ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index 0469943e334a..dfbe2d7d638e 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "0.45.2"; + version = "0.46"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "coveooss"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DmUQ06UabLcB67PyfRC/gmSkEY/V8kuZ/T/ZW1D11vA="; + hash = "sha256-wTO+d0O3SKT2jJ2zNubT2q76PdJ7+kT9RBEw5MMH1yg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 96790c04c450..9e31ebadf6bd 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.12.0"; + version = "5.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-feKKBbULkWxEgUaMROvmQph2YTAgSOVDRz/OnpzG9Ac="; + hash = "sha256-ykbKNLMnbAGUavyfRtF3q97FRLaeuKOt0pcWHtJ9mCY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nextcord/default.nix b/pkgs/development/python-modules/nextcord/default.nix index 04fa54a28d6a..4a5faf4c33a8 100644 --- a/pkgs/development/python-modules/nextcord/default.nix +++ b/pkgs/development/python-modules/nextcord/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nextcord"; - version = "2.5.0"; + version = "2.6.1"; format = "setuptools"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "nextcord"; repo = "nextcord"; rev = "refs/tags/v${version}"; - hash = "sha256-Oo1C2tasuNIpUaKACbapnoZs7WVS1uncS1akErzQrqI="; + hash = "sha256-bv4I+Ol/N4kbp/Ch7utaUpo0GmF+Mpx4zWmHL7uIveM="; }; patches = [ diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 62acb84d4f82..0c30ddd4f1ba 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.112.1"; + version = "2.112.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-HPmAXLEoTEDVZh1npkcLQamEn/CehzM1FOgGOHUrBrg="; + hash = "sha256-Khh1/lpgBtUb1pfV7wNkHA6dWiBpAS899zB4Elp1ULY="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix new file mode 100644 index 000000000000..fddfd74834e9 --- /dev/null +++ b/pkgs/development/python-modules/oelint-parser/default.nix @@ -0,0 +1,31 @@ +{ lib +, nix-update-script +, fetchPypi +, buildPythonPackage +, regex +}: + +buildPythonPackage rec { + pname = "oelint-parser"; + version = "2.11.3"; + format = "setuptools"; + + src = fetchPypi { + inherit version; + pname = "oelint_parser"; + hash = "sha256-iR/MDHt3SEG29hSLqA36EXe8EBRZVntt+u6bwoujy0s="; + }; + + propagatedBuildInputs = [ regex ]; + pythonImportsCheck = [ "oelint_parser" ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Alternative parser for bitbake recipes"; + homepage = "https://github.com/priv-kweihmann/oelint-parser"; + changelog = "https://github.com/priv-kweihmann/oelint-parser/releases/tag/v${version}"; + license = licenses.bsd2; + maintainers = with maintainers; [ otavio ]; + }; +} diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index cafaf385a733..54b16712fef3 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.0.34"; + version = "0.0.35"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-VIw0FRFhZpd9R5/j8ejgfy1p8/R2Gv8Wtjc3PDA4bqo="; + hash = "sha256-bS9KsPMuzQ+4AXsVzKiCevZujU4iW2hZ+eSJheM4NRI="; }; pythonRemoveDeps = [ diff --git a/pkgs/development/python-modules/oss2/default.nix b/pkgs/development/python-modules/oss2/default.nix index 52fc79baed4c..62a98425a9d7 100644 --- a/pkgs/development/python-modules/oss2/default.nix +++ b/pkgs/development/python-modules/oss2/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "oss2"; - version = "2.18.1"; + version = "2.18.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "aliyun"; repo = "aliyun-oss-python-sdk"; rev = "refs/tags/${version}"; - hash = "sha256-4P2o10FhnLwRkhRYS+LzY+ugWPQgz+Tddn9XYR17018="; + hash = "sha256-xbbdzuaUvFnXA5glGr/1/s1Bm28d4XbtuvCKaj8Js68="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/piccolo-theme/default.nix b/pkgs/development/python-modules/piccolo-theme/default.nix index 0cb84c332a88..3b68065a23b2 100644 --- a/pkgs/development/python-modules/piccolo-theme/default.nix +++ b/pkgs/development/python-modules/piccolo-theme/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "piccolo-theme"; - version = "0.17.0"; + version = "0.18.0"; src = fetchPypi { pname = "piccolo_theme"; inherit version; - hash = "sha256-sq/xWPLLAz4w6JdUfnB5E52hmj8gmrbg1oeBedyjCEE="; + hash = "sha256-tEgYrQaVcWZadmhV6JRuXnk8m9oJLNSfb0hA309bX1U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index c2623977be4c..d2ecca94cb4d 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.15.1"; + version = "4.15.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = "refs/tags/${version}"; - hash = "sha256-mxVj98wbstUx/Abim7kzVVt/8kaAPVOhv4zt+PFgi3Y="; + hash = "sha256-3Rnwo6KpOsfrIWmJjxh1DSDFoVqBckB0uZh5PdsjRO8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/py-nextbusnext/default.nix b/pkgs/development/python-modules/py-nextbusnext/default.nix index 67e934dad1d1..2d01e0cf8ffa 100644 --- a/pkgs/development/python-modules/py-nextbusnext/default.nix +++ b/pkgs/development/python-modules/py-nextbusnext/default.nix @@ -2,31 +2,35 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "py-nextbusnext"; - version = "0.1.5"; - + version = "1.0.0"; format = "setuptools"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "ViViDboarder"; repo = "py_nextbus"; - rev = "v${version}"; - hash = "sha256-uUHA8v5iTISmPaTgk0RvcLLRM34f3JXUjZClKGXdMoI="; + rev = "refs/tags/v${version}"; + hash = "sha256-044VDg7bQNNnRGiPZW9gwo3Bzq0LPYKTrd3EgmBOcGA="; }; nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "py_nextbus" ]; + pythonImportsCheck = [ + "py_nextbus" + ]; - meta = { + meta = with lib; { description = "Minimalistic Python client for the NextBus public API"; homepage = "https://github.com/ViViDboarder/py_nextbus"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dotlambda ]; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix index 5aab2c91702d..1a517aaf6ff4 100644 --- a/pkgs/development/python-modules/pyathena/default.nix +++ b/pkgs/development/python-modules/pyathena/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyathena"; - version = "3.0.7"; + version = "3.0.8"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Mdb+pEkXbwRVx3wxpPdwkCweNO48/GuYiOLATbPUpwQ="; + hash = "sha256-DqRjtMSlyo2PB4ipOpPxFEWl/RuKlT3yWddzCS5NL98="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pycapnp/default.nix b/pkgs/development/python-modules/pycapnp/default.nix index cd2e8f450cd2..fc41822cebe3 100644 --- a/pkgs/development/python-modules/pycapnp/default.nix +++ b/pkgs/development/python-modules/pycapnp/default.nix @@ -33,5 +33,8 @@ buildPythonPackage rec { homepage = "https://capnproto.github.io/pycapnp/"; maintainers = with maintainers; [ cstrahan lukeadams ]; license = licenses.bsd2; + # No support for capnproto 1.0 yet + # https://github.com/capnproto/pycapnp/issues/323 + broken = lib.versionAtLeast capnproto.version "1.0"; }; } diff --git a/pkgs/development/python-modules/python-fx/default.nix b/pkgs/development/python-modules/python-fx/default.nix index 4bdd0816b2f1..d505e0a19654 100644 --- a/pkgs/development/python-modules/python-fx/default.nix +++ b/pkgs/development/python-modules/python-fx/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "python-fx"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "cielong"; repo = "pyfx"; rev = "refs/tags/v${version}"; - hash = "sha256-Bgg6UbAyog1I4F2NfULY+UlPf2HeyBJdxm4+5bmCLN0="; + hash = "sha256-BXKH3AlYMNbMREW5Qx72PrbuZdXlmVS+knWWu/y9PsA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-xz/default.nix b/pkgs/development/python-modules/python-xz/default.nix new file mode 100644 index 000000000000..b5a2ed4e21f9 --- /dev/null +++ b/pkgs/development/python-modules/python-xz/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "python-xz"; + version = "0.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-OYdGWTtwb6n6xZuMmI6rhgPh/iupGVERwLRSJ6OnfbM="; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "xz" ]; + + meta = with lib; { + description = "Pure Python library for seeking within compressed xz files"; + homepage = "https://github.com/Rogdham/python-xz"; + license = licenses.mit; + maintainers = with lib.maintainers; [ mxmlnkn ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix index e8dfc2745fb8..7a740efe5a4e 100644 --- a/pkgs/development/python-modules/pyvmomi/default.nix +++ b/pkgs/development/python-modules/pyvmomi/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyvmomi"; - version = "8.0.1.0.2"; + version = "8.0.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "vmware"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-NI2xkHo9A9zEvdbTt9vF91gavSnCuFjdjr6PxEvkSZM="; + hash = "sha256-IoYxk/lS7dhw0q3kfpq7y/oDNmc1dOra0YA3CiHe8YM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rapidgzip/default.nix b/pkgs/development/python-modules/rapidgzip/default.nix new file mode 100644 index 000000000000..ace2bad62016 --- /dev/null +++ b/pkgs/development/python-modules/rapidgzip/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, nasm +}: + +buildPythonPackage rec { + pname = "rapidgzip"; + version = "0.10.3"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-gtxF9V7OQb34Z0cCuTh/Lbe1ttCbdaY0zpM3KHHGGuw="; + }; + + nativeBuildInputs = [ nasm ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "rapidgzip" ]; + + meta = with lib; { + description = "Python library for parallel decompression and seeking within compressed gzip files"; + homepage = "https://github.com/mxmlnkn/rapidgzip"; + license = licenses.mit; # dual MIT and asl20, https://internals.rust-lang.org/t/rationale-of-apache-dual-licensing/8952 + maintainers = with lib.maintainers; [ mxmlnkn ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/ratarmount/default.nix b/pkgs/development/python-modules/ratarmount/default.nix new file mode 100644 index 000000000000..1555dfca2197 --- /dev/null +++ b/pkgs/development/python-modules/ratarmount/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, fusepy +, ratarmountcore +}: + +buildPythonPackage rec { + pname = "ratarmount"; + version = "0.14.0"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-P+p0h+KuOsunPsXbRwxzAhr1XcEqMjQxHeHmA29+pDQ="; + }; + + propagatedBuildInputs = [ ratarmountcore fusepy ]; + + checkPhase = '' + runHook preCheck + + python tests/tests.py + + runHook postCheck + ''; + + meta = with lib; { + description = "Mounts archives as read-only file systems by way of indexing"; + homepage = "https://github.com/mxmlnkn/ratarmount"; + license = licenses.mit; + maintainers = with lib.maintainers; [ mxmlnkn ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/ratarmountcore/default.nix b/pkgs/development/python-modules/ratarmountcore/default.nix new file mode 100644 index 000000000000..49ffdb17cfa5 --- /dev/null +++ b/pkgs/development/python-modules/ratarmountcore/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchgit +, pythonOlder +, pytestCheckHook +, indexed-bzip2 +, indexed-gzip +, indexed-zstd +, python-xz +, rapidgzip +, rarfile +, zstandard # Python bindings +, zstd # System tool +}: + +buildPythonPackage rec { + pname = "ratarmountcore"; + version = "0.6.0"; + + disabled = pythonOlder "3.6"; + + src = fetchgit { + url = "https://github.com/mxmlnkn/ratarmount"; + # The revision is hardcoded for now to fix problems with the tests, which are not worthy of a new release + # tag because releases do not officially contain tests. On the next release, use the commented revision, + # which points to a release tag, instead. + #rev = "core-v${version}"; + rev = "ea43572dfbac4770a27ef2169f72ff73ee4a4ae9"; + hash = "sha256-sPApM5OW+UbujFXHSL4ptMaegajz7FNtXz/KftTlw+U="; + fetchSubmodules = true; + }; + + sourceRoot = "${src.name}/core"; + + propagatedBuildInputs = [ indexed-gzip indexed-bzip2 indexed-zstd python-xz rapidgzip rarfile ]; + + pythonImportsCheck = [ "ratarmountcore" ]; + + nativeCheckInputs = [ pytestCheckHook zstandard zstd ]; + + meta = with lib; { + description = "Library for accessing archives by way of indexing"; + homepage = "https://github.com/mxmlnkn/ratarmount/tree/master/core"; + license = licenses.mit; + maintainers = with lib.maintainers; [ mxmlnkn ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/sqlparse/default.nix b/pkgs/development/python-modules/sqlparse/default.nix index e472c64a8f95..795647098caf 100644 --- a/pkgs/development/python-modules/sqlparse/default.nix +++ b/pkgs/development/python-modules/sqlparse/default.nix @@ -10,7 +10,7 @@ , django , django_4 , django-silk -, pgadmin +, pgadmin4 }: buildPythonPackage rec { @@ -35,7 +35,7 @@ buildPythonPackage rec { ''; passthru.tests = { - inherit django django_4 django-silk pgadmin; + inherit django django_4 django-silk pgadmin4; }; meta = with lib; { diff --git a/pkgs/development/python-modules/ssdpy/default.nix b/pkgs/development/python-modules/ssdpy/default.nix new file mode 100644 index 000000000000..ba9d32d710b1 --- /dev/null +++ b/pkgs/development/python-modules/ssdpy/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pytestCheckHook +, pytest-mock +}: + +buildPythonPackage rec { + pname = "ssdpy"; + version = "0.4.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "MoshiBin"; + repo = "ssdpy"; + rev = version; + hash = "sha256-luOanw4aOepGxoGtmnWZosq9JyHLJb3E+25tPkkL1w0="; + }; + + nativeBuildInputs = [ setuptools ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + ]; + + pythonImportsCheck = [ "ssdpy" ]; + + disabledTests = [ + # They all require network access + "test_client_json_output" + "test_discover" + "test_server_ipv4" + "test_server_ipv6" + "test_server_binds_iface" + "test_server_bind_address_ipv6" + "test_server_extra_fields" + ]; + + meta = with lib; { + changelog = "https://github.com/MoshiBin/ssdpy/releases/tag/${version}"; + description = "A lightweight, compatible SSDP library for Python"; + homepage = "https://github.com/MoshiBin/ssdpy"; + license = licenses.mit; + maintainers = with maintainers; [ mjm ]; + }; +} diff --git a/pkgs/development/python-modules/ua-parser/default.nix b/pkgs/development/python-modules/ua-parser/default.nix index e9c9a561739c..ba0f75ce6f35 100644 --- a/pkgs/development/python-modules/ua-parser/default.nix +++ b/pkgs/development/python-modules/ua-parser/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ua-parser"; - version = "0.16.1"; + version = "0.18.0"; format = "setuptools"; @@ -16,7 +16,7 @@ buildPythonPackage rec { repo = "uap-python"; rev = version; fetchSubmodules = true; - hash = "sha256-vyzeRi/wYEyezSU+EigJATgrNvABGCWVWlSFhKGipLE="; + hash = "sha256-GiuGPnyYL0HQ/J2OpDTD1/panZCuzKtD3mKW5op5lXA="; }; patches = [ diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 9829d814ba1a..e271f7272112 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.4.51"; + version = "2.4.55"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Ln+3LY/O0f4eSWDLmrO9ONGFTxE0icdA3qdXrJ9PoO4="; + hash = "sha256-HeGrhW9QKxR3WrPMQRgRSntcpbr8UEg+D6To5Dqmfsc="; }; patches = [ @@ -83,6 +83,7 @@ buildPythonApplication rec { prettytable pycep-parser pyyaml + rustworkx semantic-version spdx-tools tabulate diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix index 49425e5125e3..a0cfddc7bab0 100644 --- a/pkgs/development/tools/go-mockery/default.nix +++ b/pkgs/development/tools/go-mockery/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.33.3"; + version = "2.34.1"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-ctq4DPlLsV9HCa2Vc+soQJu3DdrTyaHoSN9pZZtk+Mw="; + sha256 = "sha256-c1imyCv/eqyTEHz6H18McKY+59swG84PcLG6HI1uQmE="; }; preCheck = '' diff --git a/pkgs/development/tools/language-servers/typst-lsp/default.nix b/pkgs/development/tools/language-servers/typst-lsp/default.nix index b564449463a4..24d9dfcb0000 100644 --- a/pkgs/development/tools/language-servers/typst-lsp/default.nix +++ b/pkgs/development/tools/language-servers/typst-lsp/default.nix @@ -42,6 +42,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A brand-new language server for Typst"; homepage = "https://github.com/nvarner/typst-lsp"; + mainProgram = "typst-lsp"; changelog = "https://github.com/nvarner/typst-lsp/releases/tag/${src.rev}"; license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ figsoda GaetanLepage ]; diff --git a/pkgs/development/tools/misc/orogene/default.nix b/pkgs/development/tools/misc/orogene/default.nix index a3e0deffa8a8..effa5e530efc 100644 --- a/pkgs/development/tools/misc/orogene/default.nix +++ b/pkgs/development/tools/misc/orogene/default.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "orogene"; - version = "0.3.27"; + version = "0.3.31"; src = fetchFromGitHub { owner = "orogene"; repo = "orogene"; rev = "v${version}"; - hash = "sha256-y58S8oou1GBR1Cx77IzLvLmZ/MN88P9k1RGCFOVbHHc="; + hash = "sha256-q6YPyxfOiTOQ6eVjBIsnV7HhwM3A3EIiRCJpDGKZRrQ="; fetchSubmodules = true; }; - cargoHash = "sha256-hZQxzhq61h83geLazhEkoaB1oRz/xSXuwW7BuBWxfHs="; + cargoHash = "sha256-2NAwy95C8/rEq5ssq3poBOL+crwaHJh1Vo+sYiDb6Ds="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index 33a15ba5132b..d0deaa76fc5f 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "patchelf"; - version = "unstable-2023-09-19"; + version = "unstable-2023-09-27"; src = fetchFromGitHub { owner = "NixOS"; repo = "patchelf"; - rev = "afd3cc94450dc6845e923f9221fa38818538219e"; - sha256 = "sha256-ZTy3Dw2HkKokBUXz3ftoGCYncVQ/K3lons9mIt+HVvQ="; + rev = "917ea45b79de04f69059f42a8e2621f7caeae1c9"; + sha256 = "sha256-pP/DBhsYFpYQ7RqB4+1Iy9B1jPlC1rNT3aZhhr1Z9EU="; }; # Drop test that fails on musl (?) diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index 18007e302a0d..4ba0bfdd2a7c 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/rui314/mold/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ azahi nitsky paveloom ]; + mainProgram = "mold"; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index f0da1953ad0d..f7dbb7360634 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.155.0"; + version = "0.156.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-ZQ4DpGCkxvF9VJJNr6Xye717MrVW2aRYAlq4oib3nV8="; + sha256 = "sha256-1VlG+0jzx6Yho0bc3RypXgOFoM+NgOQ2RX4FB5ZllSw="; }; - vendorHash = "sha256-OeXX16PsDPjQP+piMYhbnANfdBoYamA21yoMM1pWiCA="; + vendorHash = "sha256-T5UmaS7PPZdkPpFxJIqpF5pH24uFrHbrbsI5gfElUOY="; ldflags = [ "-s" "-w" diff --git a/pkgs/development/tools/rust/cargo-binstall/default.nix b/pkgs/development/tools/rust/cargo-binstall/default.nix index fda16c6bb81f..177029648f12 100644 --- a/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-viy7C9ZMUJoAdIwOBvogkiTApTrD3X9cEOqPtfksjOA="; + hash = "sha256-x+fjngKdSS3ujWs2FbdcRSLi99wEuhi3f7uf7wEAvY8="; }; - cargoHash = "sha256-hH2P2hpQji4n7LidNionkEYHcDpU4qP23ScQLsy92Nw="; + cargoHash = "sha256-p/O8v08GjccJGMTvSdAFgOZAMG9jjXmvlJykzyne84w="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 0221509d93cc..915ae7a148c2 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-deny"; rev = version; - hash = "sha256-IA5LaagNsAkSP7ut5iqUUI8DJMr7U+nwqVsCWR8mOnY="; + hash = "sha256-syBf90xPcwp86xJDHtLMZXCsqh4P0mcaAcNnvjYudn8="; }; - cargoHash = "sha256-xiVZNBIdnRorMZDabpfE6Pans3Nh56VA29fYRu7N5cE="; + cargoHash = "sha256-YmHHuFubac0j0ptFGOr7GI1PYR4KhShrEwdqikG4RlQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/development/tools/rust/cargo-dist/default.nix index b238241ec346..22466ca34bdc 100644 --- a/pkgs/development/tools/rust/cargo-dist/default.nix +++ b/pkgs/development/tools/rust/cargo-dist/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-gfUSS2ITMueuohkcdSGHg1VjJ7Mn9EYoyyonnLbtZRQ="; + hash = "sha256-h3ga4H9gIS3H6krPqXyYHMIhlxFQPbEfZV8cpQWWhpw="; }; - cargoHash = "sha256-T8ZBYWUaxRaYv4SBshbBzFwpePuijZFIq338oi2sH2U="; + cargoHash = "sha256-RP4/bcKA+5tjBFkR6DGNUPLpi/1fZAsRZeLMRSg1aes="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/treefmt/default.nix b/pkgs/development/tools/treefmt/default.nix index 221c9847cba8..2567afc4082b 100644 --- a/pkgs/development/tools/treefmt/default.nix +++ b/pkgs/development/tools/treefmt/default.nix @@ -1,16 +1,16 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "treefmt"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "numtide"; repo = "treefmt"; rev = "v${version}"; - hash = "sha256-v+hXWyrY0GfSgXeqgYLgoOmeiHsZyhRO9Fmj5rPiNJ8="; + hash = "sha256-PALt0tSCYbViC1RHrri0IiD4TUjMnkIwgd3Pe+K9i3Q="; }; - cargoSha256 = "sha256-/WyaZxRFYJmz/qRp2s2v8swdwAtuNR7KXND20IzQoy8="; + cargoSha256 = "sha256-MkjLAaktc0A0yJqixpgnrn8NOHVmcaQL65L0TvrEPRg="; meta = { description = "one CLI to format the code tree"; diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index f068c3e8d5f8..9e201961f1d3 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -3,6 +3,8 @@ , callPackage , fetchFromGitHub , rustPlatform +, cmake +, protobuf , installShellFiles , libiconv , darwin @@ -11,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.36.0"; + version = "1.37.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - hash = "sha256-PV0Q/OtO4AkY3NMwIQIwU0DCkFqXifJFuHb+Q3rIQLI="; + hash = "sha256-ZfICDkW6q4OLvpSZnRpa6i324OuLNuOHXuSOQ7/aUJ8="; }; - cargoHash = "sha256-w0Wr/mwn4Hdfxr7eBdZtpj3MbsMHDwAK2F7XaYEaMCk="; + cargoHash = "sha256-n+6Hz9Q20vq1Bf/Ny7I3IpGbkEECjjBG8xHN1v0z0Pw="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds @@ -28,7 +30,15 @@ rustPlatform.buildRustPackage rec { substituteInPlace .cargo/config.toml --replace '"-C", "link-arg=-fuse-ld=lld"' "" ''; - nativeBuildInputs = [ installShellFiles ]; + # uses zlib-ng but can't dynamically link yet + # https://github.com/rust-lang/libz-sys/issues/158 + nativeBuildInputs = [ + # required by libz-ng-sys crate + cmake + # required by deno_kv crate + protobuf + installShellFiles + ]; buildInputs = lib.optionals stdenv.isDarwin ( [ libiconv darwin.libobjc ] ++ (with darwin.apple_sdk.frameworks; [ Security CoreServices Metal Foundation QuartzCore ]) diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 6e9fc0a669fd..522fe48a3b4f 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.74.3"; + version = "0.78.0"; shas = { - x86_64-linux = "sha256-8pa8nqA6rbOSBVnp2Q8/IQqh/rfYQU57hMgwU9+iz4A="; - aarch64-linux = "sha256-3kXOV8rlCNbNBdXgOtd3S94qO+JIKyOByA4WGX+XVP0="; - x86_64-darwin = "sha256-iBBVKZiSoo08YEQ8J/Rt1/5b7a+2xjtuS6QL/Wod5nQ="; - aarch64-darwin = "sha256-Djnuc3l/jQKvBf1aej8LG5Ot2wPT0m5Zo1B24l1UHsM="; + x86_64-linux = "sha256-1df7bH3ZdgIasZvvNH3iKQ4lmcGNq6ldgMV9nDgOC14="; + aarch64-linux = "sha256-riSyGvOGwqL1hSAXpUvBju/3DN20THtg0NuIzn1m1M8="; + x86_64-darwin = "sha256-4Nnkrj9GfliYUInb7SssqzFIDbV0XVxdEBC28klqBDM="; + aarch64-darwin = "sha256-oepRKVb05zAUeZo2RN3Vca0CUQ+Fd1duIU3xOG+FEJw="; }; } diff --git a/pkgs/development/web/deno/update/common.ts b/pkgs/development/web/deno/update/common.ts index 1b4e3509ea7c..a31805269cb2 100644 --- a/pkgs/development/web/deno/update/common.ts +++ b/pkgs/development/web/deno/update/common.ts @@ -48,8 +48,8 @@ export const getLatestVersion = (owner: string, repo: string) => export const genValueRegExp = (key: string, regex: RegExp) => new RegExp(`(?<=${key} = ")(${regex.source}|)(?=")`); -export const logger = (name: string) => - (...a: any) => console.log(`[${name}]`, ...a); +export const logger = (name: string) => (...a: any) => + console.log(`[${name}]`, ...a); export const read = Deno.readTextFile; export const write = Deno.writeTextFile; diff --git a/pkgs/development/web/deno/update/librusty_v8.ts b/pkgs/development/web/deno/update/librusty_v8.ts index d9d57d2908db..b38e0a28f1ab 100644 --- a/pkgs/development/web/deno/update/librusty_v8.ts +++ b/pkgs/development/web/deno/update/librusty_v8.ts @@ -1,11 +1,5 @@ -import * as toml from "https://deno.land/std@0.148.0/encoding/toml.ts"; -import { - getExistingVersion, - logger, - run, - write, -} from "./common.ts"; - +import * as toml from "https://deno.land/std@0.202.0/toml/mod.ts"; +import { getExistingVersion, logger, run, write } from "./common.ts"; const log = logger("librusty_v8"); @@ -18,14 +12,14 @@ interface PrefetchResult { sha256: string; } -const getLibrustyV8Version = async ( +const getCargoLock = async ( owner: string, repo: string, version: string, ) => - fetch(`https://github.com/${owner}/${repo}/raw/${version}/Cargo.toml`) + fetch(`https://github.com/${owner}/${repo}/raw/${version}/Cargo.lock`) .then((res) => res.text()) - .then((txt) => toml.parse(txt).workspace.dependencies.v8.version); + .then((txt) => toml.parse(txt)); const fetchArchShaTasks = (version: string, arches: Architecture[]) => arches.map( @@ -74,7 +68,10 @@ export async function updateLibrustyV8( ) { log("Starting librusty_v8 update"); // 0.0.0 - const version = await getLibrustyV8Version(owner, repo, denoVersion); + const cargoLockData = await getCargoLock(owner, repo, denoVersion); + console.log(cargoLockData); + const packageItem = cargoLockData.package.find(({ name }) => name === "v8"); + const version = packageItem.version; if (typeof version !== "string") { throw "no librusty_v8 version"; } diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index 749358f5e464..a4c83d32a343 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "20.7.0"; - sha256 = "sha256-P8/c0FxGFRdIBZZZZnTfhbNc/OWX3QrjP1QW/E3xK+o="; + version = "20.8.0"; + sha256 = "sha256-QSvoR65t9hAQup2jzD5r5bZ6oALjVOkZ9Z7INgNxcEw="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch diff --git a/pkgs/games/boohu/default.nix b/pkgs/games/boohu/default.nix index 6b3c0e04f982..708d8d7510bc 100644 --- a/pkgs/games/boohu/default.nix +++ b/pkgs/games/boohu/default.nix @@ -1,20 +1,17 @@ -{lib, fetchurl, buildGoPackage}: - -buildGoPackage rec { +{ lib, fetchurl, buildGoModule }: +buildGoModule rec { pname = "boohu"; - version = "0.13.0"; - - goPackagePath = "git.tuxfamily.org/boohu/boohu.git"; + version = "0.14.0"; src = fetchurl { - url = "https://download.tuxfamily.org/boohu/downloads/${pname}-${version}.tar.gz"; - sha256 = "0q89yv4klldjpli6y9xpyr6k8nsn7qa68gp90vb3dgxynn91sh68"; + url = "https://download.tuxfamily.org/boohu/downloads/boohu-${version}.tar.gz"; + hash = "sha256-IB59C5/uuHP6LtKLypjpgHOo0MR9bFdCbudaRa+h7lI="; }; - goDeps = ./deps.nix; + vendorHash = "sha256-AVK4zE/Hs9SN8Qj2WYj/am2B0R74QKYoMNf3sRRjnU4="; - postInstall = "mv $out/bin/boohu.git $out/bin/boohu"; + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "A new coffee-break roguelike game"; @@ -27,6 +24,6 @@ buildGoPackage rec { homepage = "https://download.tuxfamily.org/boohu/index.html"; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; []; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/games/boohu/deps.nix b/pkgs/games/boohu/deps.nix deleted file mode 100644 index c2dc3b41b973..000000000000 --- a/pkgs/games/boohu/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "github.com/nsf/termbox-go"; - fetch = { - type = "git"; - url = "https://github.com/nsf/termbox-go"; - rev = "93860e16131719fa9722e7c448dbf8c0e3210a0d"; - sha256 = "03hz060cy8qrl4kgr80pbq6xvr38z4c6ghr3y81i8g854rvp6426"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "f93a0d58d5fd95e53f82782d07bb0c79d23e1290"; - sha256 = "1sq97q71vgwnbg1fphsmqrzkbfn6mjal6d8a3qgwv4nbgppwaz25"; - }; - } -] diff --git a/pkgs/games/doom-ports/doomretro/default.nix b/pkgs/games/doom-ports/doomretro/default.nix index c584f64b5d3e..e5deb16f1e36 100644 --- a/pkgs/games/doom-ports/doomretro/default.nix +++ b/pkgs/games/doom-ports/doomretro/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doomretro"; - version = "4.9.2"; + version = "5.0.3"; src = fetchFromGitHub { owner = "bradharding"; repo = "doomretro"; rev = "v${finalAttrs.version}"; - hash = "sha256-thH18+Og5kSiMdzgPdGyUwBchpjpd9xfFfUlUQMAl1A="; + hash = "sha256-jZBgPXg9vQ8HxO/D0GzEiI/78OEW6LgxVIqxdqw63Ko="; }; nativeBuildInputs = [ diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index bf378cd188de..5902579b73b1 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -6,11 +6,13 @@ stdenv.mkDerivation rec { pname = "sgt-puzzles"; - version = "20220913.27dd36e"; + # To find the latest version: + # $ curl -s -i 'https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles.tar.gz' | grep Location + version = "20230918.2d9e414"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - hash = "sha256-fj1XWuXcW01uuC5dK2wDIrweyruSRdfEZBfmEj99zZE="; + hash = "sha256-YsvJ/5DTevRb+sCxWc/KcD2X5IXwAXvWGVfokr06nUM="; }; sgt-puzzles-menu = fetchurl { diff --git a/pkgs/misc/flashfocus/default.nix b/pkgs/misc/flashfocus/default.nix index 2f673a347de4..753f82f6bd44 100644 --- a/pkgs/misc/flashfocus/default.nix +++ b/pkgs/misc/flashfocus/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "flashfocus"; - version = "2.4.0"; + version = "2.4.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TKqPUJq3t2EjX6sY3NSuW0sCq4IS4PNMaaFNe+5hvoY="; + sha256 = "sha256-O6jRQ6e96b8CuumTD6TGELaz26No7WFZgGSnNSlqzuE="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix index 07705f568a1d..0e615c9e7539 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alsa-utils"; - version = "1.2.9"; + version = "1.2.10"; src = fetchurl { url = "mirror://alsa/utils/${pname}-${version}.tar.bz2"; - sha256 = "sha256-52I9RSVZX5LhHOJe6al/IEChTG5NzQJ6qW4Gy854F70="; + sha256 = "sha256-EEti7H8Cp84WynefSBVhbfHMIZM1A3g6kQe1lE+DBjo="; }; nativeBuildInputs = [ gettext makeWrapper ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index a938a98f2417..0d38016d9d73 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -88,7 +88,7 @@ , withAnalyze ? true , withApparmor ? true , withAudit ? true -, withBootloader ? true # compiles systemd-boot, assumes EFI is available. +, withBootloader ? !stdenv.hostPlatform.isMusl # compiles systemd-boot, assumes EFI is available. , withCompression ? true # adds bzip2, lz4, xz and zstd , withCoredump ? true , withCryptsetup ? true @@ -204,8 +204,8 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional stdenv.hostPlatform.isMusl ( let oe-core = fetchzip { - url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-f34f6ab04b443608497b73668365819343d0c2fe.tar.gz"; - sha256 = "DFcLPvjQIxGEDADpP232ZRd7cOEKt6B48Ah29nIGTt4="; + url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-eb8a86fee9eeae787cc0a58ef2ed087fd48d93eb.tar.gz"; + sha256 = "tE2KpXLvOknIpEZFdOnNxvBmDvZrra3kvQp9tKxa51c="; }; musl-patches = oe-core + "/meta/recipes-core/systemd/systemd"; in @@ -213,7 +213,6 @@ stdenv.mkDerivation (finalAttrs: { (musl-patches + "/0001-Adjust-for-musl-headers.patch") (musl-patches + "/0005-pass-correct-parameters-to-getdents64.patch") (musl-patches + "/0006-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch") - (musl-patches + "/0007-Add-sys-stat.h-for-S_IFDIR.patch") (musl-patches + "/0009-missing_type.h-add-comparison_fn_t.patch") (musl-patches + "/0010-add-fallback-parse_printf_format-implementation.patch") (musl-patches + "/0011-src-basic-missing.h-check-for-missing-strndupa.patch") @@ -229,7 +228,8 @@ stdenv.mkDerivation (finalAttrs: { (musl-patches + "/0022-Handle-__cpu_mask-usage.patch") (musl-patches + "/0023-Handle-missing-gshadow.patch") (musl-patches + "/0024-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch") - (musl-patches + "/0026-src-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch") + (musl-patches + "/0028-sd-event-Make-malloc_trim-conditional-on-glibc.patch") + (musl-patches + "/0029-shared-Do-not-use-malloc_info-on-musl.patch") ] ); @@ -724,7 +724,7 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/NixOS/nixpkgs/issues/169693 # The hack is to move EFI file out of lib/ before doStrip # run and return it after doStrip run. - preFixup = lib.optionalString withEfi '' + preFixup = lib.optionalString withBootloader '' mv $out/lib/systemd/boot/efi $out/dont-strip-me ''; @@ -734,7 +734,7 @@ stdenv.mkDerivation (finalAttrs: { # This needs to be in LD_LIBRARY_PATH because rpath on a binary is not propagated to libraries using dlopen, in this case `libcryptsetup.so` wrapProgram $out/$f --prefix LD_LIBRARY_PATH : ${placeholder "out"}/lib/cryptsetup done - '' + lib.optionalString withEfi '' + '' + lib.optionalString withBootloader '' mv $out/dont-strip-me $out/lib/systemd/boot/efi '' + lib.optionalString withUkify '' # To cross compile a derivation that builds a UKI with ukify, we need to wrap diff --git a/pkgs/os-specific/linux/zfs/stable.nix b/pkgs/os-specific/linux/zfs/stable.nix index 14cda12e6f32..1a77396300eb 100644 --- a/pkgs/os-specific/linux/zfs/stable.nix +++ b/pkgs/os-specific/linux/zfs/stable.nix @@ -14,10 +14,13 @@ callPackage ./generic.nix args { # check the release notes for compatible kernels kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM - then kernel.kernelOlder "6.4" + then kernel.kernelOlder "6.6" else kernel.kernelOlder "6.2"; - latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_1; + latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM + then linuxKernel.packages.linux_6_5 + else linuxKernel.packages.linux_6_1; extraPatches = [ + # applied in version 2.2.x (fetchpatch { name = "musl.patch"; url = "https://github.com/openzfs/zfs/commit/1f19826c9ac85835cbde61a7439d9d1fefe43a4a.patch"; @@ -26,7 +29,7 @@ callPackage ./generic.nix args { ]; # this package should point to the latest release. - version = "2.1.12"; + version = "2.1.13"; - sha256 = "eYUR5d4gpTrlFu6j1uL83DWL9uPGgAUDRdSEb73V5i4="; + sha256 = "tqUCn/Hf/eEmyWRQthWQdmTJK2sDspnHiiEfn9rz2Kc="; } diff --git a/pkgs/servers/etcd/3.3.nix b/pkgs/servers/etcd/3.3.nix deleted file mode 100644 index edea448ee84e..000000000000 --- a/pkgs/servers/etcd/3.3.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub, stdenv }: - -buildGoPackage rec { - pname = "etcd"; - version = "3.3.27"; - - goPackagePath = "github.com/coreos/etcd"; - - src = fetchFromGitHub { - owner = "etcd-io"; - repo = "etcd"; - rev = "v${version}"; - sha256 = "sha256-zO+gwzaTgeFHhlkY/3AvRTEA4Yltlp+NqdlDe4dLJYg="; - }; - - buildPhase = '' - cd go/src/${goPackagePath} - patchShebangs . - ./build - ./functional/build - ''; - - installPhase = '' - install -Dm755 bin/* bin/functional/cmd/* -t $out/bin - ''; - - meta = with lib; { - description = "Distributed reliable key-value store for the most critical data of a distributed system"; - license = licenses.asl20; - homepage = "https://etcd.io/"; - maintainers = with maintainers; [ offline ]; - broken = stdenv.isDarwin; # outdated golang.org/x/sys - knownVulnerabilities = [ "CVE-2023-32082" ]; - }; -} diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 63f965553672..3f6567b09f0c 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.91.0"; + version = "0.92.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - hash = "sha256-Hd9q95CP/fHYsNLVACM1JhAVy7s/WX6yo7PJNxAHQVI="; + hash = "sha256-YmzizpcAfE4+Rfq5ydQnDQBo4R+pAyudfi+fqD9EZP0="; # 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-i+VmJJurKO9QR7xnn2ePu8Ch/6vk/U0gnWGKMmfANt8="; + vendorHash = "sha256-siOZWhHqNokkYAPwuXQCs4T1yBiEWUTJzhfbH/Z2uBk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix index e64d2b457ba9..e42ca26cfb08 100644 --- a/pkgs/tools/graphics/mangohud/default.nix +++ b/pkgs/tools/graphics/mangohud/default.nix @@ -3,7 +3,6 @@ , fetchFromGitLab , fetchFromGitHub , fetchurl -, fetchpatch , substituteAll , coreutils , curl @@ -16,6 +15,7 @@ , mangohud32 , addOpenGLRunpath , appstream +, git , glslang , mako , meson @@ -31,13 +31,13 @@ , glfw , xorg , gamescopeSupport ? true # build mangoapp and mangohudctl -, lowerBitnessSupport ? stdenv.hostPlatform.is64bit # Support 32 bit on 64bit +, lowerBitnessSupport ? stdenv.hostPlatform.isx86_64 # Support 32 bit on 64bit , nix-update-script }: let # Derived from subprojects/cmocka.wrap - cmocka = rec { + cmocka = { version = "1.81"; src = fetchFromGitLab { owner = "cmocka"; @@ -79,14 +79,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mangohud"; - version = "0.6.9-1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "flightlessmango"; repo = "MangoHud"; rev = "refs/tags/v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-AX4m1XZ+yXp74E3slFGyI3CGu2eYU+eXNN2EY+ivdfk="; + hash = "sha256-KkMN7A3AcS/v+b9GCs0pI6MBBk3WwOMciaoiBzL5xOQ="; }; outputs = [ "out" "doc" "man" ]; @@ -124,13 +124,6 @@ stdenv.mkDerivation (finalAttrs: { libdbus = dbus.lib; inherit hwdata; }) - - # Pull gcc-13 build fix for nissing - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/flightlessmango/MangoHud/commit/3f8f036ee8773ae1af23dd0848b6ab487b5ac7de.patch"; - hash = "sha256-qbNywAXAStGiVZ1LA5qZyNp4n28iNUuE4N69zXv2gmM="; - }) ]; postPatch = '' @@ -140,6 +133,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals lowerBitnessSupport [ mangohud32 ])} \ + --subst-var-by version "${finalAttrs.version}" \ --subst-var-by dataDir ${placeholder "out"}/share ( @@ -161,6 +155,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ addOpenGLRunpath + git glslang mako meson diff --git a/pkgs/tools/graphics/mangohud/preload-nix-workaround.patch b/pkgs/tools/graphics/mangohud/preload-nix-workaround.patch index e360d8c1876a..f38e1703973d 100644 --- a/pkgs/tools/graphics/mangohud/preload-nix-workaround.patch +++ b/pkgs/tools/graphics/mangohud/preload-nix-workaround.patch @@ -1,24 +1,24 @@ diff --git a/bin/mangohud.in b/bin/mangohud.in -index f975224..24936eb 100755 +index 6c3c6e8..8847cdc 100755 --- a/bin/mangohud.in +++ b/bin/mangohud.in -@@ -8,16 +8,18 @@ if [ "$#" -eq 0 ]; then +@@ -8,10 +8,10 @@ if [ "$#" -eq 0 ]; then exit 1 fi --MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud.so" -+MANGOHUD_LIB_NAME="libMangoHud.so" +-MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud_opengl.so" ++MANGOHUD_LIB_NAME="libMangoHud_opengl.so" if [ "$1" = "--dlsym" ]; then - MANGOHUD_DLSYM=1 - MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}" + MANGOHUD_LIB_NAME="libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}" shift fi - # Preload using the plain filenames of the libs, the dynamic linker will - # figure out whether the 32 or 64 bit version should be used - LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}${MANGOHUD_LIB_NAME}" +@@ -31,5 +31,7 @@ case ":${LD_PRELOAD-}:" in + LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}${MANGOHUD_LIB_NAME}" + esac + +LD_LIBRARY_PATH="@libraryPath@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" +XDG_DATA_DIRS="@dataDir@${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}" diff --git a/pkgs/tools/graphics/plotutils/c++17-register-usage-fix.patch b/pkgs/tools/graphics/plotutils/c++17-register-usage-fix.patch new file mode 100644 index 000000000000..c83409221ac2 --- /dev/null +++ b/pkgs/tools/graphics/plotutils/c++17-register-usage-fix.patch @@ -0,0 +1,44 @@ +diff -ur a/pic2plot/gram.cc b/pic2plot/gram.cc +--- a/pic2plot/gram.cc 2000-06-28 00:23:21.000000000 -0400 ++++ b/pic2plot/gram.cc 2023-09-07 22:59:47.004460065 -0400 +@@ -1229,9 +1229,9 @@ + char *from; + unsigned int count; + { +- register char *f = from; +- register char *t = to; +- register int i = count; ++ char *f = from; ++ char *t = to; ++ int i = count; + + while (i-- > 0) + *t++ = *f++; +@@ -1244,9 +1244,9 @@ + static void + __yy_memcpy (char *to, char *from, unsigned int count) + { +- register char *t = to; +- register char *f = from; +- register int i = count; ++ char *t = to; ++ char *f = from; ++ int i = count; + + while (i-- > 0) + *t++ = *f++; +@@ -1289,10 +1289,10 @@ + yyparse(YYPARSE_PARAM_ARG) + YYPARSE_PARAM_DECL + { +- register int yystate; +- register int yyn; +- register short *yyssp; +- register YYSTYPE *yyvsp; ++ int yystate; ++ int yyn; ++ short *yyssp; ++ YYSTYPE *yyvsp; + int yyerrstatus; /* number of tokens to shift before error messages enabled */ + int yychar1 = 0; /* lookahead token as an internal (translated) token number */ + diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix index 57cfe988b0b7..29b4c4b35fe9 100644 --- a/pkgs/tools/graphics/plotutils/default.nix +++ b/pkgs/tools/graphics/plotutils/default.nix @@ -16,7 +16,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libpng ]; - patches = map fetchurl (import ./debian-patches.nix); + patches = map fetchurl (import ./debian-patches.nix) + # `pic2plot/gram.cc` uses the register storage class specifier, which is not supported in C++17. + # This prevents clang 16 from building plotutils because it defaults to C++17. + ++ [ ./c++17-register-usage-fix.patch ]; preBuild = '' # Fix parallel building. diff --git a/pkgs/tools/misc/domine/default.nix b/pkgs/tools/misc/domine/default.nix new file mode 100644 index 000000000000..cd62b9bd1a74 --- /dev/null +++ b/pkgs/tools/misc/domine/default.nix @@ -0,0 +1,17 @@ +{ buildDartApplication, fetchFromGitHub, lib }: + +buildDartApplication rec { + pname = "domine"; + version = "nightly-2023-08-10"; + + src = fetchFromGitHub { + owner = "breitburg"; + repo = pname; + rev = "d99d02b014d009b0201380a21ddaa57696dc77af"; + sha256 = "038yfa22q7lzz85czmny3c1lkv8mjv4pq62cbmh054fqvgf3k3s4"; + }; + + pubspecLockFile = ./pubspec.lock; + + vendorHash = "16z3paq1nxlnzs20qlljnwa2ff6xfhdqzcq8d8izkl7w1j4hyxgn"; +} diff --git a/pkgs/tools/misc/domine/pubspec.lock b/pkgs/tools/misc/domine/pubspec.lock new file mode 100644 index 000000000000..56a35ef14548 --- /dev/null +++ b/pkgs/tools/misc/domine/pubspec.lock @@ -0,0 +1,157 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + args: + dependency: "direct main" + description: + name: args + sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + url: "https://pub.dev" + source: hosted + version: "2.4.2" + async: + dependency: transitive + description: + name: async + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" + source: hosted + version: "2.11.0" + collection: + dependency: transitive + description: + name: collection + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + url: "https://pub.dev" + source: hosted + version: "1.17.2" + dart_openai: + dependency: "direct main" + description: + name: dart_openai + sha256: "707f6975454513f4a6197125b5a0fbe92ab7cbe4b8ea9111e529a09d7a3ce0c3" + url: "https://pub.dev" + source: hosted + version: "4.0.0" + dio: + dependency: "direct main" + description: + name: dio + sha256: ce75a1b40947fea0a0e16ce73337122a86762e38b982e1ccb909daa3b9bc4197 + url: "https://pub.dev" + source: hosted + version: "5.3.2" + dio_smart_retry: + dependency: "direct main" + description: + name: dio_smart_retry + sha256: "1a2d0cf73ab56bf5998b375cda2d51f45c77268e712e4073f232cdc7753a94b2" + url: "https://pub.dev" + source: hosted + version: "5.0.0" + fetch_api: + dependency: transitive + description: + name: fetch_api + sha256: "7896632eda5af40c4459d673ad601df21d4c3ae6a45997e300a92ca63ec9fe4c" + url: "https://pub.dev" + source: hosted + version: "1.0.1" + fetch_client: + dependency: transitive + description: + name: fetch_client + sha256: "83c07b07a63526a43630572c72715707ca113a8aa3459efbc7b2d366b79402af" + url: "https://pub.dev" + source: hosted + version: "1.0.2" + http: + dependency: transitive + description: + name: http + sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + http_parser: + dependency: transitive + description: + name: http_parser + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" + source: hosted + version: "4.0.2" + js: + dependency: transitive + description: + name: js + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + url: "https://pub.dev" + source: hosted + version: "0.6.7" + lints: + dependency: "direct dev" + description: + name: lints + sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + meta: + dependency: transitive + description: + name: meta + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + url: "https://pub.dev" + source: hosted + version: "1.9.1" + path: + dependency: transitive + description: + name: path + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + url: "https://pub.dev" + source: hosted + version: "1.8.3" + source_span: + dependency: transitive + description: + name: source_span + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" + source: hosted + version: "1.10.0" + string_scanner: + dependency: transitive + description: + name: string_scanner + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" + source: hosted + version: "1.2.0" + term_glyph: + dependency: transitive + description: + name: term_glyph + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" + source: hosted + version: "1.2.1" + tint: + dependency: "direct main" + description: + name: tint + sha256: "9652d9a589f4536d5e392cf790263d120474f15da3cf1bee7f1fdb31b4de5f46" + url: "https://pub.dev" + source: hosted + version: "2.0.1" + typed_data: + dependency: transitive + description: + name: typed_data + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + url: "https://pub.dev" + source: hosted + version: "1.3.2" +sdks: + dart: ">=3.0.6 <4.0.0" diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix index 01a283b09680..ec441ec0264f 100644 --- a/pkgs/tools/misc/moar/default.nix +++ b/pkgs/tools/misc/moar/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "moar"; - version = "1.16.2"; + version = "1.17.0"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-PknHG0ODrR5YbaZgWdwt/PtNf+q1uyK5KYlrntYZT64="; + hash = "sha256-nLXHAIR+4w6fDR69fSANBqlD0ZTc7emNIv5QTp+pdYo="; }; vendorHash = "sha256-aFCv6VxHD1bOLhCHXhy4ubik8Z9uvU6AeqcMqIZI2Oo="; diff --git a/pkgs/tools/misc/shelldap/default.nix b/pkgs/tools/misc/shelldap/default.nix index c782b1292008..b383c9692a9c 100644 --- a/pkgs/tools/misc/shelldap/default.nix +++ b/pkgs/tools/misc/shelldap/default.nix @@ -1,26 +1,52 @@ -{ lib, fetchurl, perlPackages }: +{ lib +, fetchFromGitHub +, perlPackages +}: + perlPackages.buildPerlPackage rec { pname = "shelldap"; - version = "1.4.0"; - src = fetchurl { - url = "https://bitbucket.org/mahlon/shelldap/downloads/shelldap-${version}.tar.gz"; - sha256 = "07gkvvxcgw3pgkfy8p9mmidakciaq1rsq5zhmdqd8zcwgqkrr24i"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "mahlonsmith"; + repo = "shelldap"; + rev = "refs/tags/v${version}"; + hash = "sha256-67ttAXzu9pfeqjfhMfLMb9vWCXTrE+iUDCbamqswaLg="; }; - buildInputs = with perlPackages; [ perl YAMLSyck perlldap AlgorithmDiff IOSocketSSL AuthenSASL TermReadLineGnu TermShell ]; + + buildInputs = with perlPackages; [ + AlgorithmDiff + AuthenSASL + IOSocketSSL + perl + perlldap + TermReadLineGnu + TermShell + TieIxHash + YAMLSyck + ]; + prePatch = '' touch Makefile.PL ''; + installPhase = '' runHook preInstall install -Dm555 -t $out/bin shelldap runHook preInstall ''; + + # no make target 'test', not tests provided by source + doCheck = false; + outputs = [ "out" ]; + meta = with lib; { - homepage = "https://bitbucket.org/mahlon/shelldap/"; + homepage = "https://github.com/mahlonsmith/shelldap/"; description = "A handy shell-like interface for browsing LDAP servers and editing their content"; + changelog = "https://github.com/mahlonsmith/shelldap/blob/v${version}/CHANGELOG"; license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ tobiasBora ]; - platforms = platforms.linux; + maintainers = with maintainers; [ clerie tobiasBora ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/crowdsec/default.nix b/pkgs/tools/security/crowdsec/default.nix index 10a8291a54d4..9c3dceda96f6 100644 --- a/pkgs/tools/security/crowdsec/default.nix +++ b/pkgs/tools/security/crowdsec/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "crowdsec"; - version = "1.5.2"; + version = "1.5.4"; src = fetchFromGitHub { owner = "crowdsecurity"; repo = pname; rev = "v${version}"; - hash = "sha256-260+XsRn3Mm/zCSvfEcBQ6j715KV4t1Z0CvXdriDzCs="; + hash = "sha256-5VwsuPNoAhCvhKUJDUkXnEVLMqHx2M1Nz11VoBASoxU="; }; - vendorHash = "sha256-Mto0X/LMwWU10cmC2bjzX4lzp9t+nEgsWRP3JGkl++A="; + vendorHash = "sha256-6ODcb7UQPgM5n5RPN4AdkrY3+vlu+GXlUfrlTePywyY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/tlsx/default.nix b/pkgs/tools/security/tlsx/default.nix index 91f21c99710b..10915cad9ecd 100644 --- a/pkgs/tools/security/tlsx/default.nix +++ b/pkgs/tools/security/tlsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tlsx"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-EMTNd5NOvaFbVxv31j3pBU//mWQQpThswCT8bMNx5Qw="; + hash = "sha256-lS/D3p8Q6Zu3/XxwkC77fPS9cXVrUTkDPGd46Y+krbo="; }; - vendorHash = "sha256-5fS10G1YxtyhMZcpaqYy9P6eX/xQABYVZj1HX6WxQxo="; + vendorHash = "sha256-aEsq9LwU/ZWvuZGGzZ4NEvMWFk1m/Sr9LOXiCA/X388="; # Tests require network access doCheck = false; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 792cd4771866..fb9ce6fd6d5a 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "vault"; - version = "1.14.3"; + version = "1.14.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-J8ZHK9zOZIo61xund4VQ46LD609B9zWgCZcD1StEu/Y="; + sha256 = "sha256-E7lEKsbl2L6KhLgAZbemCaTIjbsvl3wg3oCURn/Judc="; }; vendorHash = "sha256-8ytAT7qVXAIfoeMyTBMJ6DiWn74sRM1WrrOYaKTlKMo="; diff --git a/pkgs/tools/system/skeema/default.nix b/pkgs/tools/system/skeema/default.nix index 9918128ee74e..86798155047c 100644 --- a/pkgs/tools/system/skeema/default.nix +++ b/pkgs/tools/system/skeema/default.nix @@ -1,14 +1,14 @@ -{ lib, buildGoModule, fetchFromGitHub, coreutils, runtimeShell, testers, skeema }: +{ lib, buildGoModule, fetchFromGitHub, coreutils, testers, skeema }: buildGoModule rec { pname = "skeema"; - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitHub { owner = "skeema"; repo = "skeema"; rev = "v${version}"; - hash = "sha256-t0UACavJaDorAgxm2gA6FEsMfQ8UQEY/CZbFIFHwfIQ="; + hash = "sha256-BXjcn9oakTvaWPYIsAsjYRwQ1aKhZ4PAV2AkxSVOF/I="; }; vendorHash = null; @@ -25,6 +25,7 @@ buildGoModule rec { "TestParseDirSymlinks" # Flaky tests + "TestCommandTimeout" "TestShellOutTimeout" ]; in @@ -41,13 +42,6 @@ buildGoModule rec { substituteInPlace internal/applier/ddlstatement_test.go \ --replace /bin/echo "${coreutils}/bin/echo" - - substituteInPlace internal/util/shellout_unix_test.go \ - --replace /bin/echo "${coreutils}/bin/echo" \ - --replace /usr/bin/printf "${coreutils}/bin/printf" - - substituteInPlace internal/util/shellout_unix.go \ - --replace /bin/sh "${runtimeShell}" ''; passthru.tests.version = testers.testVersion { diff --git a/pkgs/tools/text/d2/default.nix b/pkgs/tools/text/d2/default.nix index db3cb81dc41d..bca032d6ddf9 100644 --- a/pkgs/tools/text/d2/default.nix +++ b/pkgs/tools/text/d2/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "d2"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "terrastruct"; repo = pname; rev = "v${version}"; - hash = "sha256-MF8RqwoMc48JYgNUJTQKHlGl59xyHOALnFL2BWQAl24="; + hash = "sha256-bp45tkV7f6rGDAmhle/e3cHIqa7nPakANvk4QxetLts="; }; - vendorHash = "sha256-SocBC/1LrdSQNfcNVa9nnPaq/UvLVIghHlUSJB7ImBk="; + vendorHash = "sha256-QMptNFCoJouI555WkA+4TJhaEzQgJJmca3jVpM3neeI="; excludedPackages = [ "./e2etests" ]; @@ -50,6 +50,6 @@ buildGoModule rec { description = "A modern diagram scripting language that turns text to diagrams"; homepage = "https://d2lang.com"; license = licenses.mpl20; - maintainers = with maintainers; [ dit7ya ]; + maintainers = with maintainers; [ dit7ya kashw2 ]; }; } diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix index ca89b7dc2d8a..cbca59bdc6e5 100644 --- a/pkgs/tools/text/platinum-searcher/default.nix +++ b/pkgs/tools/text/platinum-searcher/default.nix @@ -1,20 +1,27 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "the_platinum_searcher"; version = "2.1.5"; - rev = "v${version}"; - - goPackagePath = "github.com/monochromegane/the_platinum_searcher"; src = fetchFromGitHub { - inherit rev; owner = "monochromegane"; repo = "the_platinum_searcher"; - sha256 = "1y7kl3954dimx9hp2bf1vjg1h52hj1v6cm4f5nhrqzwrawp0b6q0"; + rev = "v${version}"; + hash = "sha256-AJsFLleZf5yhLY5UZnaQUBQYntzBLXFh6jU2UtKg8/g="; }; - goDeps = ./deps.nix; + vendorHash = "sha256-GIjPgu0e+duN5MeWcRaF5xUFCkqe2aZJCwGbLUMko08="; + + patches = [ + # Add Go Modules support. See https://github.com/monochromegane/the_platinum_searcher/pull/217. + (fetchpatch { + url = "https://github.com/monochromegane/the_platinum_searcher/pull/217/commits/69064d11c57d5fd5f66ddd95f0e789786183d3c6.patch"; + hash = "sha256-qQ7kZYb2MWSUV6T1frIPT9nMfb20SI7lbG8YhqyQEi8="; + }) + ]; + + ldflags = [ "-s" "-w" ]; meta = with lib; { homepage = "https://github.com/monochromegane/the_platinum_searcher"; diff --git a/pkgs/tools/text/platinum-searcher/deps.nix b/pkgs/tools/text/platinum-searcher/deps.nix deleted file mode 100644 index 04fb9bd4be34..000000000000 --- a/pkgs/tools/text/platinum-searcher/deps.nix +++ /dev/null @@ -1,83 +0,0 @@ -[ - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "a5b47d31c556af34a302ce5d659e6fea44d90de0"; - sha256 = "0v6l48fshdjrqzyq1kwn22gy7vy434xdr1i0lm3prsf6jbln9fam"; - }; - } - { - goPackagePath = "github.com/jessevdk/go-flags"; - fetch = { - type = "git"; - url = "https://github.com/jessevdk/go-flags"; - rev = "4e64e4a4e2552194cf594243e23aa9baf3b4297e"; - sha256 = "02x7f1wm8119s27h4dc3a4aw6shydnpnnkvzwg5xm0snn5kb4zxm"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "99064174e013895bbd9b025c31100bd1d9b590ca"; - sha256 = "058qrar8rvw3wb0ci1mf1axnqq2729cvv9zmdr4ms2nn9s97yiz9"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "a49bea13b776691cb1b49873e5d8df96ec74831a"; - sha256 = "1pcmgf88wml6ca8v63nh3nxsfvpzjv3c4qj2w2wkizbil826g7as"; - }; - } - { - goPackagePath = "github.com/monochromegane/conflag"; - fetch = { - type = "git"; - url = "https://github.com/monochromegane/conflag"; - rev = "6d68c9aa4183844ddc1655481798fe4d90d483e9"; - sha256 = "0csfr5c8d3kbna9sqhzfp2z06wq6mc6ijja1zj2i82kzsq8534wa"; - }; - } - { - goPackagePath = "github.com/monochromegane/go-home"; - fetch = { - type = "git"; - url = "https://github.com/monochromegane/go-home"; - rev = "25d9dda593924a11ea52e4ffbc8abdb0dbe96401"; - sha256 = "172chakrj22xfm0bcda4qj5zqf7lwr53pzwc3xj6wz8vd2bcxkww"; - }; - } - { - goPackagePath = "github.com/monochromegane/terminal"; - fetch = { - type = "git"; - url = "https://github.com/monochromegane/terminal"; - rev = "2da212063ce19aed90ee5bbb00ad1ad7393d7f48"; - sha256 = "1rddaq9pk5q57ildms35iihghqk505gb349pb0f6k3svchay38nh"; - }; - } - { - goPackagePath = "github.com/monochromegane/go-gitignore"; - fetch = { - type = "git"; - url = "https://github.com/monochromegane/go-gitignore"; - rev = "38717d0a108ca0e5af632cd6845ca77d45b50729"; - sha256 = "0r1inabpgg6sn6i47b02hcmd2p4dc1ab1mcy20mn1b2k3mpdj4b7"; - }; - } - { - goPackagePath = "github.com/shiena/ansicolor"; - fetch = { - type = "git"; - url = "https://github.com/shiena/ansicolor"; - rev = "a422bbe96644373c5753384a59d678f7d261ff10"; - sha256 = "1dcn8a9z6a5dxa2m3fkppnajcls8lanbl38qggkf646yi5qsk1hc"; - }; - } -] diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ab476185df7c..c6af6c2c250b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -496,6 +496,7 @@ mapAliases ({ erlang_23 = throw "erlangR23 has been removed in favor of newer versions."; # added 2023-09-11 erlangR23 = erlang_23; esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # Added 2021-04-12 + etcd_3_3 = throw "etcd_3_3 has been removed because upstream no longer maintains it"; # Added 2023-09-29 etcdctl = throw "'etcdctl' has been renamed to/replaced by 'etcd'"; # Converted to throw 2022-02-22 eterm = throw "eterm was removed because it is still insecure: https://github.com/mej/Eterm/issues/7"; # Added 2023-09-10 eteroj.lv2 = throw "'eteroj.lv2' has been renamed to/replaced by 'open-music-kontrollers.eteroj'"; # Added 2022-03-09 @@ -687,11 +688,9 @@ mapAliases ({ gpgstats = throw "gpgstats has been removed: upstream is gone"; # Added 2022-02-06 gpshell = throw "gpshell has been removed, because it was unmaintained in nixpkgs"; # added 2021-12-17 - graalvm11 = graalvm11-ce; - graalvm8-ce = throw "graalvm8-ce has been removed by upstream"; # Added 2021-10-19 - graalvm8 = throw "graalvm8-ce has been removed by upstream"; # Added 2021-10-19 - graalvm8-ee = throw "graalvm8-ee has been removed because it is unmaintained"; # Added 2022-04-15 - graalvm11-ee = throw "graalvm11-ee has been removed because it is unmaintained"; # Added 2022-04-15 + graalvm11-ce = throw "graalvm11-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 + graalvm17-ce = throw "graalvm17-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 + graalvm19-ce = throw "graalvm19-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 gradio = throw "gradio has been removed because it is unmaintained, use shortwave instead"; # Added 2022-06-03 gradle_4 = throw "gradle_4 has been removed because it's no longer being updated"; # Added 2023-01-17 gradle_5 = throw "gradle_5 has been removed because it's no longer being updated"; # Added 2023-01-17 @@ -1849,6 +1848,7 @@ mapAliases ({ urxvt_vtwheel = rxvt-unicode-plugins.vtwheel; # Added 2020-02-02 usb_modeswitch = throw "'usb_modeswitch' has been renamed to/replaced by 'usb-modeswitch'"; # Converted to throw 2022-02-22 usbguard-nox = throw "'usbguard-nox' has been renamed to/replaced by 'usbguard'"; # Converted to throw 2023-09-10 + utahfs = throw "utahfs has been removed, as it is broken and lack of maintenance from upstream"; # Added 2023-09-29 util-linuxCurses = util-linux; # Added 2022-04-12 utillinux = util-linux; # Added 2020-11-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4bd4110d378..aa17ee1d6921 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -603,6 +603,8 @@ with pkgs; documenso = callPackage ../applications/office/documenso { }; + domine = callPackage ../tools/misc/domine { }; + dsq = callPackage ../tools/misc/dsq { }; dt = callPackage ../tools/text/dt { }; @@ -7830,8 +7832,6 @@ with pkgs; vt-cli = callPackage ../tools/security/vt-cli { }; - utahfs = callPackage ../applications/networking/utahfs { }; - wakeonlan = callPackage ../tools/networking/wakeonlan { }; wallutils = callPackage ../tools/graphics/wallutils { }; @@ -8041,10 +8041,6 @@ with pkgs; expliot = callPackage ../tools/security/expliot { }; - eza = callPackage ../tools/misc/eza { - inherit (darwin.apple_sdk.frameworks) Security; - }; - f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { }; Fabric = with python3Packages; toPythonApplication fabric; @@ -8638,7 +8634,7 @@ with pkgs; }; dapl-native = callPackage ../development/interpreters/dzaima-apl { buildNativeImage = true; - jdk = graalvm11-ce; + jdk = graalvm-ce; }; gnucap = callPackage ../applications/science/electronics/gnucap { }; @@ -9378,6 +9374,8 @@ with pkgs; incron = callPackage ../tools/system/incron { }; + indexed-bzip2 = with python3Packages; toPythonApplication indexed-bzip2; + industrializer = callPackage ../applications/audio/industrializer { }; inetutils = callPackage ../tools/networking/inetutils { }; @@ -12552,6 +12550,8 @@ with pkgs; ramfetch = callPackage ../tools/misc/ramfetch { }; + rapidgzip = with python3Packages; toPythonApplication rapidgzip; + rar = callPackage ../tools/archivers/rar { }; rarcrack = callPackage ../tools/security/rarcrack { }; @@ -12560,6 +12560,8 @@ with pkgs; ratman = callPackage ../tools/networking/ratman { }; + ratarmount = with python3Packages; toPythonApplication ratarmount; + ratools = callPackage ../tools/networking/ratools { }; ratt = callPackage ../applications/misc/ratt { }; @@ -16475,10 +16477,7 @@ with pkgs; graalvmCEPackages = recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition { }); - graalvm-ce = graalvm11-ce; - graalvm11-ce = graalvmCEPackages.graalvm11-ce; - graalvm17-ce = graalvmCEPackages.graalvm17-ce; - graalvm19-ce = graalvmCEPackages.graalvm19-ce; + graalvm-ce = graalvmCEPackages.graalvm-ce; buildGraalvmNativeImage = (callPackage ../build-support/build-graalvm-native-image { graalvmDrv = graalvm-ce; }).override; @@ -17766,7 +17765,7 @@ with pkgs; }; dbqn-native = callPackage ../development/interpreters/bqn/dzaima-bqn { buildNativeImage = true; - jdk = graalvm11-ce; + jdk = graalvm-ce; }; chibi = callPackage ../development/interpreters/chibi { }; @@ -24200,7 +24199,7 @@ with pkgs; nanomq = callPackage ../servers/mqtt/nanomq { }; - mps = callPackage ../development/libraries/mps { stdenv = gcc10StdenvCompat; }; + mps = callPackage ../development/libraries/mps { }; libmpeg2 = callPackage ../development/libraries/libmpeg2 { }; @@ -26213,17 +26212,17 @@ with pkgs; pkg = callPackage ../development/compilers/sbcl/bootstrap.nix {}; faslExt = "fasl"; }; - sbcl_2_3_7 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.7"; }; - faslExt = "fasl"; - flags = [ "--dynamic-space-size" "3000" ]; - }; sbcl_2_3_8 = wrapLisp { pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.8"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_3_8; + sbcl_2_3_9 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.9"; }; + faslExt = "fasl"; + flags = [ "--dynamic-space-size" "3000" ]; + }; + sbcl = sbcl_2_3_9; sbclPackages = recurseIntoAttrs sbcl.pkgs; @@ -26252,13 +26251,13 @@ with pkgs; ### DEVELOPMENT / R MODULES - R = callPackage ../applications/science/math/R { + R = darwin.apple_sdk_11_0.callPackage ../applications/science/math/R { # TODO: split docs into a separate output texLive = texlive.combine { inherit (texlive) scheme-small inconsolata helvetic texinfo fancyvrb cm-super rsfs; }; withRecommendedPackages = false; - inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; + inherit (darwin.apple_sdk_11_0.frameworks) Cocoa Foundation; inherit (darwin) libobjc; }; @@ -26526,7 +26525,6 @@ with pkgs; ergochat = callPackage ../servers/irc/ergochat { }; etcd = etcd_3_5; - etcd_3_3 = callPackage ../servers/etcd/3.3.nix { }; etcd_3_4 = callPackage ../servers/etcd/3.4.nix { }; etcd_3_5 = callPackage ../servers/etcd/3.5.nix { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b68974cf834e..b626ae261b2d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -22127,7 +22127,7 @@ with self; { }; buildInputs = [ LWP ModuleBuildTiny TestRequires TestTCP ]; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - propagatedBuildInputs = [ DataDump HTTPParserXS NetServer Plack NetServerSSPrefork ]; + propagatedBuildInputs = [ DataDump HTTPParserXS NetServer Plack NetServerSSPrefork IOSocketINET6 ]; postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/starman ''; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d93a54c67c00..fdf90d36ba3d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2257,6 +2257,8 @@ self: super: with self; { contourpy = callPackage ../development/python-modules/contourpy { }; + controku = callPackage ../development/python-modules/controku { }; + convertdate = callPackage ../development/python-modules/convertdate { }; cookiecutter = callPackage ../development/python-modules/cookiecutter { }; @@ -4080,6 +4082,8 @@ self: super: with self; { inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL; }; + oelint-parser = callPackage ../development/python-modules/oelint-parser { }; + openllm = callPackage ../development/python-modules/openllm { }; openllm-client = callPackage ../development/python-modules/openllm-client { }; @@ -5250,6 +5254,12 @@ self: super: with self; { incremental = callPackage ../development/python-modules/incremental { }; + indexed-bzip2 = callPackage ../development/python-modules/indexed-bzip2 { }; + + indexed-gzip = callPackage ../development/python-modules/indexed-gzip { inherit (pkgs) zlib; }; + + indexed-zstd = callPackage ../development/python-modules/indexed-zstd { inherit (pkgs) zstd; }; + infinity = callPackage ../development/python-modules/infinity { }; inflect = callPackage ../development/python-modules/inflect { }; @@ -10764,6 +10774,8 @@ self: super: with self; { python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { }; + python-xz = callPackage ../development/python-modules/python-xz { }; + python-zbar = callPackage ../development/python-modules/python-zbar { }; pythran = callPackage ../development/python-modules/pythran { @@ -11150,6 +11162,8 @@ self: super: with self; { rapidfuzz-capi = callPackage ../development/python-modules/rapidfuzz-capi { }; + rapidgzip = callPackage ../development/python-modules/rapidgzip { inherit (pkgs) nasm; }; + rapt-ble = callPackage ../development/python-modules/rapt-ble { }; rarfile = callPackage ../development/python-modules/rarfile { @@ -11158,6 +11172,10 @@ self: super: with self; { rasterio = callPackage ../development/python-modules/rasterio { }; + ratarmountcore = callPackage ../development/python-modules/ratarmountcore { inherit (pkgs) zstd; }; + + ratarmount = callPackage ../development/python-modules/ratarmount { }; + ratelim = callPackage ../development/python-modules/ratelim { }; ratelimit = callPackage ../development/python-modules/ratelimit { }; @@ -12471,6 +12489,8 @@ self: super: with self; { ssdp = callPackage ../development/python-modules/ssdp { }; + ssdpy = callPackage ../development/python-modules/ssdpy { }; + sseclient = callPackage ../development/python-modules/sseclient { }; sseclient-py = callPackage ../development/python-modules/sseclient-py { };