diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 413061ab2dfa..4459836b0219 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -25070,6 +25070,12 @@ github = "stasjok"; githubId = 1353637; }; + staslyakhov = { + name = "Stas Lyakhov"; + email = "nix@lyakhovs.dev"; + github = "staslyakhov"; + githubId = 19846456; + }; staticdev = { email = "staticdev-support@proton.me"; github = "staticdev"; diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix index d0672c792bf8..571f723a823f 100644 --- a/nixos/modules/config/console.nix +++ b/nixos/modules/config/console.nix @@ -9,7 +9,7 @@ let makeColor = i: lib.concatMapStringsSep "," (x: "0x" + lib.substring (2 * i) 2 x); - isUnicode = lib.hasSuffix "UTF-8" (lib.toUpper config.i18n.defaultLocale); + isUnicode = config.i18n.defaultCharset == "UTF-8" || cfg.useXkbConfig; optimizedKeymap = pkgs.runCommand "keymap" diff --git a/nixos/modules/services/networking/sabnzbd/default.nix b/nixos/modules/services/networking/sabnzbd/default.nix index e44053344ac3..8b7cfce32514 100644 --- a/nixos/modules/services/networking/sabnzbd/default.nix +++ b/nixos/modules/services/networking/sabnzbd/default.nix @@ -171,7 +171,7 @@ in a writeable configuration, such as quota tracking, enable this option. ''; - default = lib.versionOlder config.system.stateVersion "25.11"; + default = lib.versionOlder config.system.stateVersion "26.05"; }; settings = mkOption { diff --git a/nixos/modules/system/boot/loader/limine/limine-install.py b/nixos/modules/system/boot/loader/limine/limine-install.py index a64f34eaefc3..4b17e06e9051 100644 --- a/nixos/modules/system/boot/loader/limine/limine-install.py +++ b/nixos/modules/system/boot/loader/limine/limine-install.py @@ -291,6 +291,12 @@ def config_entry(levels: int, bootspec: BootSpec, label: str, time: str) -> str: entry += f'comment: {bootspec.label}, built on {time}\n' entry += 'kernel_path: ' + get_kernel_uri(bootspec.kernel) + '\n' entry += 'cmdline: ' + ' '.join(['init=' + bootspec.init] + bootspec.kernelParams).strip() + '\n' + + # Set framebuffer resolution for Linux boot entries if configured + resolution = config('resolution') + if resolution is not None: + entry += f'resolution: {resolution}\n' + if bootspec.initrd: entry += f'module_path: ' + get_kernel_uri(bootspec.initrd) + '\n' diff --git a/nixos/modules/system/boot/loader/limine/limine.nix b/nixos/modules/system/boot/loader/limine/limine.nix index 35e81d2afcfb..ec504a43685d 100644 --- a/nixos/modules/system/boot/loader/limine/limine.nix +++ b/nixos/modules/system/boot/loader/limine/limine.nix @@ -25,6 +25,7 @@ let force = cfg.force; enrollConfig = cfg.enrollConfig; style = cfg.style; + resolution = cfg.resolution; maxGenerations = if cfg.maxGenerations == null then 0 else cfg.maxGenerations; hostArchitecture = pkgs.stdenv.hostPlatform.parsed.cpu; timeout = if config.boot.loader.timeout != null then config.boot.loader.timeout else 10; @@ -98,6 +99,27 @@ in ''; }; + resolution = lib.mkOption { + default = null; + type = lib.types.nullOr lib.types.str; + example = "1920x1080x32"; + description = '' + The framebuffer resolution to set when booting Linux entries. + This controls the GOP mode that Limine sets before handing off to the kernel, + which affects early boot graphics (e.g., simpledrm, efifb). + + Format: `x` or `xx`. + If bpp is omitted, defaults to 32. + + Note: Refresh rate is not supported because the UEFI GOP protocol only + defines framebuffer dimensions and pixel format, not display timing. + Refresh rate is determined later by the GPU driver based on EDID. + + This is distinct from {option}`boot.loader.limine.style.interface.resolution` + which only affects the Limine bootloader's own menu interface. + ''; + }; + additionalFiles = lib.mkOption { default = { }; type = lib.types.attrsOf lib.types.path; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 512082e29494..6cd4ac9a4ecb 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -386,6 +386,7 @@ in collectd = runTest ./collectd.nix; commafeed = runTest ./commafeed.nix; connman = runTest ./connman.nix; + console-xkb-and-i18n = runTest ./console-xkb-and-i18n.nix; consul = runTest ./consul.nix; consul-template = runTest ./consul-template.nix; containers-bridge = runTest ./containers-bridge.nix; diff --git a/nixos/tests/console-xkb-and-i18n.nix b/nixos/tests/console-xkb-and-i18n.nix new file mode 100644 index 000000000000..757825a785af --- /dev/null +++ b/nixos/tests/console-xkb-and-i18n.nix @@ -0,0 +1,23 @@ +{ lib, ... }: +{ + name = "console-xkb-and-i18n"; + meta.maintainers = with lib.maintainers; [ doronbehar ]; + + nodes = { + # Nothing to run on this node. Only verify that this configuration doesn't + # produce the bugs described here: + # + # - https://github.com/NixOS/nixpkgs/issues/445666 + # - https://github.com/NixOS/nixpkgs/issues/411374 + # + x = { + i18n.defaultLocale = "eo"; + console.useXkbConfig = true; + services.xserver.xkb = { + layout = "us"; + variant = "colemak"; + }; + }; + }; + testScript = { nodes, ... }: ""; +} diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix index 1e510beaa20a..e99f707d0823 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix @@ -92,11 +92,7 @@ stdenv.mkDerivation rec { # Removing it will force it to use our version. rm $out/libexec/lib/bitwig-studio/libxcb-imdkit.so.1 - substitute usr/share/applications/com.bitwig.BitwigStudio.desktop \ - $out/share/applications/com.bitwig.BitwigStudio.desktop \ - --replace-fail "Exec=bitwig-studio" "Exec=$out/bin/bitwig-studio" - - runHook postInstall + runHook postInstall ''; postFixup = '' diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix deleted file mode 100644 index f8b1dad22672..000000000000 --- a/pkgs/applications/audio/chuck/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - alsa-lib, - bison, - flex, - libsndfile, - which, - DarwinTools, - xcbuild, -}: - -stdenv.mkDerivation rec { - version = "1.5.5.5"; - pname = "chuck"; - - src = fetchurl { - url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz"; - sha256 = "sha256-fxbTW0wcKn1q6psRhhCe6pHFJTPFfZUTCmlGr7gFoRU="; - }; - - nativeBuildInputs = [ - flex - bison - which - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - DarwinTools - xcbuild - ]; - - buildInputs = [ libsndfile ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib; - - makeFlags = [ - "-C src" - "DESTDIR=$(out)/bin" - ]; - buildFlags = [ (if stdenv.hostPlatform.isDarwin then "mac" else "linux-alsa") ]; - - meta = { - description = "Programming language for real-time sound synthesis and music creation"; - homepage = "http://chuck.cs.princeton.edu"; - license = lib.licenses.gpl2; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ ftrvxmtrx ]; - mainProgram = "chuck"; - }; -} diff --git a/pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix index f984fa0e52ee..53186307e380 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix @@ -6,14 +6,14 @@ }: vimUtils.buildVimPlugin { pname = "zig.vim"; - version = "0-unstable-2025-12-07"; + version = "0-unstable-2026-01-16"; src = fetchFromGitea { domain = "codeberg.org"; owner = "ziglang"; repo = "zig.vim"; - rev = "74bdb43c9d5da8d6b715809b79f92ef8f711df8e"; - hash = "sha256-RmrRgJ6YdExMwmua6nGv6W7DPP98k2URIaJTm+O4uR8="; + rev = "fc01f73ce0636723a03b784b63a7a89f2f9a84ae"; + hash = "sha256-bWvwb6k9jyoAqtp07UfYkyUsGo2N8Yvv7H6zq1eiwP8="; }; passthru.updateScript = nix-update-script { diff --git a/pkgs/applications/networking/instant-messengers/discord/sources.json b/pkgs/applications/networking/instant-messengers/discord/sources.json index f714248b084c..13ce48003d48 100644 --- a/pkgs/applications/networking/instant-messengers/discord/sources.json +++ b/pkgs/applications/networking/instant-messengers/discord/sources.json @@ -1,8 +1,8 @@ { "linux-canary": { - "hash": "sha256-jomLXlIr+ajJspmh/seNb48alPSuCw8ybYkfc0uAziE=", - "url": "https://canary.dl2.discordapp.net/apps/linux/0.0.852/discord-canary-0.0.852.tar.gz", - "version": "0.0.852" + "hash": "sha256-HtcgQS8P5R57qV3pKYyVLcT9FCOtZ6UbFBQWFkvU8B0=", + "url": "https://canary.dl2.discordapp.net/apps/linux/0.0.854/discord-canary-0.0.854.tar.gz", + "version": "0.0.854" }, "linux-development": { "hash": "sha256-EVkjWoqWl9Z+iHCLPOLu4PIUb2wC3HVcPVjOVz++IVw=", @@ -10,19 +10,19 @@ "version": "0.0.94" }, "linux-ptb": { - "hash": "sha256-szmKLp+aXZjrWClTOQ+NTwenY7b5c3eONFUUmszfUSk=", - "url": "https://ptb.dl2.discordapp.net/apps/linux/0.0.172/discord-ptb-0.0.172.tar.gz", - "version": "0.0.172" + "hash": "sha256-Y+e3HHXE5D9Q9qKE7ipaLijZ+E6yEr9NzEOy5c+Gk54=", + "url": "https://ptb.dl2.discordapp.net/apps/linux/0.0.173/discord-ptb-0.0.173.tar.gz", + "version": "0.0.173" }, "linux-stable": { - "hash": "sha256-4rJ0l0zSoOz7L65sy3Gegcsb/nJGGFu6h5TGAb0fqUI=", - "url": "https://stable.dl2.discordapp.net/apps/linux/0.0.120/discord-0.0.120.tar.gz", - "version": "0.0.120" + "hash": "sha256-WR9xyw3Zn/HAZQlfiKMAXqc2TueF6wCfQzvYtnXd1yM=", + "url": "https://stable.dl2.discordapp.net/apps/linux/0.0.121/discord-0.0.121.tar.gz", + "version": "0.0.121" }, "osx-canary": { - "hash": "sha256-ZzqakVB2Rkcq5zME2WnSCw1CLzpD3VDM/pu4nQ7rRNs=", - "url": "https://canary.dl2.discordapp.net/apps/osx/0.0.956/DiscordCanary.dmg", - "version": "0.0.956" + "hash": "sha256-q/PAGdlOTdkQudiH/NFXSgwhz2XBL9ZwrhJXiY9Iibc=", + "url": "https://canary.dl2.discordapp.net/apps/osx/0.0.958/DiscordCanary.dmg", + "version": "0.0.958" }, "osx-development": { "hash": "sha256-B1//zMlTv2+RWHfWZSaaU8ubVOwWob+EYjNdtFRwlgg=", @@ -30,13 +30,13 @@ "version": "0.0.107" }, "osx-ptb": { - "hash": "sha256-tjWbvWOvSinVZDvJYFFcbmr+y7W5PmIr/alrS82ECBo=", - "url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.204/DiscordPTB.dmg", - "version": "0.0.204" + "hash": "sha256-QCzJsb1RH6HORk9hw9F9Xu0rE+NCFYJDTJQO9UrdBxo=", + "url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.205/DiscordPTB.dmg", + "version": "0.0.205" }, "osx-stable": { - "hash": "sha256-PkZU/1GxPmfxq2qP/5gGU85EFYPI1V42iHfoy9x9fKI=", - "url": "https://stable.dl2.discordapp.net/apps/osx/0.0.372/Discord.dmg", - "version": "0.0.372" + "hash": "sha256-/CEN67VbRRwK64Iy7GIhs2XFwHe47njI5X6n45j5Q/E=", + "url": "https://stable.dl2.discordapp.net/apps/osx/0.0.373/Discord.dmg", + "version": "0.0.373" } } diff --git a/pkgs/by-name/ai/air-formatter/package.nix b/pkgs/by-name/ai/air-formatter/package.nix index 2f081926e983..6cccc54235af 100644 --- a/pkgs/by-name/ai/air-formatter/package.nix +++ b/pkgs/by-name/ai/air-formatter/package.nix @@ -7,23 +7,22 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "air-formatter"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "posit-dev"; repo = "air"; tag = finalAttrs.version; - hash = "sha256-LNU//dQico54GhZdehynEuukfGuU8rQvfFO4zvRsZL0="; + hash = "sha256-+AsKwigWikAv8NOaIYVvrH3Pub7Q9qV5YOp2jYU2GkE="; }; - cargoHash = "sha256-9HRDUTYzKLYuh9KCcnvPXB6gDKcht79TOZZ3ze9+gbg="; + cargoHash = "sha256-ndd4ps2X/+a62p3dlv8jxhr2bbBG88rytI1XBVntk+g="; useNextest = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgram = "${placeholder "out"}/bin/air"; doInstallCheck = true; cargoBuildFlags = [ "-p air" ]; diff --git a/pkgs/by-name/ak/akira-unstable/package.nix b/pkgs/by-name/ak/akira-unstable/package.nix index 006315c43ef0..4af6b8f8ab8b 100644 --- a/pkgs/by-name/ak/akira-unstable/package.nix +++ b/pkgs/by-name/ak/akira-unstable/package.nix @@ -13,7 +13,7 @@ wrapGAppsHook3, cairo, glib, - goocanvas3, + goocanvas_3, gtk3, gtksourceview3, json-glib, @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo glib - goocanvas3 + goocanvas_3 pantheon.granite gtk3 gtksourceview3 diff --git a/pkgs/by-name/ap/apache-airflow/python-package.nix b/pkgs/by-name/ap/apache-airflow/python-package.nix index 154886e64e0f..bce488ed44ec 100644 --- a/pkgs/by-name/ap/apache-airflow/python-package.nix +++ b/pkgs/by-name/ap/apache-airflow/python-package.nix @@ -310,13 +310,13 @@ buildPythonPackage rec { # Updates yarn.lock and package.json passthru.updateScript = writeScript "update.sh" '' #!/usr/bin/env nix-shell - #!nix-shell -i bash -p common-updater-scripts curl pcre "python3.withPackages (ps: with ps; [ pyyaml ])" yarn2nix + #!nix-shell -i bash -p common-updater-scripts curl "python3.withPackages (ps: with ps; [ pyyaml ])" yarn2nix set -euo pipefail # Get new version new_version="$(curl -s https://airflow.apache.org/docs/apache-airflow/stable/release_notes.html | - pcregrep -o1 'Airflow ([0-9.]+).' | head -1)" + grep -oE 'Airflow [0-9.]+' | head -1 | grep -oE '[0-9.]+')" update-source-version ${pname} "$new_version" # Update frontend diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix index 27cc3b3628df..6d1b67a6dd2c 100644 --- a/pkgs/by-name/au/audacity/package.nix +++ b/pkgs/by-name/au/audacity/package.nix @@ -33,7 +33,6 @@ libuuid, ffmpeg, soundtouch, - pcre, portaudio, # given up fighting their portaudio.patch? portmidi, linuxHeaders, @@ -115,7 +114,6 @@ stdenv.mkDerivation (finalAttrs: { lv2 mpg123 opusfile - pcre portmidi rapidjson serd diff --git a/pkgs/by-name/aw/awstats/package.nix b/pkgs/by-name/aw/awstats/package.nix index b92e889ee4fa..7cbd9b9972e8 100644 --- a/pkgs/by-name/aw/awstats/package.nix +++ b/pkgs/by-name/aw/awstats/package.nix @@ -7,11 +7,11 @@ perlPackages.buildPerlPackage rec { pname = "awstats"; - version = "7.9"; + version = "8.0"; src = fetchurl { url = "mirror://sourceforge/awstats/${pname}-${version}.tar.gz"; - sha256 = "sha256-YVF47TE9NDFfFaUi2xpdEsqcOV43hbsGKAq/+V2aBUY="; + sha256 = "sha256-Pvdv+WxTmEd92KERNOJm5TikhwZ/aQajrIo4v9EcEeA="; }; postPatch = '' @@ -27,7 +27,10 @@ perlPackages.buildPerlPackage rec { propagatedBuildOutputs = [ ]; # otherwise out propagates bin -> cycle - buildInputs = [ ]; # plugins will need some + buildInputs = with perlPackages; [ + JSONXS + TryTiny + ]; preConfigure = '' touch Makefile.PL diff --git a/pkgs/development/tools/build-managers/build2/bdep.nix b/pkgs/by-name/bd/bdep/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/build2/bdep.nix rename to pkgs/by-name/bd/bdep/package.nix diff --git a/pkgs/development/tools/build-managers/build2/bpkg.nix b/pkgs/by-name/bp/bpkg/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/build2/bpkg.nix rename to pkgs/by-name/bp/bpkg/package.nix diff --git a/pkgs/development/tools/build-managers/build2/nix-ldflags-sysdirs.patch b/pkgs/by-name/bu/build2-bootstrap/nix-ldflags-sysdirs.patch similarity index 100% rename from pkgs/development/tools/build-managers/build2/nix-ldflags-sysdirs.patch rename to pkgs/by-name/bu/build2-bootstrap/nix-ldflags-sysdirs.patch diff --git a/pkgs/development/tools/build-managers/build2/bootstrap.nix b/pkgs/by-name/bu/build2-bootstrap/package.nix similarity index 65% rename from pkgs/development/tools/build-managers/build2/bootstrap.nix rename to pkgs/by-name/bu/build2-bootstrap/package.nix index 6ef211423641..5c5c4098e65e 100644 --- a/pkgs/development/tools/build-managers/build2/bootstrap.nix +++ b/pkgs/by-name/bu/build2-bootstrap/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - pkgs, buildPackages, fixDarwinDylibNames, }: @@ -52,5 +51,28 @@ stdenv.mkDerivation rec { --subst-var-by isTargetDarwin '${toString stdenv.targetPlatform.isDarwin}' ''; - inherit (pkgs.build2) passthru; + passthru = { + configSharedStatic = + enableShared: enableStatic: + if enableShared && enableStatic then + "both" + else if enableShared then + "shared" + else if enableStatic then + "static" + else + throw "neither shared nor static libraries requested"; + }; + + meta = { + homepage = "https://www.build2.org/"; + description = "Bootstrap for the 'build2' package, you most likely want to use that one"; + license = lib.licenses.mit; + changelog = "https://git.build2.org/cgit/build2/tree/NEWS"; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ + hiro98 + r-burns + ]; + }; } diff --git a/pkgs/development/tools/build-managers/build2/setup-hook.sh b/pkgs/by-name/bu/build2-bootstrap/setup-hook.sh similarity index 100% rename from pkgs/development/tools/build-managers/build2/setup-hook.sh rename to pkgs/by-name/bu/build2-bootstrap/setup-hook.sh diff --git a/pkgs/development/tools/build-managers/build2/default.nix b/pkgs/by-name/bu/build2/package.nix similarity index 76% rename from pkgs/development/tools/build-managers/build2/default.nix rename to pkgs/by-name/bu/build2/package.nix index e8f21f173ebb..8c0391dc4f75 100644 --- a/pkgs/development/tools/build-managers/build2/default.nix +++ b/pkgs/by-name/bu/build2/package.nix @@ -1,7 +1,8 @@ { stdenv, lib, - build2, + # Break cycle by using self-contained toolchain for bootstrapping + build2-bootstrap, fetchurl, fixDarwinDylibNames, libbutl, @@ -11,18 +12,9 @@ enableStatic ? !enableShared, }: let - configSharedStatic = - enableShared: enableStatic: - if enableShared && enableStatic then - "both" - else if enableShared then - "shared" - else if enableStatic then - "static" - else - throw "neither shared nor static libraries requested"; + inherit (build2-bootstrap.passthru) configSharedStatic; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "build2"; version = "0.17.0"; @@ -33,26 +25,25 @@ stdenv.mkDerivation rec { "man" ]; - setupHook = ./setup-hook.sh; + setupHook = build2-bootstrap.setupHook; src = fetchurl { - url = "https://pkg.cppget.org/1/alpha/build2/build2-${version}.tar.gz"; + url = "https://pkg.cppget.org/1/alpha/build2/build2-${finalAttrs.version}.tar.gz"; hash = "sha256-Kx5X/GV3GjFSbjo1mzteiHnnm4mr6+NAKIR/mEE+IdA="; }; patches = [ # Remove any build/host config entries which refer to nix store paths ./remove-config-store-paths.patch - # Pick up sysdirs from NIX_LDFLAGS - ./nix-ldflags-sysdirs.patch - ]; + ] + ++ build2-bootstrap.patches; strictDeps = true; nativeBuildInputs = [ - build2 + build2-bootstrap ]; disallowedReferences = [ - build2 + build2-bootstrap libbutl.dev libpkgconf.dev ]; @@ -94,14 +85,19 @@ stdenv.mkDerivation rec { ''; passthru = { - bootstrap = build2; + bootstrap = build2-bootstrap; inherit configSharedStatic; }; meta = { - homepage = "https://www.build2.org/"; + inherit (build2-bootstrap.meta) + homepage + license + changelog + platforms + maintainers + ; description = "Build2 build system"; - license = lib.licenses.mit; longDescription = '' build2 is an open source (MIT), cross-platform build toolchain that aims to approximate Rust Cargo's convenience for developing @@ -114,12 +110,6 @@ stdenv.mkDerivation rec { at C/C++ projects as well as mixed-language projects involving one of these languages (see bash and rust modules, for example). ''; - changelog = "https://git.build2.org/cgit/build2/tree/NEWS"; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ - hiro98 - r-burns - ]; mainProgram = "b"; }; -} +}) diff --git a/pkgs/development/tools/build-managers/build2/remove-config-store-paths.patch b/pkgs/by-name/bu/build2/remove-config-store-paths.patch similarity index 100% rename from pkgs/development/tools/build-managers/build2/remove-config-store-paths.patch rename to pkgs/by-name/bu/build2/remove-config-store-paths.patch diff --git a/pkgs/by-name/ca/cargo-codspeed/package.nix b/pkgs/by-name/ca/cargo-codspeed/package.nix index 61d2fdfb6143..b0a4afe6efaa 100644 --- a/pkgs/by-name/ca/cargo-codspeed/package.nix +++ b/pkgs/by-name/ca/cargo-codspeed/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-codspeed"; - version = "4.2.1"; + version = "4.3.0"; src = fetchFromGitHub { owner = "CodSpeedHQ"; repo = "codspeed-rust"; tag = "v${finalAttrs.version}"; - hash = "sha256-ljq9d9T3Cx5hDAjP4dbhSnbCYaU1KB42aDhQvRyI7Ws="; + hash = "sha256-aOuKz7LEQU9hqJUw0M759A4zk8+9UhiMAnO7OwBc+T0="; }; - cargoHash = "sha256-ryKZyl5CuxFsX1dLadJnCyorssVoD2w5kueKDJP80qU="; + cargoHash = "sha256-K1xm8Kw7TMspFmqvW4qRf4QXddarw3eUDTIuwbg1pGA="; nativeBuildInputs = [ curl diff --git a/pkgs/by-name/ch/chuck/package.nix b/pkgs/by-name/ch/chuck/package.nix new file mode 100644 index 000000000000..d1a5e7919138 --- /dev/null +++ b/pkgs/by-name/ch/chuck/package.nix @@ -0,0 +1,70 @@ +{ + stdenv, + lib, + fetchFromGitHub, + bison, + flex, + pkg-config, + darwin, + xcbuild, + libsndfile, + alsa-lib, + libjack2, + libpulseaudio, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + version = "1.5.5.6"; + pname = "chuck"; + + src = fetchFromGitHub { + owner = "ccrma"; + repo = "chuck"; + tag = "chuck-${finalAttrs.version}"; + hash = "sha256-KBmMpycNCjRZJPdRR3HG5nqHQhhVOENciRpiQ7buyok="; + }; + + nativeBuildInputs = [ + bison + flex + pkg-config + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.DarwinTools + xcbuild + ]; + + buildInputs = [ + libsndfile + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + alsa-lib + libpulseaudio + libjack2 + ]; + + makeFlags = [ + "-C src" + "DESTDIR=$(out)/bin" + # fix hardcoded gcc + "CC=cc" + "CXX=c++" + ]; + buildFlags = [ (if stdenv.hostPlatform.isDarwin then "mac" else "linux-all") ]; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=chuck-(.*)" ]; }; + + meta = { + description = "Programming language for real-time sound synthesis and music creation"; + homepage = "http://chuck.cs.princeton.edu"; + license = with lib.licenses; [ + gpl2Plus + # or + mit + ]; + platforms = lib.platforms.unix; + maintainers = [ ]; + mainProgram = "chuck"; + }; +}) diff --git a/pkgs/by-name/co/complgen/package.nix b/pkgs/by-name/co/complgen/package.nix index 8ba5d924072b..077bf1f8d3e1 100644 --- a/pkgs/by-name/co/complgen/package.nix +++ b/pkgs/by-name/co/complgen/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "complgen"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "adaszko"; repo = "complgen"; tag = "v${finalAttrs.version}"; - hash = "sha256-GUI18RFVIBUu3DA6oVs1BWcsxGzctA68z8PamqJ5aus="; + hash = "sha256-fHSDYrfCoLQ4tU1DbrpD3iApufBv5qAGTIFri229pyE="; }; - cargoHash = "sha256-XbrWp1+z7VTD4ggh9+tG3fqXWOD1nYSeNzViHqmOmWg="; + cargoHash = "sha256-a6bGE2xxv8IdKlo98X8KNeQl8e//dc9pfaBgGHhx+5M="; meta = { changelog = "https://github.com/adaszko/complgen/blob/v${finalAttrs.version}/CHANGELOG.md"; diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix index bfc8bc235283..daed0e15bf7b 100644 --- a/pkgs/by-name/co/cosmic-applets/package.nix +++ b/pkgs/by-name/co/cosmic-applets/package.nix @@ -20,14 +20,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-applets"; - version = "1.0.2"; + version = "1.0.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-applets"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-o64sXCWuEIRV1KCRvKeN6iZBZfUyDYtft5yeag4jBNc="; + hash = "sha256-+1cqennGetcjJTgVfglq/LJ22goLQmahPCK/atdHxXU="; }; cargoHash = "sha256-uMMrLd3s0SqYCkSA82wWUxMfiTUzuDdsmyxy/MCYIWY="; diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix index cef431b4a68d..70d38b0b2521 100644 --- a/pkgs/by-name/co/cosmic-applibrary/package.nix +++ b/pkgs/by-name/co/cosmic-applibrary/package.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-applibrary"; - version = "1.0.2"; + version = "1.0.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-applibrary"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-uQaTSt0sgUQYopEFVmaeDCnejSc1gyGLHeHM2bGzStQ="; + hash = "sha256-3vIp+Vs4prsFFiTmjrUXoYqH27y6ccVlUQcP5ICFq3g="; }; cargoHash = "sha256-I6C5PrIymU8vZ7LvmnSlFFIp0cvlP1umiFMyrAyYf4A="; diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix index e2731285a3e8..7ea99d5f72c6 100644 --- a/pkgs/by-name/co/cosmic-bg/package.nix +++ b/pkgs/by-name/co/cosmic-bg/package.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-bg"; - version = "1.0.2"; + version = "1.0.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-bg"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-tiqJ0aXXUNyoezXSsHO9klkFZ5PO+gkVv+zXd4/Lq5A="; + hash = "sha256-LBIcQG3ZebK1bPVJ8WNHkHMLPsEcw77oZAkQRrd4j6o="; }; postPatch = '' diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix index b7e4cf54972b..803a2190b24c 100644 --- a/pkgs/by-name/co/cosmic-comp/package.nix +++ b/pkgs/by-name/co/cosmic-comp/package.nix @@ -20,14 +20,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-comp"; - version = "1.0.2"; + version = "1.0.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-comp"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-PBobAoXi3p1xUbs4XmmPkQ93QlMsULEYUoTDqOlJozg="; + hash = "sha256-vhWZpn9FPoH+mTKqCf6ug73FdT7Odr6f8pWNNIDKwFs="; }; cargoHash = "sha256-A0d00GdspoYI1fUic8TK9UzaQn39wbnvevD8IiPKC7w="; diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index 1ba7ac72a79d..1c4bddab9839 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -16,14 +16,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-edit"; - version = "1.0.2"; + version = "1.0.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-edit"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-ZqyaCryXNljJ00qD3ZksfKszANke3HqYgHoGNCHOUqI="; + hash = "sha256-4+GfIAsjzo1jr+wa9JjuIUvW3P3r03avP2W5hZJYXHU="; }; cargoHash = "sha256-ydI/DTbGlgwc9l/XsW1SbTOfSyTdcjM0i0jXLua4+f8="; diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix index c96b17ccd1a1..c664e9d3bf68 100644 --- a/pkgs/by-name/co/cosmic-files/package.nix +++ b/pkgs/by-name/co/cosmic-files/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-files"; - version = "1.0.2"; + version = "1.0.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-files"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-ZX7eRSrQXgc4oitjugvRicng87zVK41ecSUE80tl0Y0="; + hash = "sha256-aHNu6IedGWag6u+uRg2IFfcb8fTu5o4XfGwBXJBOkSM="; }; - cargoHash = "sha256-CGFBvOWu9ZA8kYDYDBVur5uWW8Cs7fT5T96UnKMkvEo="; + cargoHash = "sha256-kzyyKzkuCYqEsaaKhAVH31ztbww4k8XZ5HyBQeYO/Nc="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix index 2dd5577ffbc8..4555a5653838 100644 --- a/pkgs/by-name/co/cosmic-greeter/package.nix +++ b/pkgs/by-name/co/cosmic-greeter/package.nix @@ -19,14 +19,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-greeter"; - version = "1.0.2"; + version = "1.0.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-greeter"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-G9ahiwk3/nJEGtlHSaK9dUi4/zGEH90QGKeSdpNQDLU="; + hash = "sha256-ivFs/AOUXhzd6I9H+Zw3CS97qFQ/FeiAnlDuzRMneQI="; }; cargoHash = "sha256-4yRBgFrH4RBpuvChTED+ynx+PyFumoT2Z+R1gXxF4Xc="; diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix index b570a9335547..ba9837db6a9f 100644 --- a/pkgs/by-name/co/cosmic-icons/package.nix +++ b/pkgs/by-name/co/cosmic-icons/package.nix @@ -9,7 +9,7 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "cosmic-icons"; - version = "1.0.2"; + version = "1.0.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-idle/package.nix b/pkgs/by-name/co/cosmic-idle/package.nix index 04f8881af359..aa03f36bf220 100644 --- a/pkgs/by-name/co/cosmic-idle/package.nix +++ b/pkgs/by-name/co/cosmic-idle/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-idle"; - version = "1.0.2"; + version = "1.0.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-initial-setup/package.nix b/pkgs/by-name/co/cosmic-initial-setup/package.nix index 7808c5e82634..58bc324f4fcf 100644 --- a/pkgs/by-name/co/cosmic-initial-setup/package.nix +++ b/pkgs/by-name/co/cosmic-initial-setup/package.nix @@ -14,14 +14,14 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-initial-setup"; - version = "1.0.2"; + version = "1.0.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-initial-setup"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-g1FJiJSyPZTJ1G8cW8A0sxbIUeG3JcjJYo6qHp639d4="; + hash = "sha256-xeJfS3vXYCy3R20K5jiyPmgZI+arhkzm3Vz6YQnLe9Y="; }; cargoHash = "sha256-co7fOPjNLi32XRXKdmCWC+bWhEljsdSc/scasghG4/8="; diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix index fc3f0112c9ef..be43c37bbb9e 100644 --- a/pkgs/by-name/co/cosmic-launcher/package.nix +++ b/pkgs/by-name/co/cosmic-launcher/package.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-launcher"; - version = "1.0.2"; + version = "1.0.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-launcher"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-2LfoqXXYzNpWrnmmwm68IzrG63cX04tMFk0Ly7AJzDs="; + hash = "sha256-uKTeNTJtsDx0FS3fmvqMbXPTezMkD1dcn5dPKXvmcp4="; }; cargoHash = "sha256-bmQ8Ni0sR9gfttsEhh9LNbWmTdOkW/JSMEzOf+kvN98="; diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix index 309c2b9b3fb1..55b51602ca0b 100644 --- a/pkgs/by-name/co/cosmic-notifications/package.nix +++ b/pkgs/by-name/co/cosmic-notifications/package.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-notifications"; - version = "1.0.2"; + version = "1.0.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-notifications"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-lvqqeY/FPv+LFTmZoBUuKWCjAGZozGj/yUCphlFuk/g="; + hash = "sha256-BNOerRv9w0Y9Wozoc5IOouMjne7XQN/SItSy2LQrK9w="; }; cargoHash = "sha256-zyM4iMJs2wPIKIEdji1uJF3WYpPGihFswIK5Wyf6Mns="; diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index 445992943b8b..0a9ea87c0d13 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-osd"; - version = "1.0.2"; + version = "1.0.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-osd"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-PNFwlxAdbQpFFIe54AEteWG2YRHGRgjDDUpgDwCxXns="; + hash = "sha256-6GuLFy1DKXk//LhhRA62KX1P/X+QSsNCy5Eiwjxqk9M="; }; cargoHash = "sha256-DNQvmE/2swrDybjcQfCAjMRkAttjl+ibbLG0HSlcZwU="; diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index 946990275f93..bd102f53d0c2 100644 --- a/pkgs/by-name/co/cosmic-panel/package.nix +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-panel"; - version = "1.0.2"; + version = "1.0.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix index 69ae94316b23..3fb9f91e3335 100644 --- a/pkgs/by-name/co/cosmic-player/package.nix +++ b/pkgs/by-name/co/cosmic-player/package.nix @@ -18,14 +18,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-player"; - version = "1.0.2"; + version = "1.0.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-player"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-wBR8KvARINQ3XO/gs5POj32cVj5Eoa3IuWyAmxajMmY="; + hash = "sha256-F5Phk9JgcSc3Hj+2NxVfqq1Ujz8hv3DVJqAP3aEo2Ic="; }; cargoHash = "sha256-Z0+6jtvJ3z/ptcqrbvSuXgjH2liASNJwBIKiHbrVBT8="; diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix index 299d3404bdb0..41f273aa7e25 100644 --- a/pkgs/by-name/co/cosmic-randr/package.nix +++ b/pkgs/by-name/co/cosmic-randr/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-randr"; - version = "1.0.2"; + version = "1.0.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix index 6b2c0c45713e..f2aee8b9df6b 100644 --- a/pkgs/by-name/co/cosmic-screenshot/package.nix +++ b/pkgs/by-name/co/cosmic-screenshot/package.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-screenshot"; - version = "1.0.2"; + version = "1.0.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-screenshot"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-lW1nryM/meZjjC9MOH0fimRejdycfq8REwzH1IeV774="; + hash = "sha256-xNEICyR/4EYTPTMnlRTag3Ji5rM8HJl6m9MAe7FdHTk="; }; cargoHash = "sha256-O8fFeg1TkKCg+QbTnNjsH52xln4+ophh/BW/b4zQs9o="; diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix index 79ab5c4c3851..64ac86039f23 100644 --- a/pkgs/by-name/co/cosmic-session/package.nix +++ b/pkgs/by-name/co/cosmic-session/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-session"; - version = "1.0.2"; + version = "1.0.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix index eda52dd48000..81306035d0be 100644 --- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix +++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-settings-daemon"; - version = "1.0.2"; + version = "1.0.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix index e0e32d1f8669..413b376c967a 100644 --- a/pkgs/by-name/co/cosmic-settings/package.nix +++ b/pkgs/by-name/co/cosmic-settings/package.nix @@ -27,14 +27,14 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-settings"; - version = "1.0.2"; + version = "1.0.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-settings"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-IYuQlXkdakAbchOH2vje02eWCJMBEp7ONtls4Hm/iCo="; + hash = "sha256-/Zzs2b51J0v9PavMr3MuNiFBprb7oJiSC+qDVvMTwEk="; }; cargoHash = "sha256-XY1ovI73O2jJdx1a5pUk/n6TUazklq7PA+bgva3xslo="; diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix index 45836f850eda..34d1096550d3 100644 --- a/pkgs/by-name/co/cosmic-store/package.nix +++ b/pkgs/by-name/co/cosmic-store/package.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-store"; - version = "1.0.2"; + version = "1.0.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-store"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-na9eRJ9R38wFWOoQSyZj/UlDb5lwvCZrRQ/w/aOqVfY="; + hash = "sha256-61O6TY41raQ1+EhCLrCC8Krzt6pWM/BFL61KHkxou2M="; }; cargoHash = "sha256-VapIpvjtBo+oSUWtilPR0v5crjDVt0OGdHlx73Gb6Jk="; diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix index 400b632aaa07..690176cf44e8 100644 --- a/pkgs/by-name/co/cosmic-term/package.nix +++ b/pkgs/by-name/co/cosmic-term/package.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-term"; - version = "1.0.2"; + version = "1.0.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-term"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-SmwXRgYgFelVQhx03GaIRWHCm7x/9eXMdVxH06TLxLE="; + hash = "sha256-RYRAJhixba8i8hKpZSZLPLza+V9XZuSaZmWknoIJ3mk="; }; cargoHash = "sha256-ImWHjEKgu9FQR52A3GjnAkxlPduKuzSUAOANYr0DzMA="; diff --git a/pkgs/by-name/co/cosmic-wallpapers/package.nix b/pkgs/by-name/co/cosmic-wallpapers/package.nix index 0a99261a8d49..37ca95969c68 100644 --- a/pkgs/by-name/co/cosmic-wallpapers/package.nix +++ b/pkgs/by-name/co/cosmic-wallpapers/package.nix @@ -7,7 +7,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cosmic-wallpapers"; - version = "1.0.2"; + version = "1.0.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix index 44225233d0d3..c3b7a8059819 100644 --- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix +++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-workspaces-epoch"; - version = "1.0.2"; + version = "1.0.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-workspaces-epoch"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-wGhXTQujwOqDBcBesXIRkcTJdQAhs0pavsVHMH98QCw="; + hash = "sha256-Gg4ogMf2C3rXf3p/8GPpiZ2aG02KWTtrqby47UW7B3I="; }; cargoHash = "sha256-ZVl09YgeH+V4X3H88rdeiBgua1IpVcfKe0y8A78wzl4="; diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index fb8a7ea1f23d..98dee9336f1f 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -59,13 +59,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.57.1"; + version = "2.58.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; tag = finalAttrs.version; - hash = "sha256-svv6JPRgiXzzjL/CjtEybo0A1B8jr1K0xRO9lCBj1J4="; + hash = "sha256-kWMR2qtwgzpYZmbqkpNkII6MuMFb13jkBtI/1pdgSgE="; }; outputs = [ diff --git a/pkgs/by-name/fr/framework-tool/package.nix b/pkgs/by-name/fr/framework-tool/package.nix index 0a98787317a7..fec50684f259 100644 --- a/pkgs/by-name/fr/framework-tool/package.nix +++ b/pkgs/by-name/fr/framework-tool/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "framework-tool"; - version = "0.4.5"; + version = "0.5.0"; src = fetchFromGitHub { owner = "FrameworkComputer"; repo = "framework-system"; tag = "v${version}"; - hash = "sha256-WhdKU6vyOm5R9RInw9Fj8gELztLn4m5rFGgHbnItguU="; + hash = "sha256-wgleuZ0txkmv0+tyr31PiVTNyTSc+OPy/jJwL1Ryyu4="; }; - cargoHash = "sha256-A7/Q4p26W0AzqlLguL2OJtmm7dAsBU/Yb636ScYXrPs="; + cargoHash = "sha256-W+k/PAcdwl9mvajB9D4SUH4o5VqpeD/BnK6ZEJzPpmI="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; diff --git a/pkgs/by-name/gn/gnome-inform7/package.nix b/pkgs/by-name/gn/gnome-inform7/package.nix index 7641a6deb55a..3a3aaeccc1bc 100644 --- a/pkgs/by-name/gn/gnome-inform7/package.nix +++ b/pkgs/by-name/gn/gnome-inform7/package.nix @@ -24,7 +24,7 @@ gtksourceview3, gspell, libxml2, - goocanvas2, + goocanvas_2, libplist, glib, gst_all_1, @@ -126,7 +126,7 @@ stdenv.mkDerivation { gspell # webkitgtk_4_0 libxml2 - goocanvas2 + goocanvas_2 libplist ratify chimara diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/by-name/go/goocanvas_1/package.nix similarity index 100% rename from pkgs/development/libraries/goocanvas/default.nix rename to pkgs/by-name/go/goocanvas_1/package.nix diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/by-name/go/goocanvas_2/package.nix similarity index 100% rename from pkgs/development/libraries/goocanvas/2.x.nix rename to pkgs/by-name/go/goocanvas_2/package.nix diff --git a/pkgs/development/libraries/goocanvas/gcc14-fix.patch b/pkgs/by-name/go/goocanvas_3/gcc14-fix.patch similarity index 100% rename from pkgs/development/libraries/goocanvas/gcc14-fix.patch rename to pkgs/by-name/go/goocanvas_3/gcc14-fix.patch diff --git a/pkgs/development/libraries/goocanvas/3.x.nix b/pkgs/by-name/go/goocanvas_3/package.nix similarity index 100% rename from pkgs/development/libraries/goocanvas/3.x.nix rename to pkgs/by-name/go/goocanvas_3/package.nix diff --git a/pkgs/by-name/go/goocanvasmm2/package.nix b/pkgs/by-name/go/goocanvasmm2/package.nix index 61ea379b1b46..04f5476958a6 100644 --- a/pkgs/by-name/go/goocanvasmm2/package.nix +++ b/pkgs/by-name/go/goocanvasmm2/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, pkg-config, - goocanvas2, + goocanvas_2, gtkmm3, gnome, }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ gtkmm3 - goocanvas2 + goocanvas_2 ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/go/google-clasp/package.nix b/pkgs/by-name/go/google-clasp/package.nix index 3fd93c28c410..8c14181a2f92 100644 --- a/pkgs/by-name/go/google-clasp/package.nix +++ b/pkgs/by-name/go/google-clasp/package.nix @@ -2,27 +2,32 @@ lib, buildNpmPackage, fetchFromGitHub, + fetchpatch, }: buildNpmPackage rec { pname = "clasp"; - version = "2.5.0"; + version = "3.1.3"; src = fetchFromGitHub { owner = "google"; repo = "clasp"; tag = "v${version}"; - hash = "sha256-Wt9caSgYNSx6yVUm3eg86GNdrheqHM5IYY8QohclHkQ="; + hash = "sha256-Pxt3MaDDsk/qq3NSuwG3jOoPthwrL0QelaruoC37hfA="; }; - npmDepsHash = "sha256-iRC2iLNe/4ZP2liUDjIgyMNtlmjcXAGdSmhx3qFBjsA="; + patches = [ + # https://github.com/google/clasp/pull/1112 + (fetchpatch { + url = "https://github.com/google/clasp/commit/b183d4b5fbdb51f7bc2e3edadf5fd3bbff28bad1.patch"; + hash = "sha256-lnC7DfKsV4E5guxbjZ+WfkLj5wDLYwObPtH21dmFUcc="; + }) + ]; + + npmDepsHash = "sha256-IyFcGcT3ceoaaf2sCPriEIoWPavg+YGsvkxr1MkLj5c="; # `npm run build` tries installing clasp globally npmBuildScript = [ "compile" ]; - # Remove dangling symlink of a dependency - postInstall = '' - rm $out/lib/node_modules/@google/clasp/node_modules/.bin/sshpk-{verify,sign,conv} - ''; meta = { description = "Develop Apps Script Projects locally"; diff --git a/pkgs/by-name/gp/gpredict-unstable/package.nix b/pkgs/by-name/gp/gpredict-unstable/package.nix index ece1d7dbf747..c5aee98340e0 100644 --- a/pkgs/by-name/gp/gpredict-unstable/package.nix +++ b/pkgs/by-name/gp/gpredict-unstable/package.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, - goocanvas3, + goocanvas_3, nix-update-script, gpredict, }: (gpredict.override { - goocanvas2 = goocanvas3; + goocanvas_2 = goocanvas_3; }).overrideAttrs (finalAttrs: { version = "2.2.1-unstable-2025-09-20"; diff --git a/pkgs/by-name/gp/gpredict/package.nix b/pkgs/by-name/gp/gpredict/package.nix index b9adf285d466..c44036ffd038 100644 --- a/pkgs/by-name/gp/gpredict/package.nix +++ b/pkgs/by-name/gp/gpredict/package.nix @@ -9,7 +9,7 @@ gtk3, glib, curl, - goocanvas2, + goocanvas_2, gpsd, hamlib_4, wrapGAppsHook3, @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { curl glib gtk3 - goocanvas2 + goocanvas_2 gpsd hamlib_4 ]; diff --git a/pkgs/development/libraries/gssdp/tools.nix b/pkgs/by-name/gs/gssdp-tools/package.nix similarity index 100% rename from pkgs/development/libraries/gssdp/tools.nix rename to pkgs/by-name/gs/gssdp-tools/package.nix diff --git a/pkgs/development/libraries/gssdp/standalone-tools.patch b/pkgs/by-name/gs/gssdp-tools/standalone-tools.patch similarity index 100% rename from pkgs/development/libraries/gssdp/standalone-tools.patch rename to pkgs/by-name/gs/gssdp-tools/standalone-tools.patch diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/by-name/gs/gssdp/package.nix similarity index 100% rename from pkgs/development/libraries/gssdp/default.nix rename to pkgs/by-name/gs/gssdp/package.nix diff --git a/pkgs/development/libraries/gssdp/1.6.nix b/pkgs/by-name/gs/gssdp_1_6/package.nix similarity index 100% rename from pkgs/development/libraries/gssdp/1.6.nix rename to pkgs/by-name/gs/gssdp_1_6/package.nix diff --git a/pkgs/development/libraries/gtk-sharp/builder.sh b/pkgs/by-name/gt/gtk-sharp-2_0/builder.sh similarity index 100% rename from pkgs/development/libraries/gtk-sharp/builder.sh rename to pkgs/by-name/gt/gtk-sharp-2_0/builder.sh diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/by-name/gt/gtk-sharp-2_0/package.nix similarity index 100% rename from pkgs/development/libraries/gtk-sharp/2.0.nix rename to pkgs/by-name/gt/gtk-sharp-2_0/package.nix diff --git a/pkgs/by-name/gt/gtk-sharp-3_0/builder.sh b/pkgs/by-name/gt/gtk-sharp-3_0/builder.sh new file mode 100644 index 000000000000..946b65d98a58 --- /dev/null +++ b/pkgs/by-name/gt/gtk-sharp-3_0/builder.sh @@ -0,0 +1,9 @@ +genericBuild + +# !!! hack +export ALL_INPUTS="$out $pkgs" + +find $out -name "*.dll.config" | while read configFile; do + echo "modifying config file $configFile" + $monoDLLFixer "$configFile" +done diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/by-name/gt/gtk-sharp-3_0/package.nix similarity index 100% rename from pkgs/development/libraries/gtk-sharp/3.0.nix rename to pkgs/by-name/gt/gtk-sharp-3_0/package.nix diff --git a/pkgs/development/libraries/gtk/hooks/clean-immodules-cache.sh b/pkgs/by-name/gt/gtk2/hooks/clean-immodules-cache.sh similarity index 100% rename from pkgs/development/libraries/gtk/hooks/clean-immodules-cache.sh rename to pkgs/by-name/gt/gtk2/hooks/clean-immodules-cache.sh diff --git a/pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh b/pkgs/by-name/gt/gtk2/hooks/drop-icon-theme-cache.sh similarity index 100% rename from pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh rename to pkgs/by-name/gt/gtk2/hooks/drop-icon-theme-cache.sh diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/by-name/gt/gtk2/package.nix similarity index 100% rename from pkgs/development/libraries/gtk/2.x.nix rename to pkgs/by-name/gt/gtk2/package.nix diff --git a/pkgs/development/libraries/gtk/patches/2.0-clang.patch b/pkgs/by-name/gt/gtk2/patches/2.0-clang.patch similarity index 100% rename from pkgs/development/libraries/gtk/patches/2.0-clang.patch rename to pkgs/by-name/gt/gtk2/patches/2.0-clang.patch diff --git a/pkgs/development/libraries/gtk/patches/2.0-darwin-x11.patch b/pkgs/by-name/gt/gtk2/patches/2.0-darwin-x11.patch similarity index 100% rename from pkgs/development/libraries/gtk/patches/2.0-darwin-x11.patch rename to pkgs/by-name/gt/gtk2/patches/2.0-darwin-x11.patch diff --git a/pkgs/development/libraries/gtk/patches/2.0-gnome_bugzilla_557780_306776_freeciv_darwin.patch b/pkgs/by-name/gt/gtk2/patches/2.0-gnome_bugzilla_557780_306776_freeciv_darwin.patch similarity index 100% rename from pkgs/development/libraries/gtk/patches/2.0-gnome_bugzilla_557780_306776_freeciv_darwin.patch rename to pkgs/by-name/gt/gtk2/patches/2.0-gnome_bugzilla_557780_306776_freeciv_darwin.patch diff --git a/pkgs/development/libraries/gtk/patches/2.0-immodules.cache.patch b/pkgs/by-name/gt/gtk2/patches/2.0-immodules.cache.patch similarity index 100% rename from pkgs/development/libraries/gtk/patches/2.0-immodules.cache.patch rename to pkgs/by-name/gt/gtk2/patches/2.0-immodules.cache.patch diff --git a/pkgs/development/libraries/gtk/patches/gtk2-theme-paths.patch b/pkgs/by-name/gt/gtk2/patches/gtk2-theme-paths.patch similarity index 100% rename from pkgs/development/libraries/gtk/patches/gtk2-theme-paths.patch rename to pkgs/by-name/gt/gtk2/patches/gtk2-theme-paths.patch diff --git a/pkgs/by-name/gt/gtk3/hooks/clean-immodules-cache.sh b/pkgs/by-name/gt/gtk3/hooks/clean-immodules-cache.sh new file mode 100644 index 000000000000..0868a4a39101 --- /dev/null +++ b/pkgs/by-name/gt/gtk3/hooks/clean-immodules-cache.sh @@ -0,0 +1,15 @@ +# shellcheck shell=bash + +fixupOutputHooks+=(_gtkCleanImmodulesCache) + +# Clean comments that link to generator of the file +_gtkCleanImmodulesCache() { + # gtk_module_path is where the modules are installed + # https://gitlab.gnome.org/GNOME/gtk/-/blob/3.24.24/gtk/gtkmodules.c#L68 + # gtk_binary_version can be retrived with: + # pkg-config --variable=gtk_binary_version gtk+-3.0 + local f="${prefix:?}/lib/@gtk_module_path@/@gtk_binary_version@/immodules.cache" + if [ -f "$f" ]; then + sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f" + fi +} diff --git a/pkgs/by-name/gt/gtk3/hooks/drop-icon-theme-cache.sh b/pkgs/by-name/gt/gtk3/hooks/drop-icon-theme-cache.sh new file mode 100644 index 000000000000..0762285843eb --- /dev/null +++ b/pkgs/by-name/gt/gtk3/hooks/drop-icon-theme-cache.sh @@ -0,0 +1,19 @@ +# shellcheck shell=bash + +# Packages often run gtk-update-icon-cache to include their icons in themes’ icon cache. +# However, since each package is installed to its own prefix, the files will only collide. +dropIconThemeCache() { + if [[ -z "${dontDropIconThemeCache:-}" ]]; then + local icondir="${out:?}/share/icons" + if [[ -d "${icondir}" ]]; then + # App icons are supposed to go to hicolor theme, since it is a fallback theme as per [icon-theme-spec], but some might still choose to install stylized icons to other themes. + find "${icondir}" -name 'icon-theme.cache' -print0 \ + | while IFS= read -r -d '' file; do + echo "Removing ${file}" + rm -f "${file}" + done + fi + fi +} + +appendToVar preFixupPhases dropIconThemeCache diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/by-name/gt/gtk3/package.nix similarity index 100% rename from pkgs/development/libraries/gtk/3.x.nix rename to pkgs/by-name/gt/gtk3/package.nix diff --git a/pkgs/development/libraries/gtk/patches/3.0-Xft-setting-fallback-compute-DPI-properly.patch b/pkgs/by-name/gt/gtk3/patches/3.0-Xft-setting-fallback-compute-DPI-properly.patch similarity index 100% rename from pkgs/development/libraries/gtk/patches/3.0-Xft-setting-fallback-compute-DPI-properly.patch rename to pkgs/by-name/gt/gtk3/patches/3.0-Xft-setting-fallback-compute-DPI-properly.patch diff --git a/pkgs/development/libraries/gtk/patches/3.0-darwin-x11.patch b/pkgs/by-name/gt/gtk3/patches/3.0-darwin-x11.patch similarity index 100% rename from pkgs/development/libraries/gtk/patches/3.0-darwin-x11.patch rename to pkgs/by-name/gt/gtk3/patches/3.0-darwin-x11.patch diff --git a/pkgs/development/libraries/gtk/patches/3.0-immodules.cache.patch b/pkgs/by-name/gt/gtk3/patches/3.0-immodules.cache.patch similarity index 100% rename from pkgs/development/libraries/gtk/patches/3.0-immodules.cache.patch rename to pkgs/by-name/gt/gtk3/patches/3.0-immodules.cache.patch diff --git a/pkgs/development/libraries/gtk/patches/3.0-mr5531-backport.patch b/pkgs/by-name/gt/gtk3/patches/3.0-mr5531-backport.patch similarity index 100% rename from pkgs/development/libraries/gtk/patches/3.0-mr5531-backport.patch rename to pkgs/by-name/gt/gtk3/patches/3.0-mr5531-backport.patch diff --git a/pkgs/by-name/gt/gtk4/hooks/clean-immodules-cache.sh b/pkgs/by-name/gt/gtk4/hooks/clean-immodules-cache.sh new file mode 100644 index 000000000000..0868a4a39101 --- /dev/null +++ b/pkgs/by-name/gt/gtk4/hooks/clean-immodules-cache.sh @@ -0,0 +1,15 @@ +# shellcheck shell=bash + +fixupOutputHooks+=(_gtkCleanImmodulesCache) + +# Clean comments that link to generator of the file +_gtkCleanImmodulesCache() { + # gtk_module_path is where the modules are installed + # https://gitlab.gnome.org/GNOME/gtk/-/blob/3.24.24/gtk/gtkmodules.c#L68 + # gtk_binary_version can be retrived with: + # pkg-config --variable=gtk_binary_version gtk+-3.0 + local f="${prefix:?}/lib/@gtk_module_path@/@gtk_binary_version@/immodules.cache" + if [ -f "$f" ]; then + sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f" + fi +} diff --git a/pkgs/by-name/gt/gtk4/hooks/drop-icon-theme-cache.sh b/pkgs/by-name/gt/gtk4/hooks/drop-icon-theme-cache.sh new file mode 100644 index 000000000000..0762285843eb --- /dev/null +++ b/pkgs/by-name/gt/gtk4/hooks/drop-icon-theme-cache.sh @@ -0,0 +1,19 @@ +# shellcheck shell=bash + +# Packages often run gtk-update-icon-cache to include their icons in themes’ icon cache. +# However, since each package is installed to its own prefix, the files will only collide. +dropIconThemeCache() { + if [[ -z "${dontDropIconThemeCache:-}" ]]; then + local icondir="${out:?}/share/icons" + if [[ -d "${icondir}" ]]; then + # App icons are supposed to go to hicolor theme, since it is a fallback theme as per [icon-theme-spec], but some might still choose to install stylized icons to other themes. + find "${icondir}" -name 'icon-theme.cache' -print0 \ + | while IFS= read -r -d '' file; do + echo "Removing ${file}" + rm -f "${file}" + done + fi + fi +} + +appendToVar preFixupPhases dropIconThemeCache diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/by-name/gt/gtk4/package.nix similarity index 100% rename from pkgs/development/libraries/gtk/4.x.nix rename to pkgs/by-name/gt/gtk4/package.nix diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/by-name/gt/gtkmm2/package.nix similarity index 100% rename from pkgs/development/libraries/gtkmm/2.x.nix rename to pkgs/by-name/gt/gtkmm2/package.nix diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/by-name/gt/gtkmm3/package.nix similarity index 100% rename from pkgs/development/libraries/gtkmm/3.x.nix rename to pkgs/by-name/gt/gtkmm3/package.nix diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/by-name/gt/gtkmm4/package.nix similarity index 100% rename from pkgs/development/libraries/gtkmm/4.x.nix rename to pkgs/by-name/gt/gtkmm4/package.nix diff --git a/pkgs/development/libraries/gtksourceviewmm/default.nix b/pkgs/by-name/gt/gtksourceviewmm/package.nix similarity index 100% rename from pkgs/development/libraries/gtksourceviewmm/default.nix rename to pkgs/by-name/gt/gtksourceviewmm/package.nix diff --git a/pkgs/development/libraries/gtksourceviewmm/4.x.nix b/pkgs/by-name/gt/gtksourceviewmm4/package.nix similarity index 100% rename from pkgs/development/libraries/gtksourceviewmm/4.x.nix rename to pkgs/by-name/gt/gtksourceviewmm4/package.nix diff --git a/pkgs/development/libraries/gtkspell/gettext-0.25.patch b/pkgs/by-name/gt/gtkspell2/gettext-0.25.patch similarity index 100% rename from pkgs/development/libraries/gtkspell/gettext-0.25.patch rename to pkgs/by-name/gt/gtkspell2/gettext-0.25.patch diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/by-name/gt/gtkspell2/package.nix similarity index 100% rename from pkgs/development/libraries/gtkspell/default.nix rename to pkgs/by-name/gt/gtkspell2/package.nix diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/by-name/gt/gtkspell3/package.nix similarity index 100% rename from pkgs/development/libraries/gtkspell/3.nix rename to pkgs/by-name/gt/gtkspell3/package.nix diff --git a/pkgs/development/libraries/gupnp/0001-pkg-config-Declare-header-dependencies-as-public.patch b/pkgs/by-name/gu/gupnp/0001-pkg-config-Declare-header-dependencies-as-public.patch similarity index 100% rename from pkgs/development/libraries/gupnp/0001-pkg-config-Declare-header-dependencies-as-public.patch rename to pkgs/by-name/gu/gupnp/0001-pkg-config-Declare-header-dependencies-as-public.patch diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/by-name/gu/gupnp/package.nix similarity index 100% rename from pkgs/development/libraries/gupnp/default.nix rename to pkgs/by-name/gu/gupnp/package.nix diff --git a/pkgs/development/libraries/gupnp/1.6.nix b/pkgs/by-name/gu/gupnp_1_6/package.nix similarity index 100% rename from pkgs/development/libraries/gupnp/1.6.nix rename to pkgs/by-name/gu/gupnp_1_6/package.nix diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/by-name/ha/hamlib_3/package.nix similarity index 100% rename from pkgs/development/libraries/hamlib/default.nix rename to pkgs/by-name/ha/hamlib_3/package.nix diff --git a/pkgs/development/libraries/hamlib/4.nix b/pkgs/by-name/ha/hamlib_4/package.nix similarity index 100% rename from pkgs/development/libraries/hamlib/4.nix rename to pkgs/by-name/ha/hamlib_4/package.nix diff --git a/pkgs/development/libraries/kerberos/0001-Define-HAVE_DB_185_H.patch b/pkgs/by-name/he/heimdal/0001-Define-HAVE_DB_185_H.patch similarity index 100% rename from pkgs/development/libraries/kerberos/0001-Define-HAVE_DB_185_H.patch rename to pkgs/by-name/he/heimdal/0001-Define-HAVE_DB_185_H.patch diff --git a/pkgs/development/libraries/kerberos/0001-Include-db.h-for-nbdb-compat-mode.patch b/pkgs/by-name/he/heimdal/0001-Include-db.h-for-nbdb-compat-mode.patch similarity index 100% rename from pkgs/development/libraries/kerberos/0001-Include-db.h-for-nbdb-compat-mode.patch rename to pkgs/by-name/he/heimdal/0001-Include-db.h-for-nbdb-compat-mode.patch diff --git a/pkgs/development/libraries/kerberos/0001-Link-tests-with-libresolv.patch b/pkgs/by-name/he/heimdal/0001-Link-tests-with-libresolv.patch similarity index 100% rename from pkgs/development/libraries/kerberos/0001-Link-tests-with-libresolv.patch rename to pkgs/by-name/he/heimdal/0001-Link-tests-with-libresolv.patch diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/by-name/he/heimdal/package.nix similarity index 100% rename from pkgs/development/libraries/kerberos/heimdal.nix rename to pkgs/by-name/he/heimdal/package.nix diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/by-name/hs/hspell/package.nix similarity index 100% rename from pkgs/development/libraries/hspell/default.nix rename to pkgs/by-name/hs/hspell/package.nix diff --git a/pkgs/development/libraries/hspell/remove-shared-library-checks.patch b/pkgs/by-name/hs/hspell/remove-shared-library-checks.patch similarity index 100% rename from pkgs/development/libraries/hspell/remove-shared-library-checks.patch rename to pkgs/by-name/hs/hspell/remove-shared-library-checks.patch diff --git a/pkgs/development/libraries/indicator-application/gtk2.nix b/pkgs/by-name/in/indicator-application-gtk2/package.nix similarity index 100% rename from pkgs/development/libraries/indicator-application/gtk2.nix rename to pkgs/by-name/in/indicator-application-gtk2/package.nix diff --git a/pkgs/development/libraries/indicator-application/gtk3.nix b/pkgs/by-name/in/indicator-application-gtk3/package.nix similarity index 100% rename from pkgs/development/libraries/indicator-application/gtk3.nix rename to pkgs/by-name/in/indicator-application-gtk3/package.nix diff --git a/pkgs/by-name/ja/jabref/deps.json b/pkgs/by-name/ja/jabref/deps.json index cf671cd8725e..806de87d2389 100644 --- a/pkgs/by-name/ja/jabref/deps.json +++ b/pkgs/by-name/ja/jabref/deps.json @@ -652,13 +652,13 @@ "jar": "sha256-bNkZkTI917L7KMqT16wSr1qGovUyeeKzWCezAxP9C58=", "pom": "sha256-rECp8tDB7mMfw7CO+OLwvRS6IgEcp2/xvPZftWnq3zU=" }, - "org/gradle/kotlin#gradle-kotlin-dsl-plugins/6.4.1": { - "jar": "sha256-JolZk48cG8O1VeIihdIEVdoPOrCAaEuSfBvK5VTZFNM=", - "module": "sha256-QfjCNSMXc2dWDubRXMC9a8GqRP6x2BjXihzt2+IMC40=", - "pom": "sha256-G9F/hR9bve0OCz16YZzBdxKrmEXqpFu8ypBxX86jEF8=" + "org/gradle/kotlin#gradle-kotlin-dsl-plugins/6.4.2": { + "jar": "sha256-MwhkX0Z7Jm5YhMJkUIIktnKejtwWbm1DX1tibBTg/Rk=", + "module": "sha256-kxqze7wDwJHt/8RtlqYLXk+isLTV2UWLkscm4FpR0NM=", + "pom": "sha256-VGkK7nfKVycLvqXnhrnTPiOvYIzuIVuIDvcq45v5aU8=" }, - "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/6.4.1": { - "pom": "sha256-9FhdUWKX7VtEyA0nq82/XKA0aCx1B4E+8UAHLhDYts4=" + "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/6.4.2": { + "pom": "sha256-Xi2xvrvUHGTWc1VEsphssmofxmiX0ZCXnJC1C4fIXfo=" }, "org/gradle/toolchains#foojay-resolver/1.0.0": { "jar": "sha256-eLhqR9/fdpfJvRXaeJg/2A2nJH1uAvwQa98H4DiLYKg=", @@ -762,146 +762,146 @@ "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" }, - "org/jetbrains/kotlin#abi-tools-api/2.2.20": { - "jar": "sha256-8chm6sXcCI8/0IEQCENAm/TxYSu7mY+6ofaFMlyuDVU=", - "pom": "sha256-HOL7NczYP8vJCuXFmN/bsilS0IVHgElEpbIfLEbKwL0=" + "org/jetbrains/kotlin#abi-tools-api/2.2.21": { + "jar": "sha256-I5kB8xfBibS0zIvF6WaUPcGeOSWVOeZouqXX7xjrkWo=", + "pom": "sha256-kkkKzKD0UFgdVs4FeWHY/6mDVYfmn2bpbQpxdbrOzYU=" }, - "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.2.20": { - "module": "sha256-n+aVWzf+KQtlFiXPnGgea6IKjxLEZYzOUCblk1BaMSk=", - "pom": "sha256-P6gmRiy9hG0YAgLyLFGTQYy5zan2lcmUEjWpsbXBQdk=" + "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.2.21": { + "module": "sha256-SVZZs54wVUHstxLmm2IuE+OK2SQPmoJ8oFhDS9mfIR0=", + "pom": "sha256-JQzsmn5XTCwRF+7PBCHjIAHqDzSwqQHH+k6tb+jd7aQ=" }, - "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.2.20/gradle813": { - "jar": "sha256-OmlZW2x1+/ktMgFodFxpj/cRS4YHhBBQ1ISYgjAG6HE=" + "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.2.21/gradle813": { + "jar": "sha256-J9z0rqpbu2TYYb0p7WDUgvD/2WJEyB4kJrnaxef9xj8=" }, - "org/jetbrains/kotlin#kotlin-assignment-compiler-plugin-embeddable/2.2.20": { - "jar": "sha256-07TapcbMI1Zfj7k2NI84xCGgRhFjdF02rt9E096UJQo=", - "pom": "sha256-L/XBHfd+t6JZdmzdqed47WW6SFxYxhO7ppAoauzi3H0=" + "org/jetbrains/kotlin#kotlin-assignment-compiler-plugin-embeddable/2.2.21": { + "jar": "sha256-JmFrjhshTWLwLRUzHK/3JcToI3ziCtFPXMznJKop588=", + "pom": "sha256-Bhpvb0xNvpCtDeOeUeeKuvtmf+jJsJXODA3qM1aPQh8=" }, - "org/jetbrains/kotlin#kotlin-assignment/2.2.20": { - "module": "sha256-xbfmG95gHQM75qCyXhkxfc9u434wVC/XRsRr/3gBj1o=", - "pom": "sha256-fh3mglHYFXQXuKIXn2YlW8m5zzFTPdkDukFVZlwwXGs=" + "org/jetbrains/kotlin#kotlin-assignment/2.2.21": { + "module": "sha256-GNfXYm3tHJiZC9JhNVjUmrJfY7eGx360iKmdirZaxhM=", + "pom": "sha256-rzH4fPfA2i55da7DPjYB0T/HeWaE0VVTaX3uJJtt7tQ=" }, - "org/jetbrains/kotlin#kotlin-assignment/2.2.20/gradle813": { - "jar": "sha256-MYCcvl5312WyQRFT6huuR2cQQGoXfjmhC/ZKYSOgRfI=" + "org/jetbrains/kotlin#kotlin-assignment/2.2.21/gradle813": { + "jar": "sha256-hxwwVHmuFrFE1AwgTr3/AZEwBejpjasXs2XFRaJZ9R0=" }, "org/jetbrains/kotlin#kotlin-bom/2.0.21": { "pom": "sha256-1Ufg3iVCLZY+IsepRPO13pQ8akmClbUtv/49KJXNm+g=" }, - "org/jetbrains/kotlin#kotlin-build-statistics/2.2.20": { - "jar": "sha256-+2VKT1vFY2h1kXMSnfSRB60J3FtBcrAXda+z+nJXndU=", - "pom": "sha256-tdU2T1fSH/FBgiBei2lf1oZNnYqleApu3EIJWEBHwRU=" + "org/jetbrains/kotlin#kotlin-build-statistics/2.2.21": { + "jar": "sha256-jf37K49n/NzEzuPvkKJa9GfKKVhTsOoBnQAQrOvW8Yo=", + "pom": "sha256-yL9i9tym159DbECxrwnbQvRuv0vNcrMHnfjHJbXAY1g=" }, - "org/jetbrains/kotlin#kotlin-build-tools-api/2.2.20": { - "jar": "sha256-/ZlHs6F2Iahvq9lTr4fzS9K7f4sm2uksHte+dHL0TDs=", - "pom": "sha256-AtR9SHfsMktJbZMTMkXNTTSLZSMDzyfvpj44ry+zzyo=" + "org/jetbrains/kotlin#kotlin-build-tools-api/2.2.21": { + "jar": "sha256-MWRcpSI5siHr0GCgD/+NhRb/3Ii72fTkzX3bQacGjHA=", + "pom": "sha256-Y/3PHe0qtFrXfASZefqkTxkPe7jurE+B+Yd+nfqf2fk=" }, - "org/jetbrains/kotlin#kotlin-build-tools-impl/2.2.20": { - "jar": "sha256-ZHiafwBWWSfy8/LRCfIwV009kwjtXW6Gv8qEPaZIfPc=", - "pom": "sha256-4vQ157rwHeL/kNCoc3r4+b+X/BUuWVuGp2C6ZOjmnfY=" + "org/jetbrains/kotlin#kotlin-build-tools-impl/2.2.21": { + "jar": "sha256-RYtj74/FCgoxgP5ojsG5lXRZkqBcSV2sYeWNEIiSeoA=", + "pom": "sha256-Ln/cogFlzxDnO2L4NfZ+7PQnyCPtYPGdXwButnQ0Wv4=" }, - "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.2.20": { - "jar": "sha256-HGw/gQv+akGry8NLOi72OfHj9K7tOpU6Swl07qT0GIk=", - "pom": "sha256-Bf8CX3+wky+xH6HhzK71KPdgJ9lWaA+INdQ4VCdi4go=" + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.2.21": { + "jar": "sha256-lYj6aWrFUHr3ZP1WYN9olBheEnBOwbw/XLdyr0mH8pU=", + "pom": "sha256-CzPGTyYiujvIKDN4vbdQXyvjMKInWAcDitVDWbM935s=" }, - "org/jetbrains/kotlin#kotlin-compiler-runner/2.2.20": { - "jar": "sha256-+vloNPogBNeL2ORCD1go3j1CckJ9ZHR5gCTqbpz4XN0=", - "pom": "sha256-kbsVJI9OqUS2Mw8xA/HrVF0TvditSuxDe3R6WG57F6k=" + "org/jetbrains/kotlin#kotlin-compiler-runner/2.2.21": { + "jar": "sha256-o6Qi4GvNNaMqeY0ZHvbrs16ms5w1U+lB05wB5jH8XHc=", + "pom": "sha256-HxA9i94I3dYUvZg6vfy3lJE5xgasYM2KaJQf0Pse4SQ=" }, - "org/jetbrains/kotlin#kotlin-daemon-client/2.2.20": { - "jar": "sha256-cO983NwwEHe5s7ohqp6cVadq+z/73+9KtWKmd9GN+kw=", - "pom": "sha256-ihNtDxPrmDpr40/x4WPJznmFXkuiF09Fy0KqpnVT91Q=" + "org/jetbrains/kotlin#kotlin-daemon-client/2.2.21": { + "jar": "sha256-POLKPF17x8h8QUmsLFk9IaeR1ndiKa4SPbZFowF96BQ=", + "pom": "sha256-T2/dvBDZshZ4meNPoRP8mtdcxNbOWKuE+WFLY8BfjaM=" }, - "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.2.20": { - "jar": "sha256-fFyM0vi+rdMoMjm7nKIZoMr6GvAmgrQHsYHhF5cY8vc=", - "pom": "sha256-9Yhmv7yYZ8bWR1ec/3DUKHeZctvd2N5MJXh5y0N0FIk=" + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.2.21": { + "jar": "sha256-kcBnPCLkSwVK4DFNMjhg6+Hzr/Pw68dP/4LEcz3eCb4=", + "pom": "sha256-Fwvb7LpX/wCiuNF+8seeCLhfZ99p2FO6CiWaQYO/uSM=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.2.20": { - "jar": "sha256-T8MqG+ZFynQE4hskRSCI+T6OmT6v/Sbza9Ndv3XGB1I=", - "pom": "sha256-sbbgEXktfKkv7K+/+sSlCPdvA5yfeuijI9GJKIgl9P4=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.2.21": { + "jar": "sha256-NZTEDHAF0ESVL4D3BBcrtv0YRCQQJRlPsWvubUXaLls=", + "pom": "sha256-VErpKrN3QI/B7TBOxBou7EKT4PLhObPS9v0nIF8UY38=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.2.20": { - "jar": "sha256-dgfuXHoMpT+lku58VA7oCJYqe62P7p7Xj+Z0hBRj2V0=", - "module": "sha256-T8vx/H5Uzr/pC5peD7RpYv7Vwi03I52iNfXi37xtUog=", - "pom": "sha256-C5E9oNIYhCAmOpBLtApkD9s1pTWnLwWC/llkHjoMSi4=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.2.21": { + "jar": "sha256-t7/Qf18eCkSvYS60hHTfYyjuD286anNkLORz8wZF4aU=", + "module": "sha256-HnS0hvlEq54Rb5pKriDFL8L5rFI6VS25fdZYFID+lAs=", + "pom": "sha256-m9RXg5guF17un6rUX1/3QVyWrrau8ufPjjUIr7Y51hc=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.2.20/gradle813": { - "jar": "sha256-dgfuXHoMpT+lku58VA7oCJYqe62P7p7Xj+Z0hBRj2V0=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.2.21/gradle813": { + "jar": "sha256-t7/Qf18eCkSvYS60hHTfYyjuD286anNkLORz8wZF4aU=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.2.20": { - "jar": "sha256-dtFu5ZzeHmpwVWtdQEhu+fEcFkOodJPBnE3zMWU4N9k=", - "pom": "sha256-xRuhScfyk1nSWk7RIS4otpNOGkdW9VLAAHvxFE0onB0=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.2.21": { + "jar": "sha256-S0vndO+5WFrw/aGA0zkD2CcuSX33uBuwkfqTOezaRb0=", + "pom": "sha256-uhvOJI5HRY7tRmheuiEreT/7fTfkKd/2cKIT3dEC0MA=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.2.20": { + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.2.21": { "jar": "sha256-7JacXwsJn4I4RiMiOPm9ZPPTdB5i6pBQrS5DL6150KA=", - "module": "sha256-/IW7KUlsw/X5DHjHonejkw7xFg8IQ/iu1ke3TGejtJQ=", - "pom": "sha256-NkQjJURfF7rCH1OGu0k4+D53K4NOWGBT1BRbGnXZ4oU=" + "module": "sha256-kVGuIjeH8cILcLJKEXeJtNFNDMSE5GJzLLIwp5f3W88=", + "pom": "sha256-KKWiq7pbWCk+JKngbmqskmJr4YLGXfyLLbaUlE5wraU=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.2.20": { - "jar": "sha256-U6MhUoJjIGAYUgSaC291OMqLtX/QnYeszRGLxo1D+OQ=", - "module": "sha256-EZdKVPSOCCXpdxML9u9qyZp/216yr53iZa9iTHY2g+U=", - "pom": "sha256-3uDjB7pub1GQPH5DPehSZ10eMOfyLPJGWxglVSZR7fs=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.2.21": { + "jar": "sha256-kI5uXIkLtJ28kmbczyi9sMJYxIZHA5rtcC/p1YZkAYY=", + "module": "sha256-/kRucdWLn1verY7wW2i0mGFzF+G5LUe5qztnTWTydmQ=", + "pom": "sha256-IIRTo2pr5JsHGhwQ6bRAQQZjbJO65b8wxtrFdMQM9bE=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/2.2.20": { - "module": "sha256-3CS/pH4EQigykOIfBpoFYUHR8IjWy57Kouqs4bR7a4w=", - "pom": "sha256-ucP9Lr1UhNYMX+DbeqEIeDA+7d/JP5Qvc1wHupmBh8w=" + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.2.21": { + "module": "sha256-TiOAKj1TACSsRlrNJkh9ajpwLugEzWEzScUQjeq/S6I=", + "pom": "sha256-5bWdPJpGu38Pe0nPyI1pjaVBpL0JClwX2aAKtHIQc4w=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/2.2.20/gradle813": { - "jar": "sha256-XTJbXCxdS8i/RBRdJOtNS+sGDRPRHr5IiYk27VzRVk4=" + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.2.21/gradle813": { + "jar": "sha256-t6UoZcal4WDSz2Hk1CPORKaiDeCmsj0DQEttAaKBFzc=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.2.20": { - "module": "sha256-P7tFda43xKd2rrhtj/k8aqEbDPLadXScUyDiWFCwIp4=", - "pom": "sha256-PG1GnpFfuzCWrEy4wvRsedAnw8WQ5lihBoihVx61eNg=" + "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.2.21": { + "module": "sha256-3E/A81pVMqU6Qy7k/iJDEyVIVV8nX2PuaZDVAzP4zio=", + "pom": "sha256-JfRGZjOd7uAQanbqXvzPqzSvz9uWCnZy+4h/cboNqL0=" }, - "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.2.20": { - "jar": "sha256-OYK+RbEpMOIYGbWJ2zcHyOhM4le/Ks5/xi/I3zaPWz4=", - "pom": "sha256-CzAJtJQmv6F3qtlLSBCbjKVMck6i5sUGgmo6lc9ZEOE=" + "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.2.21": { + "jar": "sha256-WLxFHOYu1r79B3rBB+pfEzRD503XjPOkpI+GjmGDfos=", + "pom": "sha256-yJkqd6ltK5+NgTdMQL1x0y4h2f8c23mdFdSXGLEqEuE=" }, "org/jetbrains/kotlin#kotlin-metadata-jvm/2.2.20": { "jar": "sha256-hSTqyQ9+jg8TZog/LGyCDJO/ph3z12hXyNPoA89nMV0=", "pom": "sha256-e2qAtqLSZ2oEIvaWg4EyMVQlUfYbMgxochz7nh9ZCdA=" }, - "org/jetbrains/kotlin#kotlin-native-utils/2.2.20": { - "jar": "sha256-UBd3SirqQf+HEhNxFs1NgAP+mroSAMEG5lcw/rW7dEI=", - "pom": "sha256-U+++4FpxIhiQYPXuXspodjnOr+KfXlmW3phiopxnJyU=" + "org/jetbrains/kotlin#kotlin-native-utils/2.2.21": { + "jar": "sha256-50sUQG2uCgI4gYfGLBcxGDun0NjmBnVoLeURqQr6bFY=", + "pom": "sha256-1SJqfIYGn6mnIavJeuTaFaQO0WicirVQXhoa0tsg3F8=" }, "org/jetbrains/kotlin#kotlin-reflect/1.6.10": { "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak=" }, - "org/jetbrains/kotlin#kotlin-reflect/2.2.20": { - "jar": "sha256-ggkIOkp8TkdtmEKweDCPqWqW8Hpr2Z8F81hu4TKJqyY=", - "pom": "sha256-TidHQGbbg/uixZB0KJunEr6MhRV83guQUCmkRcJ19bo=" + "org/jetbrains/kotlin#kotlin-reflect/2.2.21": { + "jar": "sha256-RDgKvzfSRc5cDylPQ1EtHDmllkK/pGOSLHTpaHfPSfg=", + "pom": "sha256-5atrEFYKWlJWLDXNvnHdvkJ9Uetb/HAdzU9rlJvZ4D8=" }, - "org/jetbrains/kotlin#kotlin-sam-with-receiver-compiler-plugin-embeddable/2.2.20": { - "jar": "sha256-WRNzsEtDtom0HgvIYqlslEx+DDHSMIH0aooe48a6Edc=", - "pom": "sha256-iSompWD3bch9NVEw9Akk2ZtL1gB212R0Ff6YkYjSLA4=" + "org/jetbrains/kotlin#kotlin-sam-with-receiver-compiler-plugin-embeddable/2.2.21": { + "jar": "sha256-yweF5qeHDS9eqW9kcCDigS3snXAjAzMZu9sc5+XmVUg=", + "pom": "sha256-CcOMhkgRKRfUMPoji0Nxz4DbE86Dgu6KK6g0EPmd0yY=" }, - "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.2.20": { - "module": "sha256-c7Eee8xPZZeWcN8Vx1aADHOiHaH9EJL56sWfON+cVjE=", - "pom": "sha256-LhNnvGXeGLQPpn2H9+JGXj4dYUviuLCdOQZRZ8JwK+M=" + "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.2.21": { + "module": "sha256-2iXbk8+OvwbGM1L4PnIK14e8cD/Q54DxGRjQii7JgE4=", + "pom": "sha256-IU7uupPxsDquZnoJfbq/6z2XRel5zU0LJGLzj+vHd2Q=" }, - "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.2.20/gradle813": { - "jar": "sha256-YZ6b4NCK9+W0TRIkJQ0jXiLvimiKzISPO4kC+mZAQws=" + "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.2.21/gradle813": { + "jar": "sha256-tHyUm4u4DOaAcj+Lw8hw8ifDZHel6wLCtz1hEY1GMKY=" }, - "org/jetbrains/kotlin#kotlin-script-runtime/2.2.20": { - "jar": "sha256-XIvV3Xrh6i7rJ3j9vqoZpWIYSXX2yrigu2d55BkHMa4=", - "pom": "sha256-IpOhQenagKfpjYXtKkkuldsMAWW86rC3Klzp4tkrCAc=" + "org/jetbrains/kotlin#kotlin-script-runtime/2.2.21": { + "jar": "sha256-KxUZtCe1FNFTbBtCVnSwP+kUr2N5JAKOmVnGYlRC31E=", + "pom": "sha256-h2elQPxdviC34Sg6lfUQKX5sDJiy6sLtxNBhKi0PLq8=" }, - "org/jetbrains/kotlin#kotlin-scripting-common/2.2.20": { - "jar": "sha256-+5n/fwzZUtpo1UjT89ZErlB4sLlvybrwZewUZqKTuAU=", - "pom": "sha256-iTjGIFKXW7uW3OotqaeNS2sk2vLwnTWMGnqEHxaMtzo=" + "org/jetbrains/kotlin#kotlin-scripting-common/2.2.21": { + "jar": "sha256-QU7ZHD9eRJKyPLlTeEK0ZRA44l2thBB5OfQ0wiA/KpI=", + "pom": "sha256-7CWpeZRRdbrSFlRqSEsLj0SoZwVZGV4kCzR/H9oXcN8=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.2.20": { - "jar": "sha256-2GJhDAAzQuUIjKIcRAQix9ijcA4ZnWA/ehAnjESIR2E=", - "pom": "sha256-PW9vFZH6P3r14jFlxowu4BclFYZFQ09eMBdF5kfHVhE=" + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.2.21": { + "jar": "sha256-2TS50MJGvAliS3Bor1itV87xHb4q3bx7GdJQzOQt4ck=", + "pom": "sha256-EUhmLJXzbgCYEXj7LYldBrLs59BX7YRTLdNTu9bDVlA=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.2.20": { - "jar": "sha256-e3kSNZL//r81xhag/xBDMscc3mN6ZX4JrbXfbD+cA84=", - "pom": "sha256-+l+wJ+4qSbPb/zh3VBtC+3CuzMN7oC4dOthipcZyVLc=" + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.2.21": { + "jar": "sha256-eIowYMjnmX+K4WulwCgNBQBa8KQgKfGMsQxWJbl5+sM=", + "pom": "sha256-DKT5XDLUrpVOF06kHlutYseNvJOmTEUHb96czISrNgk=" }, - "org/jetbrains/kotlin#kotlin-scripting-jvm/2.2.20": { - "jar": "sha256-qR+5BJY0oyum09LpGgy5mD4KpOccDC4bKDg4qOBhYx8=", - "pom": "sha256-0df8RWSBne6v6OvdcfbyGBf/xVjr0U9HpW6NyTaW3Rk=" + "org/jetbrains/kotlin#kotlin-scripting-jvm/2.2.21": { + "jar": "sha256-g4IMX8xdKPBF+RTs1ZALu8+BFbDXAHM03gaf5scGaeY=", + "pom": "sha256-nR1Dsi27irmp3yJ6bVRYNB2v/sFQ73WV12XMXsvxeQg=" }, "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": { "jar": "sha256-M9FI2w4R3r0NkGd9KCQrztkH+cd3MAAP1ZeGcIkDnYY=", @@ -919,26 +919,26 @@ "jar": "sha256-FcjArLMRSDwGjRaXUBllR0tw39gKx5WA7KOgPPUeSh0=", "pom": "sha256-MQ1tXGVBPjEQuUAr2AdfyuP0vlGdH9kHMTahj+cnvFc=" }, - "org/jetbrains/kotlin#kotlin-stdlib/2.2.20": { - "jar": "sha256-iDbM/9NYX63amQEkSyDUKQHS881YEFjYQ04v+rzzo+c=", - "module": "sha256-yRj1IU0CGnLjdn8nVul9EDpSbgTxQj2jZj79+1hH25U=", - "pom": "sha256-SosIbmQxvPYjY39Ssv8ZLhrbkTg4dC5cDupwqN7kKcQ=" + "org/jetbrains/kotlin#kotlin-stdlib/2.2.21": { + "jar": "sha256-ZVij0jPaVqIJNLMhWfnbX4btWBbvCY94osIj3Gq7ed0=", + "module": "sha256-v7xlfd06jjfkyK1BeWjV6wsLFxyfzkj5YsKtMu5DTCE=", + "pom": "sha256-zzH5IxlsY67ezQpXwkJpvTcCpOR8C/C9ZLWtpd5SInI=" }, - "org/jetbrains/kotlin#kotlin-tooling-core/2.2.20": { + "org/jetbrains/kotlin#kotlin-tooling-core/2.2.21": { "jar": "sha256-dAFOxPPveM59p+Pmlk8sUmoxIdXFj++MopeeXzRFgvQ=", - "pom": "sha256-jvep2QYs59w/xlVxXdAoqZRLeElhPgEYR8XWs7mSgXE=" + "pom": "sha256-3TPmGTLBut893oXyBPY0yABL6WQnw6HKiGbMAR1xHfo=" }, - "org/jetbrains/kotlin#kotlin-util-io/2.2.20": { - "jar": "sha256-1DGva+puLcmInE/iawc84VfxEchgj+laGL/gi4F8/3Q=", - "pom": "sha256-xqXQGEjNBAz8j3uuYjLXktcFwpOi2nJmrmJszbNdagM=" + "org/jetbrains/kotlin#kotlin-util-io/2.2.21": { + "jar": "sha256-JmqkAmoQb1n878PxUXaIcK+RzvFeQBH6wKofH1Z9SfQ=", + "pom": "sha256-67UM9Bx0RJdvAsL5FbQXMlcsXzmUplgciOZN4LmY970=" }, - "org/jetbrains/kotlin#kotlin-util-klib-metadata/2.2.20": { - "jar": "sha256-vuSQHKU6WiHA22RZAdKwcK/2gkAkF91XiODjWTZFcTs=", - "pom": "sha256-vtAGUSIGX65328DEb/xBRqaFy7GLijApq9XaO/qhECc=" + "org/jetbrains/kotlin#kotlin-util-klib-metadata/2.2.21": { + "jar": "sha256-AiuVo9/tlJ18LkeCC82YNu4Fe3IVE/dzNh5DM/bHb4w=", + "pom": "sha256-87Mj0f6eM9x+nF7XfzBSg//WN4FdiMUHlFQRvXqiow8=" }, - "org/jetbrains/kotlin#kotlin-util-klib/2.2.20": { - "jar": "sha256-7XyAlrK75HetF8MXjeuoyDr1MourNr/iEJEL1bQZI0w=", - "pom": "sha256-2mwiR3qvQt2hbYWa2unj7Yq8khzLp/9RYTTMi9NZqpI=" + "org/jetbrains/kotlin#kotlin-util-klib/2.2.21": { + "jar": "sha256-VUAKkX5rmEphl+rni1tS7b3yzW4KfDhD95VEgbr7JD8=", + "pom": "sha256-o1Lf02Uns67w98DsZJDeydX8m+xPM02ETK6U+BdD3zA=" }, "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.8.0": { "pom": "sha256-Ejnp2+E5fNWXE0KVayURvDrOe2QYQuQ3KgiNz6i5rVU=" @@ -1203,11 +1203,19 @@ "com/fasterxml/jackson#jackson-parent/2.20": { "pom": "sha256-tDt/XGLoaxZPrnCuF9aRHF22B5mvAQVzYK/aguSEW+U=" }, + "com/fasterxml/jackson/core#jackson-annotations/2.17.2": { + "module": "sha256-KMxD6Y54gYA+HoKFIeOKt67S+XejbCVR3ReQ9DDz688=", + "pom": "sha256-Q3gYTWCK3Nu7BKd4vGRmhj8HpFUqcgREZckQQD+ewLs=" + }, "com/fasterxml/jackson/core#jackson-annotations/2.20": { "jar": "sha256-lZov+y1ZFDb1Hxg8alIfyJNHkS9xG/DK4AjN8EXZUxk=", "module": "sha256-wHDxTsg1jQlcAurootZcsAzLoOXFqnOwASlDM/5GiXE=", "pom": "sha256-TXQMRHjdCNCJ7NxtBjIopVoRp+jkl9pDOPhy+BFXlKQ=" }, + "com/fasterxml/jackson/core#jackson-core/2.17.2": { + "module": "sha256-OCgvt1xzPSOV3TTcC1nsy7Q6p8wxohomFrqqivy38jY=", + "pom": "sha256-F4IeGYjoMnB6tHGvGjBvSl7lATTyLY0nF7WNqFnrNbs=" + }, "com/fasterxml/jackson/core#jackson-core/2.19.2": { "jar": "sha256-qnfq8pKTqGjEc3IZT3xSh9d9k3CwTqJdP//B5JBLWIA=", "module": "sha256-Ua8uZ3g6XXJETeajB8jj7ZMAklbNJ+ghkVVZohZcCUI=", @@ -1897,9 +1905,6 @@ "net/java/dev/jna#jna/5.13.0": { "pom": "sha256-9RXCV4F49FJH7Mp6nh2xCVMbHELyQk4lPO6w9rjUI3Q=" }, - "net/java/dev/jna#jna/5.17.0": { - "pom": "sha256-UBoP8F2EpK0Q9t4lvpT0k5i3CjG+jzoO2fTGtE++/uQ=" - }, "net/java/dev/jna#jna/5.18.1": { "jar": "sha256-JgxLHiKx254RDuRBxPE84RX4QfpIxB14dQmGIUs5VVc=", "pom": "sha256-mLYq5v8oDXR/s1n8QuSP7RE9Rbw3Kagj3DC4MIqAZkU=" diff --git a/pkgs/by-name/ja/jabref/package.nix b/pkgs/by-name/ja/jabref/package.nix index 2e31f41c8b30..0a38413359f9 100644 --- a/pkgs/by-name/ja/jabref/package.nix +++ b/pkgs/by-name/ja/jabref/package.nix @@ -54,6 +54,7 @@ let url = ltwaUrl; hash = "sha256-jnS8Y9x8eg2L3L3RPnS6INTs19mEtwzfNIjJUw6HtIY="; }; + kotlinDslVersion = "6.4.2"; in stdenv.mkDerivation rec { version = "6.0-alpha.4"; @@ -93,6 +94,9 @@ stdenv.mkDerivation rec { sed -i -e '1a //REPOS file://${mitmCache}/https/repo.maven.apache.org/maven2,file://${mitmCache}/https/plugins.gradle.org/m2' build-support/src/main/java/*.java + substituteInPlace build-logic/build.gradle.kts \ + --replace-fail '`kotlin-dsl`' 'id("org.gradle.kotlin.kotlin-dsl") version "${kotlinDslVersion}"' + pushd jablib # Disable update check diff --git a/pkgs/development/libraries/jemalloc/o3-to-o2.patch b/pkgs/by-name/je/jemalloc/o3-to-o2.patch similarity index 100% rename from pkgs/development/libraries/jemalloc/o3-to-o2.patch rename to pkgs/by-name/je/jemalloc/o3-to-o2.patch diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/by-name/je/jemalloc/package.nix similarity index 100% rename from pkgs/development/libraries/jemalloc/default.nix rename to pkgs/by-name/je/jemalloc/package.nix diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/by-name/ke/keybinder/package.nix similarity index 97% rename from pkgs/development/libraries/keybinder/default.nix rename to pkgs/by-name/ke/keybinder/package.nix index 1c083b5ee98c..958d32612857 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/by-name/ke/keybinder/package.nix @@ -9,10 +9,12 @@ gnome-common, gtk-doc, gtk2, - lua, + lua5_1, gobject-introspection, }: - +let + lua = lua5_1; +in stdenv.mkDerivation rec { pname = "keybinder"; version = "0.3.1"; diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/by-name/ke/keybinder3/package.nix similarity index 92% rename from pkgs/development/libraries/keybinder3/default.nix rename to pkgs/by-name/ke/keybinder3/package.nix index c1d19455c597..7399f3dc0568 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/by-name/ke/keybinder3/package.nix @@ -9,6 +9,8 @@ gnome-common, gtk-doc, gtk3, + gtk3-x11, + gtk3' ? (if stdenv.hostPlatform.isDarwin then gtk3-x11 else gtk3), libX11, libXext, libXrender, @@ -37,7 +39,7 @@ stdenv.mkDerivation rec { gobject-introspection ]; buildInputs = [ - gtk3 + gtk3' libX11 libXext libXrender diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/by-name/kr/krb5/package.nix similarity index 98% rename from pkgs/development/libraries/kerberos/krb5.nix rename to pkgs/by-name/kr/krb5/package.nix index 3891c13bb5b8..c4f6ac9b8ac9 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/by-name/kr/krb5/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, fetchpatch, - bootstrap_cmds, + darwin, byacc, # can also use bison, but byacc has fewer dependencies keyutils, openssl, @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { pkg-config ] # Provides the mig command used by the build scripts - ++ lib.optional stdenv.hostPlatform.isDarwin bootstrap_cmds; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.bootstrap_cmds; buildInputs = [ openssl diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/by-name/li/libagar/package.nix similarity index 100% rename from pkgs/development/libraries/libagar/default.nix rename to pkgs/by-name/li/libagar/package.nix diff --git a/pkgs/development/libraries/libagar/libagar_test.nix b/pkgs/by-name/li/libagar_test/package.nix similarity index 100% rename from pkgs/development/libraries/libagar/libagar_test.nix rename to pkgs/by-name/li/libagar_test/package.nix diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/by-name/li/libao/package.nix similarity index 92% rename from pkgs/development/libraries/libao/default.nix rename to pkgs/by-name/li/libao/package.nix index 9363e18da240..7e19c4782258 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/by-name/li/libao/package.nix @@ -8,7 +8,8 @@ libpulseaudio, alsa-lib, libcap, - usePulseAudio, + config, + usePulseAudio ? config.pulseaudio or (lib.meta.availableOn stdenv.hostPlatform libpulseaudio), }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/by-name/li/libbap/package.nix similarity index 88% rename from pkgs/development/libraries/libbap/default.nix rename to pkgs/by-name/li/libbap/package.nix index 91957222f168..8b143e3c430b 100644 --- a/pkgs/development/libraries/libbap/default.nix +++ b/pkgs/by-name/li/libbap/package.nix @@ -2,13 +2,9 @@ lib, stdenv, fetchFromGitHub, - bap, - ocaml, - findlib, - ctypes, - ctypes-foreign, autoreconfHook, which, + ocaml-ng, }: stdenv.mkDerivation { @@ -25,10 +21,13 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook which + ] + ++ (with ocaml-ng.ocamlPackages_4_14; [ ocaml findlib - ]; - buildInputs = [ + ]); + + buildInputs = with ocaml-ng.ocamlPackages_4_14; [ bap ctypes ctypes-foreign diff --git a/pkgs/development/libraries/libbutl/install-h-files.patch b/pkgs/by-name/li/libbutl/install-h-files.patch similarity index 100% rename from pkgs/development/libraries/libbutl/install-h-files.patch rename to pkgs/by-name/li/libbutl/install-h-files.patch diff --git a/pkgs/development/libraries/libbutl/default.nix b/pkgs/by-name/li/libbutl/package.nix similarity index 84% rename from pkgs/development/libraries/libbutl/default.nix rename to pkgs/by-name/li/libbutl/package.nix index c653d43ea45c..5996967cef24 100644 --- a/pkgs/development/libraries/libbutl/default.nix +++ b/pkgs/by-name/li/libbutl/package.nix @@ -1,8 +1,9 @@ { lib, stdenv, - build2, - DarwinTools, + # Dependency of build2, so we must break cycle for this + build2-bootstrap, + darwin, fetchurl, libuuid, enableShared ? !stdenv.hostPlatform.isStatic, @@ -25,10 +26,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - build2 + build2-bootstrap ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - DarwinTools + darwin.DarwinTools ]; patches = [ @@ -41,7 +42,7 @@ stdenv.mkDerivation rec { # Should be true for anything built with build2, # but especially important when bootstrapping - disallowedReferences = [ build2 ]; + disallowedReferences = [ build2-bootstrap ]; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace libbutl/uuid-linux.cxx \ @@ -49,7 +50,7 @@ stdenv.mkDerivation rec { ''; build2ConfigureFlags = [ - "config.bin.lib=${build2.configSharedStatic enableShared enableStatic}" + "config.bin.lib=${build2-bootstrap.configSharedStatic enableShared enableStatic}" ]; doCheck = true; diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/by-name/li/libcdr/package.nix similarity index 97% rename from pkgs/development/libraries/libcdr/default.nix rename to pkgs/by-name/li/libcdr/package.nix index eca26ecfd7ea..bec87a9a76fa 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/by-name/li/libcdr/package.nix @@ -4,7 +4,7 @@ fetchurl, libwpg, libwpd, - lcms, + lcms2, pkg-config, librevenge, icu, @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ libwpg libwpd - lcms + lcms2 librevenge icu boost diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/by-name/li/libcec/package.nix similarity index 100% rename from pkgs/development/libraries/libcec/default.nix rename to pkgs/by-name/li/libcec/package.nix diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/by-name/li/libcec_platform/package.nix similarity index 100% rename from pkgs/development/libraries/libcec/platform.nix rename to pkgs/by-name/li/libcec_platform/package.nix diff --git a/pkgs/development/libraries/libcryptui/debian-patches.nix b/pkgs/by-name/li/libcryptui/debian-patches.nix similarity index 100% rename from pkgs/development/libraries/libcryptui/debian-patches.nix rename to pkgs/by-name/li/libcryptui/debian-patches.nix diff --git a/pkgs/development/libraries/libcryptui/debian-patches.txt b/pkgs/by-name/li/libcryptui/debian-patches.txt similarity index 100% rename from pkgs/development/libraries/libcryptui/debian-patches.txt rename to pkgs/by-name/li/libcryptui/debian-patches.txt diff --git a/pkgs/development/libraries/libcryptui/default.nix b/pkgs/by-name/li/libcryptui/package.nix similarity index 93% rename from pkgs/development/libraries/libcryptui/default.nix rename to pkgs/by-name/li/libcryptui/package.nix index 5a476aeba795..5ce3f093ead0 100644 --- a/pkgs/development/libraries/libcryptui/default.nix +++ b/pkgs/by-name/li/libcryptui/package.nix @@ -10,6 +10,8 @@ glib, gnome, gtk3, + gtk3-x11, + gtk3' ? if stdenv.hostPlatform.isDarwin then gtk3-x11 else gtk3, gtk-doc, gnupg, gpgme, @@ -37,14 +39,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config dbus-glib # dbus-binding-tool - gtk3 # AM_GLIB_GNU_GETTEXT + gtk3' # AM_GLIB_GNU_GETTEXT gtk-doc intltool autoreconfHook ]; buildInputs = [ glib - gtk3 + gtk3' gnupg gpgme dbus-glib diff --git a/pkgs/development/libraries/libcxxrt/default.nix b/pkgs/by-name/li/libcxxrt/package.nix similarity index 78% rename from pkgs/development/libraries/libcxxrt/default.nix rename to pkgs/by-name/li/libcxxrt/package.nix index 228106ac5caf..aee1dcb01ff5 100644 --- a/pkgs/development/libraries/libcxxrt/default.nix +++ b/pkgs/by-name/li/libcxxrt/package.nix @@ -1,12 +1,19 @@ { lib, stdenv, + overrideCC, + buildPackages, + stdenv' ? + if stdenv.hostPlatform.useLLVM or false then + overrideCC stdenv buildPackages.llvmPackages.tools.clangNoLibcxx + else + stdenv, fetchFromGitHub, cmake, unstableGitUpdater, }: -stdenv.mkDerivation { +stdenv'.mkDerivation { pname = "libcxxrt"; version = "4.0.10-unstable-2025-02-25"; @@ -32,7 +39,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $dev/include $out/lib cp ../src/cxxabi.h $dev/include - cp lib/libcxxrt${stdenv.hostPlatform.extensions.library} $out/lib + cp lib/libcxxrt${stdenv'.hostPlatform.extensions.library} $out/lib ''; passthru = { diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/by-name/li/libdvdnav/package.nix similarity index 100% rename from pkgs/development/libraries/libdvdnav/default.nix rename to pkgs/by-name/li/libdvdnav/package.nix diff --git a/pkgs/development/libraries/libdvdnav/4.2.1.nix b/pkgs/by-name/li/libdvdnav_4_2_1/package.nix similarity index 96% rename from pkgs/development/libraries/libdvdnav/4.2.1.nix rename to pkgs/by-name/li/libdvdnav_4_2_1/package.nix index 6b72938f7811..2af5f90057a8 100644 --- a/pkgs/development/libraries/libdvdnav/4.2.1.nix +++ b/pkgs/by-name/li/libdvdnav_4_2_1/package.nix @@ -3,9 +3,11 @@ stdenv, fetchurl, pkg-config, - libdvdread, + libdvdread_4_9_9, }: - +let + libdvdread = libdvdread_4_9_9; +in stdenv.mkDerivation rec { pname = "libdvdnav"; version = "4.2.1"; diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/by-name/li/libdvdread/package.nix similarity index 100% rename from pkgs/development/libraries/libdvdread/default.nix rename to pkgs/by-name/li/libdvdread/package.nix diff --git a/pkgs/development/libraries/libdvdread/4.9.9.nix b/pkgs/by-name/li/libdvdread_4_9_9/package.nix similarity index 100% rename from pkgs/development/libraries/libdvdread/4.9.9.nix rename to pkgs/by-name/li/libdvdread_4_9_9/package.nix diff --git a/pkgs/development/libraries/libextractor/gst-hardcode-plugins.patch b/pkgs/by-name/li/libextractor/gst-hardcode-plugins.patch similarity index 100% rename from pkgs/development/libraries/libextractor/gst-hardcode-plugins.patch rename to pkgs/by-name/li/libextractor/gst-hardcode-plugins.patch diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/by-name/li/libextractor/package.nix similarity index 100% rename from pkgs/development/libraries/libextractor/default.nix rename to pkgs/by-name/li/libextractor/package.nix diff --git a/pkgs/development/libraries/libffi/freebsd-tsan-pthread.patch b/pkgs/by-name/li/libffiReal/freebsd-tsan-pthread.patch similarity index 100% rename from pkgs/development/libraries/libffi/freebsd-tsan-pthread.patch rename to pkgs/by-name/li/libffiReal/freebsd-tsan-pthread.patch diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/by-name/li/libffiReal/package.nix similarity index 100% rename from pkgs/development/libraries/libffi/default.nix rename to pkgs/by-name/li/libffiReal/package.nix diff --git a/pkgs/development/libraries/libffi/3.3.nix b/pkgs/by-name/li/libffi_3_3/package.nix similarity index 100% rename from pkgs/development/libraries/libffi/3.3.nix rename to pkgs/by-name/li/libffi_3_3/package.nix diff --git a/pkgs/development/libraries/libgda/0001-gcc14-fix.patch b/pkgs/by-name/li/libgda5/0001-gcc14-fix.patch similarity index 100% rename from pkgs/development/libraries/libgda/0001-gcc14-fix.patch rename to pkgs/by-name/li/libgda5/0001-gcc14-fix.patch diff --git a/pkgs/development/libraries/libgda/5.x.nix b/pkgs/by-name/li/libgda5/package.nix similarity index 100% rename from pkgs/development/libraries/libgda/5.x.nix rename to pkgs/by-name/li/libgda5/package.nix diff --git a/pkgs/development/libraries/libgda/6.x.nix b/pkgs/by-name/li/libgda6/package.nix similarity index 100% rename from pkgs/development/libraries/libgda/6.x.nix rename to pkgs/by-name/li/libgda6/package.nix diff --git a/pkgs/development/libraries/libgnome-games-support/default.nix b/pkgs/by-name/li/libgnome-games-support/package.nix similarity index 100% rename from pkgs/development/libraries/libgnome-games-support/default.nix rename to pkgs/by-name/li/libgnome-games-support/package.nix diff --git a/pkgs/development/libraries/libgnome-games-support/2.0.nix b/pkgs/by-name/li/libgnome-games-support_2_0/package.nix similarity index 100% rename from pkgs/development/libraries/libgnome-games-support/2.0.nix rename to pkgs/by-name/li/libgnome-games-support_2_0/package.nix diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/by-name/li/libhandy/package.nix similarity index 100% rename from pkgs/development/libraries/libhandy/default.nix rename to pkgs/by-name/li/libhandy/package.nix diff --git a/pkgs/development/libraries/libhandy/0.x.nix b/pkgs/by-name/li/libhandy_0/package.nix similarity index 94% rename from pkgs/development/libraries/libhandy/0.x.nix rename to pkgs/by-name/li/libhandy_0/package.nix index f6976ba19e0b..d1ef1ede527f 100644 --- a/pkgs/development/libraries/libhandy/0.x.nix +++ b/pkgs/by-name/li/libhandy_0/package.nix @@ -1,3 +1,4 @@ +# Needed for apps that still depend on the unstable version of the library (not libhandy-1) { lib, stdenv, diff --git a/pkgs/by-name/li/libivykis/package.nix b/pkgs/by-name/li/libivykis/package.nix index ecb9a03dca77..e6232dd1daed 100644 --- a/pkgs/by-name/li/libivykis/package.nix +++ b/pkgs/by-name/li/libivykis/package.nix @@ -27,6 +27,12 @@ stdenv.mkDerivation rec { protobufc ]; + outputs = [ + "out" + "dev" + "man" + ]; + meta = { homepage = "https://libivykis.sourceforge.net/"; description = '' diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix index 8117d0a1987c..a50a2930e7e4 100644 --- a/pkgs/by-name/lu/luau/package.nix +++ b/pkgs/by-name/lu/luau/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "luau"; - version = "0.704"; + version = "0.705"; src = fetchFromGitHub { owner = "luau-lang"; repo = "luau"; tag = finalAttrs.version; - hash = "sha256-4fqtp8iWOfqymikjT8uluuqK2//pZbZ236NJCmz+9WE="; + hash = "sha256-M0niHRtx/Xu3H5CJXbqB2VCXFsthvPDNcr29egY3ncI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/mv/mvoice/package.nix b/pkgs/by-name/mv/mvoice/package.nix new file mode 100644 index 000000000000..d5d9b1edb92f --- /dev/null +++ b/pkgs/by-name/mv/mvoice/package.nix @@ -0,0 +1,82 @@ +{ + lib, + stdenv, + gettext, + fltk-minimal, + alsa-lib, + opendht, + msgpack-cxx, + fmt, + gnutls, + nlohmann_json, + curl, + copyDesktopItems, + makeDesktopItem, + fetchFromGitHub, +}: +stdenv.mkDerivation { + pname = "mvoice"; + version = "0-unstable-2025-09-19"; + + src = fetchFromGitHub { + owner = "n7tae"; + repo = "mvoice"; + rev = "aef3662ee6ef86ecb10a71dd686ca41a067162c0"; + hash = "sha256-FosfD1949shlPXq594gdqodlXM3cGKpFi68tc+/YQ4g="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + copyDesktopItems + fltk-minimal + gettext + ]; + + buildInputs = [ + alsa-lib + curl + fltk-minimal + fmt + gnutls + msgpack-cxx + nlohmann_json + opendht + ]; + + desktopItems = [ + (makeDesktopItem { + name = "mvoice"; + desktopName = "MVoice"; + comment = "MVoice by N7TAE - M17 figital voice gateway"; + exec = "mvoice"; + categories = [ + "Network" + "X-Ham Radio" + ]; + }) + ]; + + postPatch = '' + # fix hardcoded paths in Makefile + substituteInPlace Makefile \ + --replace-fail "g++" "\$(CXX)" \ + --replace-fail "/bin/cp" "cp" + ''; + + makeFlags = [ + "BASEDIR=$(out)" + "CFGDIR=.config/mvoice" + "DEBUG=false" + "USE44100=false" + "USE_DHT=true" + ]; + + meta = { + description = "M17 digital voice gateway and module for voice and data modes"; + homepage = "https://github.com/n7tae/mvoice"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.juliabru ]; + }; +} diff --git a/pkgs/by-name/ne/netcoredbg/deps.json b/pkgs/by-name/ne/netcoredbg/deps.json index 66a3323b62c1..47ee807db09c 100644 --- a/pkgs/by-name/ne/netcoredbg/deps.json +++ b/pkgs/by-name/ne/netcoredbg/deps.json @@ -31,63 +31,63 @@ }, { "pname": "Microsoft.Diagnostics.DbgShim", - "version": "9.0.621003", - "hash": "sha256-xdRwwLonXgqp4G+HWmFe5pEdv/x0L51/8jOqV5allZ4=" + "version": "9.0.652701", + "hash": "sha256-EVWVR132N7BTBxNTlBL/EWz8hd/Rxqra0R4xnKcN0pw=" }, { "pname": "Microsoft.Diagnostics.DbgShim.linux-arm", - "version": "9.0.621003", - "hash": "sha256-wcr6S8ktct8XNtXnEOCUHqA13N+7rQytgGkUsp1j4aU=" + "version": "9.0.652701", + "hash": "sha256-FVr/K2CV4kLZH1dRLg7201msmYvdnVJdtdYz/m02N/Y=" }, { "pname": "Microsoft.Diagnostics.DbgShim.linux-arm64", - "version": "9.0.621003", - "hash": "sha256-OGsfVeZ4LcgOb2aM/e38Kyw9YGBn0t0uH8qgFdj8SIA=" + "version": "9.0.652701", + "hash": "sha256-9EsI/x61T839NH0UUoqG20nney5V365ZCFR4VJJ0jjM=" }, { "pname": "Microsoft.Diagnostics.DbgShim.linux-musl-arm", - "version": "9.0.621003", - "hash": "sha256-ZUno/Sd0UWYVVD20sJj/HleDfLcb7kf32j5NvIAYSMc=" + "version": "9.0.652701", + "hash": "sha256-RLfYL/X6kpEn5oVCtbOjLAMenI2IrKDtPAInk8HCexc=" }, { "pname": "Microsoft.Diagnostics.DbgShim.linux-musl-arm64", - "version": "9.0.621003", - "hash": "sha256-SKrqZiGnDdisdCIIETozCuSgj3JCAZeWfo2Ru/sMmOw=" + "version": "9.0.652701", + "hash": "sha256-TSdYOwDvdoZSm1ZamYOIIZFtuoAXTC8uT030o9x9gGQ=" }, { "pname": "Microsoft.Diagnostics.DbgShim.linux-musl-x64", - "version": "9.0.621003", - "hash": "sha256-/kEBxB4puJJHwC71W2QQlOMykKCeNGvNy2j6s91g6jc=" + "version": "9.0.652701", + "hash": "sha256-8gfOZqsncJU9tu2zBW0P4leAh00hQoKr2wGFEdsGAYM=" }, { "pname": "Microsoft.Diagnostics.DbgShim.linux-x64", - "version": "9.0.621003", - "hash": "sha256-rW9QGI1awjHBHWaMwFtfhgXuR3X/PBxuks0DgnT2684=" + "version": "9.0.652701", + "hash": "sha256-5tGGBHkvJp1foB3fkrgKqVPR1nkiTDemPNG0FQ/2WhY=" }, { "pname": "Microsoft.Diagnostics.DbgShim.osx-arm64", - "version": "9.0.621003", - "hash": "sha256-BXi0IePavjClLQcSrXZXGOqkkoymdecw9ZFf5w0mpRs=" + "version": "9.0.652701", + "hash": "sha256-vJNeE3v2hiAqD+joH1+ef6lmQ0hE/NQvce1z4oV3Cug=" }, { "pname": "Microsoft.Diagnostics.DbgShim.osx-x64", - "version": "9.0.621003", - "hash": "sha256-FXkjxK3Bq4twUJ69aqsCgv2hNpO2Lkuz7EPAtqxJWd0=" + "version": "9.0.652701", + "hash": "sha256-dDtcRaRg3GoMDMYZ3MEVR1LEBbBHFZpIteZzaAo/GVs=" }, { "pname": "Microsoft.Diagnostics.DbgShim.win-arm64", - "version": "9.0.621003", - "hash": "sha256-NScEkmv6oh+wXn5D7Nb0AoNSb1PU+HgUpd8fpup+a6o=" + "version": "9.0.652701", + "hash": "sha256-KMrQhEVVB7hbDgdWpm2ZmQY66QiVg62C5x2DEhJvRnE=" }, { "pname": "Microsoft.Diagnostics.DbgShim.win-x64", - "version": "9.0.621003", - "hash": "sha256-sfe0tF2D3BpktS9J0o1xsR2cWIkDGhzXaUvKsgHDqC0=" + "version": "9.0.652701", + "hash": "sha256-hZCwn81P8v0Oh+PEXnzlCZIaSdDr5NvTOVf090LikKQ=" }, { "pname": "Microsoft.Diagnostics.DbgShim.win-x86", - "version": "9.0.621003", - "hash": "sha256-CRUYEGm3lqOO3FDn8kr3OUjxmIHNe1ntihN6UaFeDs8=" + "version": "9.0.652701", + "hash": "sha256-zxcpC/reDAaJ4A6Bsk3tcPfgdcOVcLYBMFBUT9Eb4bI=" }, { "pname": "Microsoft.NETCore.Platforms", diff --git a/pkgs/by-name/ne/netcoredbg/package.nix b/pkgs/by-name/ne/netcoredbg/package.nix index 36524bec3962..cbfac3b69565 100644 --- a/pkgs/by-name/ne/netcoredbg/package.nix +++ b/pkgs/by-name/ne/netcoredbg/package.nix @@ -12,30 +12,39 @@ }: let pname = "netcoredbg"; - build = "1054"; - release = "3.1.2"; + build = "1062"; + release = "3.1.3"; version = "${release}-${build}"; - hash = "sha256-WORGZXbq6d3sxGqyG8oZSwcBoVaD3D56t9K6PJoKFsM="; + hash = "sha256-Ci4GwHYTCn7BoEG73WsjxyplCCThSF5uVi39lLVZDXY="; - coreclr-version = "v8.0.16"; + coreclr-version = "v10.0.1"; coreclr-src = fetchFromGitHub { owner = "dotnet"; repo = "runtime"; rev = coreclr-version; - hash = "sha256-/fSKCIugR3UhqxBxtQRw+Bw+UpaSjB4xj0iBiXJaiR4="; + hash = "sha256-pVcLvew3THRqXgKMVO6jTZyPP06R46KZPMpYdiM3yXU="; + name = "coreclr"; }; - dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-sdk = dotnetCorePackages.sdk_10_0; src = fetchFromGitHub { owner = "Samsung"; repo = "netcoredbg"; rev = version; + name = pname; inherit hash; }; unmanaged = clangStdenv.mkDerivation { - inherit src pname version; + inherit pname version; + + srcs = [ + src + coreclr-src + ]; + + sourceRoot = pname; nativeBuildInputs = [ cmake @@ -44,24 +53,16 @@ let hardeningDisable = [ "strictoverflow" ]; - postPatch = '' - substituteInPlace CMakeLists.txt --replace-fail \ - "cmake_minimum_required(VERSION 2.8.12.2)" \ - "cmake_minimum_required(VERSION 3.10)" - substituteInPlace third_party/linenoise-ng/CMakeLists.txt --replace-fail \ - "cmake_minimum_required(VERSION 2.6)" \ - "cmake_minimum_required(VERSION 3.10)" - ''; - preConfigure = '' export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 - ''; - cmakeFlags = [ - "-DCORECLR_DIR=${coreclr-src}/src/coreclr" - "-DDOTNET_DIR=${dotnet-sdk}/share/dotnet" - "-DBUILD_MANAGED=0" - ]; + chmod -R u+w ../coreclr + cmakeFlagsArray+=( + "-DCORECLR_DIR=''${NIX_BUILD_TOP}/coreclr/src/coreclr" + "-DDOTNET_DIR=${dotnet-sdk}/share/dotnet" + "-DBUILD_MANAGED=0" + ) + ''; }; managed = buildDotnetModule { diff --git a/pkgs/by-name/ne/nextcloud-client/package.nix b/pkgs/by-name/ne/nextcloud-client/package.nix index 158e7a1bf286..0a5d2c675f01 100644 --- a/pkgs/by-name/ne/nextcloud-client/package.nix +++ b/pkgs/by-name/ne/nextcloud-client/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "nextcloud-client"; - version = "4.0.4"; + version = "4.0.5"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "nextcloud-releases"; repo = "desktop"; tag = "v${version}"; - hash = "sha256-BEjsIx0knmTj6kgM7fsJV5XN660cRe9DbYxeL7YHPRo="; + hash = "sha256-cEe1GTRFC+iGAAgddRm70uf5tXmpCat7Q7BptFEYKnE="; }; patches = [ diff --git a/pkgs/by-name/oc/ocrfeeder/package.nix b/pkgs/by-name/oc/ocrfeeder/package.nix index 3554e3867424..623ae417237f 100644 --- a/pkgs/by-name/oc/ocrfeeder/package.nix +++ b/pkgs/by-name/oc/ocrfeeder/package.nix @@ -9,7 +9,7 @@ libxml2, gobject-introspection, gtk3, - goocanvas2, + goocanvas_2, gtkspell3, isocodes, python3, @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtk3 - goocanvas2 + goocanvas_2 gtkspell3 isocodes (python3.withPackages ( diff --git a/pkgs/by-name/pd/pdf-quench/package.nix b/pkgs/by-name/pd/pdf-quench/package.nix index cdd8d2cc0f4f..77f7ff8a12da 100644 --- a/pkgs/by-name/pd/pdf-quench/package.nix +++ b/pkgs/by-name/pd/pdf-quench/package.nix @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication { ]; buildInputs = with pkgs; [ gtk3 - goocanvas2 + goocanvas_2 poppler_gi ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/pd/pdns-recursor/package.nix b/pkgs/by-name/pd/pdns-recursor/package.nix index 7ea8528413d4..331bfdefd549 100644 --- a/pkgs/by-name/pd/pdns-recursor/package.nix +++ b/pkgs/by-name/pd/pdns-recursor/package.nix @@ -15,29 +15,31 @@ rustPlatform, cargo, rustc, + python3, enableProtoBuf ? false, }: stdenv.mkDerivation (finalAttrs: { pname = "pdns-recursor"; - version = "5.2.7"; + version = "5.3.4"; src = fetchurl { - url = "https://downloads.powerdns.com/releases/pdns-recursor-${finalAttrs.version}.tar.bz2"; - hash = "sha256-s7/I2M5uL94I71fMYLKl+JcOPn0TnVn74oaIKnYmObE="; + url = "https://downloads.powerdns.com/releases/pdns-recursor-${finalAttrs.version}.tar.xz"; + hash = "sha256-+1CoWH9LPVf4jcrMImpkxRVJkrDa/SD1uwNDVeNiRSQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - sourceRoot = "pdns-recursor-${finalAttrs.version}/settings/rust"; - hash = "sha256-A3NX1zj9+9qCLTkfca3v8Rr8oc/zL/Ruknjl3g1aMG4="; + sourceRoot = "pdns-recursor-${finalAttrs.version}/rec-rust-lib/rust"; + hash = "sha256-g0Mu1+ZRQyzC4nG5ueISaDzFtmFfy+CGt063/V5lo30="; }; - cargoRoot = "settings/rust"; + cargoRoot = "rec-rust-lib/rust"; nativeBuildInputs = [ cargo rustc + python3 rustPlatform.cargoSetupHook pkg-config ]; diff --git a/pkgs/by-name/qu/QuadProgpp/package.nix b/pkgs/by-name/qu/QuadProgpp/package.nix index 3ec83d2b3765..50861e076df6 100644 --- a/pkgs/by-name/qu/QuadProgpp/package.nix +++ b/pkgs/by-name/qu/QuadProgpp/package.nix @@ -7,26 +7,19 @@ stdenv.mkDerivation { pname = "quadprogpp"; - version = "unstable-2023-01-20"; + version = "1.2.2-unstable-2025-12-03"; src = fetchFromGitHub { owner = "liuq"; repo = "QuadProgpp"; - rev = "4c51d91deb5af251957edf9454bfb74279a4544e"; - hash = "sha256-uozwuTAOPsRwYM9KyG3V0hwcmaPpfZPID9Wdd4olsvY="; + rev = "0c25447365c980876fdc395f55d60300a5e5793c"; + hash = "sha256-yXKctOTBbUNiSM2j7hKfSvd1i7FH7kcgP990DXVkrRY="; }; nativeBuildInputs = [ cmake ]; - postPatch = '' - # Inline https://github.com/liuq/QuadProgpp/pull/32 - substituteInPlace CMakeLists.txt --replace-fail \ - 'cmake_minimum_required(VERSION 3.0)' \ - 'cmake_minimum_required(VERSION 3.10)' - ''; - meta = { description = "C++ library for Quadratic Programming"; longDescription = '' diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index 71d01408459e..ff4638e104d5 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -18,13 +18,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "radicle-node"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromRadicle { seed = "seed.radicle.xyz"; repo = "z3gqcJUoA1n9HaHKufZs5FCSGazv5"; tag = "releases/${finalAttrs.version}"; - hash = "sha256-j7GTtx9Dq3xZeEsgIlaRq1Vbc9aJfn22WCkNTGjvH1Q="; + hash = "sha256-7kwtWuYdYG3MDHThCkY5OZmx4pWaQXMYoOlJszmV2rM="; leaveDotGit = true; postFetch = '' git -C $out rev-parse HEAD > $out/.git_head diff --git a/pkgs/by-name/rk/rkbin/package.nix b/pkgs/by-name/rk/rkbin/package.nix index 922b699b1aa6..541819239650 100644 --- a/pkgs/by-name/rk/rkbin/package.nix +++ b/pkgs/by-name/rk/rkbin/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "rkbin"; - version = "0-unstable-2025-01-24"; + version = "0-unstable-2025-06-13"; src = fetchFromGitHub { owner = "rockchip-linux"; repo = "rkbin"; - rev = "f43a462e7a1429a9d407ae52b4745033034a6cf9"; - hash = "sha256-geESfZP8ynpUz/i/thpaimYo3kzqkBX95gQhMBzNbmk="; + rev = "74213af1e952c4683d2e35952507133b61394862"; + hash = "sha256-gNCZwJd9pjisk6vmvtRNyGSBFfAYOADTa5Nd6Zk+qEk="; }; installPhase = '' @@ -23,11 +23,11 @@ stdenvNoCC.mkDerivation { ''; passthru = { - BL31_RK3568 = "${rkbin}/bin/rk35/rk3568_bl31_v1.44.elf"; - BL31_RK3588 = "${rkbin}/bin/rk35/rk3588_bl31_v1.48.elf"; + BL31_RK3568 = "${rkbin}/bin/rk35/rk3568_bl31_v1.45.elf"; + BL31_RK3588 = "${rkbin}/bin/rk35/rk3588_bl31_v1.51.elf"; TPL_RK3566 = "${rkbin}/bin/rk35/rk3566_ddr_1056MHz_v1.23.bin"; TPL_RK3568 = "${rkbin}/bin/rk35/rk3568_ddr_1056MHz_v1.23.bin"; - TPL_RK3588 = "${rkbin}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.18.bin"; + TPL_RK3588 = "${rkbin}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.19.bin"; }; meta = { diff --git a/pkgs/development/libraries/jemalloc/rust.nix b/pkgs/by-name/ru/rust-jemalloc-sys/package.nix similarity index 100% rename from pkgs/development/libraries/jemalloc/rust.nix rename to pkgs/by-name/ru/rust-jemalloc-sys/package.nix diff --git a/pkgs/by-name/so/soundtracker/package.nix b/pkgs/by-name/so/soundtracker/package.nix index 68dee8f6eda1..ff844e72587c 100644 --- a/pkgs/by-name/so/soundtracker/package.nix +++ b/pkgs/by-name/so/soundtracker/package.nix @@ -9,7 +9,7 @@ SDL, jack2, audiofile, - goocanvas, # graphical envelope editing + goocanvas_1, # graphical envelope editing libxml2, libsndfile, libpulseaudio, @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { SDL # found by AM_PATH_SDL jack2 audiofile - goocanvas + goocanvas_1 libxml2 # found by PKG_CHECK_MODULES libsndfile ] diff --git a/pkgs/by-name/sp/spotifycli/package.nix b/pkgs/by-name/sp/spotifycli/package.nix new file mode 100644 index 000000000000..afdcb100d5dc --- /dev/null +++ b/pkgs/by-name/sp/spotifycli/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, +}: + +buildGoModule (finalAttrs: { + pname = "spotifycli"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "doronbehar"; + repo = "spotifycli"; + tag = "v${finalAttrs.version}"; + hash = "sha256-AJysKgk58R0LwcXO0UzpgYmflJlAIqvaiyMRP8R9xGE="; + }; + + vendorHash = "sha256-MJtOJ4ZYSspumvPnK0ANL1wvWng9Na4+IlmBCoA80Hw="; + + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd spotifycli \ + --bash <($out/bin/spotifycli completion bash) \ + --zsh <($out/bin/spotifycli completion zsh ) \ + --fish <($out/bin/spotifycli completion fish) + ''; + + meta = { + description = "CLI to manage Spotify playlists"; + homepage = "https://github.com/doronbehar/spotifycli"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ doronbehar ]; + mainProgram = "spotifycli"; + }; +}) diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix index cc3217c09447..95e9d3dbb6ae 100644 --- a/pkgs/by-name/sy/sydbox/package.nix +++ b/pkgs/by-name/sy/sydbox/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sydbox"; - version = "3.48.2"; + version = "3.48.4"; outputs = [ "out" @@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "Sydbox"; repo = "sydbox"; tag = "v${finalAttrs.version}"; - hash = "sha256-yZBH7uVU4dqbUuHZaEw2glcQtHqUhXF3cycUr4J/NZI="; + hash = "sha256-rDJrmwBq2OSCqBOTtN2FncGwBzAafLUbjkgmfDVPYag="; }; - cargoHash = "sha256-zK2Z9iuJs43Qmiv/ircNF891XyfVwn6pDeYmJzfmNOU="; + cargoHash = "sha256-fq7XksglWJJzHBbnILVWn76xMUdR+pwc0W4S1P0SuNQ="; nativeBuildInputs = [ mandoc diff --git a/pkgs/by-name/ti/tig/package.nix b/pkgs/by-name/ti/tig/package.nix index bae80381289d..360e5435f02f 100644 --- a/pkgs/by-name/ti/tig/package.nix +++ b/pkgs/by-name/ti/tig/package.nix @@ -77,6 +77,12 @@ stdenv.mkDerivation rec { --prefix PATH ':' "${git}/bin" ''; + outputs = [ + "out" + "doc" + "man" + ]; + meta = { homepage = "https://jonas.github.io/tig/"; description = "Text-mode interface for git"; diff --git a/pkgs/by-name/tr/tryton/package.nix b/pkgs/by-name/tr/tryton/package.nix index 88461e1ca578..38be9993f62a 100644 --- a/pkgs/by-name/tr/tryton/package.nix +++ b/pkgs/by-name/tr/tryton/package.nix @@ -10,7 +10,7 @@ gtkspell3, adwaita-icon-theme, glib, - goocanvas2, + goocanvas_2, gdk-pixbuf, pango, fontconfig, @@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec { gdk-pixbuf glib adwaita-icon-theme - goocanvas2 + goocanvas_2 fontconfig freetype gtk3 diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index e99f9b8f2784..250c486dc1af 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ty"; - version = "0.0.12"; + version = "0.0.13"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ty"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-HbIntp5dhJgR3WdX3mtxhghHo5twQFiGfbHprWSsei8="; + hash = "sha256-2KPnFNutndxE5ap0E9BCL5w6vpnfow8GIY4/N9dgYy8="; }; # For Darwin platforms, remove the integration test for file notifications, @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package=ty" ]; - cargoHash = "sha256-OerZoJcgxCMytyrdI3xZmtRj/7/SJHJsdO92N/WXWU0="; + cargoHash = "sha256-E/kR6AxzpIqKMM80+ute5Z6LUL5f39RYfj7BnGOg6V4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/uu/uutils-hostname/package.nix b/pkgs/by-name/uu/uutils-hostname/package.nix new file mode 100644 index 000000000000..f9de647f54b9 --- /dev/null +++ b/pkgs/by-name/uu/uutils-hostname/package.nix @@ -0,0 +1,33 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "uutils-hostname"; + version = "0.0.1-unstable-2026-01-08"; + + src = fetchFromGitHub { + owner = "uutils"; + repo = "hostname"; + rev = "a5590e823e2cb488ad14f61dee92e04cb4dc2704"; + hash = "sha256-nWRkqONxbSwhphULpM+m14H/DSPmM4XdLJ7q2D4kooo="; + }; + + cargoHash = "sha256-1H4h01IqLVZrXNjnI36lGgsmg8rxHDAn9sbuvUxqPEQ="; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = { + description = "Rust reimplementation of the hostname project"; + homepage = "https://github.com/uutils/hostname"; + license = lib.licenses.mit; + mainProgram = "hostname"; + maintainers = with lib.maintainers; [ kyehn ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/uu/uutils-login/package.nix b/pkgs/by-name/uu/uutils-login/package.nix new file mode 100644 index 000000000000..c1bb42b59a8a --- /dev/null +++ b/pkgs/by-name/uu/uutils-login/package.nix @@ -0,0 +1,33 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "uutils-login"; + version = "0.0.1-unstable-2026-01-08"; + + src = fetchFromGitHub { + owner = "uutils"; + repo = "login"; + rev = "24c158ef78ef8e769337a91c563223a1bf1b58a7"; + hash = "sha256-1pJhFtY3zJTDIKX9SXuv3yfrvPMNCiC/b7WKdBU1Nqk="; + }; + + cargoHash = "sha256-V0Cb3Vz3MpVxqaHpIxrfYD+EAjjQ0jKI9Qc6pN13deg="; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = { + description = "Rust reimplemtation of the login project"; + homepage = "https://github.com/uutils/login"; + license = lib.licenses.mit; + mainProgram = "shadow"; + maintainers = with lib.maintainers; [ kyehn ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/uu/uutils-tar/package.nix b/pkgs/by-name/uu/uutils-tar/package.nix new file mode 100644 index 000000000000..31a8d514bc64 --- /dev/null +++ b/pkgs/by-name/uu/uutils-tar/package.nix @@ -0,0 +1,33 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "uutils-tar"; + version = "0.0.1-unstable-2026-01-08"; + + src = fetchFromGitHub { + owner = "uutils"; + repo = "tar"; + rev = "a73ac381d8fd78f8cb05236d26edfdae37a80ee3"; + hash = "sha256-b8Nzp5zZuULH5YkCexVOPxioPiuauGL4+KarBAdVAd4="; + }; + + cargoHash = "sha256-UFRe+dBQhsV91tenZY4uqw9gs4ZqbYDtvBeA98dk3po="; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = { + description = "Rust implementation of tar"; + homepage = "https://github.com/uutils/tar"; + license = lib.licenses.mit; + mainProgram = "tarapp"; + maintainers = with lib.maintainers; [ kyehn ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix index f6f3d4ab7a9b..034a0ed121d3 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix @@ -17,14 +17,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "xdg-desktop-portal-cosmic"; - version = "1.0.2"; + version = "1.0.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "xdg-desktop-portal-cosmic"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-Bx+tobtsevaBFB6Dqpj49Y3VUOmfEVNQJ5ll2bLk+VU="; + hash = "sha256-5U0xjVEGrOZzw7WnQRvoQe4VuWJ9drV3kNV/ogZQJio="; }; cargoHash = "sha256-99MGWfZrDOav77SRI7c5V21JTfkq7ejC7x+ZiQ5J0Yw="; diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix index 2b39f29ff859..9608a0daff3d 100644 --- a/pkgs/by-name/zw/zwave-js-ui/package.nix +++ b/pkgs/by-name/zw/zwave-js-ui/package.nix @@ -7,15 +7,15 @@ buildNpmPackage rec { pname = "zwave-js-ui"; - version = "11.10.0"; + version = "11.10.1"; src = fetchFromGitHub { owner = "zwave-js"; repo = "zwave-js-ui"; tag = "v${version}"; - hash = "sha256-zp7G1oYhalGrIvR8BPs0HuoHgw4jjU1ruLxa2aqFric="; + hash = "sha256-H9gtrYNk4W1OjjZwVX3ugDeqhW0rTvEJyhSRuz6XrYg="; }; - npmDepsHash = "sha256-VAUnOcE+C5KIkDyz9sO3PVgJFOIpQgbwLEC6oQQNvGA="; + npmDepsHash = "sha256-oxa9JzbvXRvm+hfHrfhp5XBzTwcvW7yHJIvrKKu54B4="; passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui; diff --git a/pkgs/development/compilers/openjdk/17/source.json b/pkgs/development/compilers/openjdk/17/source.json index 110fdf3a2223..9d218e0c53f6 100644 --- a/pkgs/development/compilers/openjdk/17/source.json +++ b/pkgs/development/compilers/openjdk/17/source.json @@ -1,6 +1,6 @@ { - "hash": "sha256-U2/ZQ9m3fi2rni2RAXyr5laDvNq0T5M2wZX+FdmCwFc=", + "hash": "sha256-cA9jYzz9Dp4lcQjI2UsYbojtqIo6dx025kFJOAgmV5s=", "owner": "openjdk", "repo": "jdk17u", - "rev": "refs/tags/jdk-17.0.17+10" + "rev": "refs/tags/jdk-17.0.18+8" } diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index ef7b75482bec..ffb76d6fffbc 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -393,6 +393,7 @@ in buildInputs = old.buildInputs ++ [ gnulib ]; + meta.broken = isLuaJIT; }); lrexlib-oniguruma = prev.lrexlib-oniguruma.overrideAttrs { @@ -419,6 +420,10 @@ in ]; }); + lua-cmsgpack = prev.lua-cmsgpack.overrideAttrs { + meta.broken = isLuaJIT; + }; + lua-curl = prev.lua-curl.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ curl.dev diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index dc05187b4efb..cab170d1ae81 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -13,13 +13,13 @@ }: php.buildComposerProject2 (finalAttrs: { pname = "composer"; - version = "2.9.2"; + version = "2.9.3"; src = fetchFromGitHub { owner = "composer"; repo = "composer"; tag = finalAttrs.version; - hash = "sha256-Ke+QGcKPqm1wEVVYgUCL0K3nT+qmzWpRX6HcZnzdhgA="; + hash = "sha256-H5/YY0CKFlLdvEMzj3fr5QsEro0Y2/8gZInLQDbGR30="; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ php.buildComposerProject2 (finalAttrs: { inherit (finalAttrs.passthru) pharHash; }; - vendorHash = "sha256-cqELlLH7d5KR62uVn7VtpQhVjkhXZkclXfc5d8RAG5Y="; + vendorHash = "sha256-4RFIegm7NFTpEbW11BtKB2BV+5VrSAhNrk125PcrBTw="; postInstall = '' wrapProgram $out/bin/composer \ @@ -55,7 +55,7 @@ php.buildComposerProject2 (finalAttrs: { # use together with the version from this package to keep the # bootstrap phar file up-to-date together with the end user composer # package. - passthru.pharHash = "sha256-Rx8thXq/DsGK97BV5hRyIU2RrbJPm9u7hkwcZPqtfdY="; + passthru.pharHash = "sha256-Oz+VA6LUZZAXDkXt0pc0GX55fOpUWzltCygjysjvRkM="; meta = { changelog = "https://github.com/composer/composer/releases/tag/${finalAttrs.version}"; diff --git a/pkgs/development/python-modules/beets-audible/default.nix b/pkgs/development/python-modules/beets-audible/default.nix index 92bebc0c3142..42ec73c8f274 100644 --- a/pkgs/development/python-modules/beets-audible/default.nix +++ b/pkgs/development/python-modules/beets-audible/default.nix @@ -7,7 +7,7 @@ hatchling, # native - beets, + beets-minimal, # dependencies markdownify, @@ -35,7 +35,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - beets + beets-minimal ]; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/beets/default.nix b/pkgs/development/python-modules/beets/default.nix index a390d64fe7f6..4fe0608dc154 100644 --- a/pkgs/development/python-modules/beets/default.nix +++ b/pkgs/development/python-modules/beets/default.nix @@ -19,13 +19,15 @@ ** }; ** }; ** } + ** + ** For an example adding a builtin plugin, see + ** passthru.tests.with-new-builtin-plugin below */ { lib, stdenv, buildPythonPackage, fetchFromGitHub, - beets, # build-system poetry-core, @@ -104,24 +106,16 @@ # passthru.tests runCommand, + beets, }: -let - # Avoid using `rec`, so that using e.g `passthru` or any other attributes - # defined inside, will have to be done via the beets argument, which can be - # overriden. Until `finalAttrs` support reaches `buildPythonPackage`, there - # is no way to avoid this. See: - # - # https://github.com/NixOS/nixpkgs/issues/258246 - version = "2.5.1"; -in -buildPythonPackage { +buildPythonPackage (finalAttrs: { pname = "beets"; version = "2.5.1"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-H3jcEHyK13+RHVlV4zp+8M3LZ0Jc2FdmAbLpekGozLA="; }; pyproject = true; @@ -154,7 +148,9 @@ buildPythonPackage { typing-extensions lap ] - ++ (lib.concatMap (p: p.propagatedBuildInputs) (lib.attrValues beets.passthru.plugins.enabled)); + ++ (lib.concatMap (p: p.propagatedBuildInputs) ( + lib.attrValues finalAttrs.finalPackage.passthru.plugins.enabled + )); nativeBuildInputs = [ gobject-introspection @@ -195,7 +191,7 @@ buildPythonPackage { makeWrapperArgs = [ "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\"" "--set GST_PLUGIN_SYSTEM_PATH_1_0 \"$GST_PLUGIN_SYSTEM_PATH_1_0\"" - "--prefix PATH : ${lib.makeBinPath beets.passthru.plugins.wrapperBins}" + "--prefix PATH : ${lib.makeBinPath finalAttrs.finalPackage.passthru.plugins.wrapperBins}" ]; nativeCheckInputs = [ @@ -208,12 +204,12 @@ buildPythonPackage { pillow writableTmpDirAsHomeHook ] - ++ beets.passthru.plugins.wrapperBins; + ++ finalAttrs.finalPackage.passthru.plugins.wrapperBins; __darwinAllowLocalNetworking = true; disabledTestPaths = - beets.passthru.plugins.disabledTestPaths + finalAttrs.finalPackage.passthru.plugins.disabledTestPaths ++ [ # touches network "test/plugins/test_aura.py" @@ -255,14 +251,14 @@ buildPythonPackage { \( -name '*.py' -o -path 'beetsplug/*/__init__.py' \) -print \ | sed -n -re 's|^beetsplug/([^/.]+).*|\1|p' \ | sort -u > plugins_available - ${diffPlugins (lib.attrNames beets.passthru.plugins.builtins) "plugins_available"} + ${diffPlugins (lib.attrNames finalAttrs.finalPackage.passthru.plugins.builtins) "plugins_available"} export BEETS_TEST_SHELL="${lib.getExe bashInteractive} --norc" env EDITOR="${writeScript "beetconfig.sh" '' #!${runtimeShell} cat > "$1" < /dev/null + ${finalAttrs.finalPackage}/bin/beet -c $out/config.yaml > /dev/null ''; + with-new-builtin-plugin = finalAttrs.finalPackage.overrideAttrs ( + newAttrs: oldAttrs: { + postPatch = (oldAttrs.postPatch or "") + '' + mkdir -p beetsplug/my_special_plugin + touch beetsplug/my_special_plugin/__init__.py + ''; + passthru = lib.recursiveUpdate oldAttrs.passthru { + plugins.builtins.my_special_plugin = { }; + }; + } + ); + # Test that disabling + with-mpd-plugins-disabled = beets.override { + pluginOverrides = { + # These two plugins require mpd2 Python dependency. If they are + # disabled, this dependency shouldn't be pulled, and the `runCommand` + # test below should fail with a `ModuleNotFoundError` + mpdstats.enable = false; + mpdupdate.enable = false; + }; + }; + mpd-plugins-really-disabled = runCommand "beets-mpd-plugins-disabled-test" { } '' + set -euo pipefail + export HOME=$(mktemp -d) + mkdir $out + + cat << EOF > $out/config.yaml + plugins: + - mpdstats + EOF + ${finalAttrs.finalPackage.passthru.tests.with-mpd-plugins-disabled}/bin/beet \ + -c $out/config.yaml \ + --help 2> $out/help-stderr || true + ${finalAttrs.finalPackage.passthru.tests.with-mpd-plugins-disabled}/bin/beet \ + -c $out/config.yaml \ + mpdstats --help 2> $out/mpdstats-help-stderr || true + ''; }; }; @@ -501,4 +543,4 @@ buildPythonPackage { platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "beet"; }; -} +}) diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix index 76b48aec073f..bd737273ca99 100644 --- a/pkgs/development/python-modules/cogapp/default.nix +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "cogapp"; - version = "3.5.1"; + version = "3.6.0"; pyproject = true; src = fetchFromGitHub { owner = "nedbat"; repo = "cog"; tag = "v${version}"; - hash = "sha256-tUFqvG1SzoMc/cWAIOpNaf161KbRqscjNnxThg9slu8="; + hash = "sha256-46ojLTu1elNcjmWSKJuGKDG4XETLLnJDIpL2Al6/aX0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/executorch/default.nix b/pkgs/development/python-modules/executorch/default.nix index 9013410fb89d..95d8a94df950 100644 --- a/pkgs/development/python-modules/executorch/default.nix +++ b/pkgs/development/python-modules/executorch/default.nix @@ -46,7 +46,7 @@ writableTmpDirAsHomeHook, yaspin, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "executorch"; version = "1.0.1"; pyproject = true; @@ -54,7 +54,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pytorch"; repo = "executorch"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; # The ExecuTorch repo must be cloned into a directory named exactly `executorch`. # See https://github.com/pytorch/executorch/issues/6475 for progress on a fix for this restriction. @@ -63,7 +63,6 @@ buildPythonPackage rec { fetchSubmodules = true; hash = "sha256-h+nmipFDO/cdPTQXrjM5EkH//wHKBAvlDIp6SBbGN/8="; }; - # src = /home/gaetan/nix/nixpkgs-packages/executorch; postPatch = # Hardcode the default flatc binary path to the nixpkgs flatc @@ -86,10 +85,19 @@ buildPythonPackage rec { --replace-fail \ "CMAKE_MINIMUM_REQUIRED(VERSION 3.5 FATAL_ERROR)" \ "CMAKE_MINIMUM_REQUIRED(VERSION 3.10 FATAL_ERROR)" + '' + # Fix build with GCC>=15 + + '' + substituteInPlace third-party/flatcc/include/flatcc/portable/grisu3_print.h \ + --replace-fail \ + 'static char hexdigits[16] = "0123456789ABCDEF";' \ + 'static char hexdigits[17] = "0123456789ABCDEF";' + + sed -i "1i #include " backends/apple/coreml/runtime/inmemoryfs/memory_buffer.hpp ''; env = { - BUILD_VERSION = version; + BUILD_VERSION = finalAttrs.version; }; build-system = [ @@ -117,6 +125,7 @@ buildPythonPackage rec { "pytest-xdist" ]; pythonRelaxDeps = [ + "scikit-learn" "torchao" ]; dependencies = [ @@ -194,7 +203,7 @@ buildPythonPackage rec { meta = { description = "On-device AI across mobile, embedded and edge for PyTorch"; homepage = "https://github.com/pytorch/executorch"; - changelog = "https://github.com/pytorch/executorch/releases/tag/v${version}"; + changelog = "https://github.com/pytorch/executorch/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ GaetanLepage ]; badPlatforms = [ @@ -204,4 +213,4 @@ buildPythonPackage rec { lib.systems.inspect.patterns.isDarwin ]; }; -} +}) diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index ffa6f7c57c6b..691e82319091 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchPypi, gobject-introspection, - goocanvas2, + goocanvas_2, gtk3, pkg-config, pygobject3, @@ -29,7 +29,7 @@ buildPythonPackage rec { buildInputs = [ gtk3 - goocanvas2 + goocanvas_2 ]; # No upstream tests available diff --git a/pkgs/development/python-modules/lerobot/default.nix b/pkgs/development/python-modules/lerobot/default.nix index a49cb26b1ec1..4a3783819b24 100644 --- a/pkgs/development/python-modules/lerobot/default.nix +++ b/pkgs/development/python-modules/lerobot/default.nix @@ -34,18 +34,19 @@ # tests pytestCheckHook, writableTmpDirAsHomeHook, + pytest-timeout, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lerobot"; - version = "0.4.0"; + version = "0.4.2"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "lerobot"; - tag = "v${version}"; - hash = "sha256-RVe1X0qBPm+okO3Gi/UdkuvuX0m4RlbhIs+NJLlC9wU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-qBbXFvVQ+cESBrNy8NIoT6GR6dqzeLbRNe3JmcpiiTw="; }; # ValueError: mutable default for field value is not allowed: use default_factory @@ -67,12 +68,12 @@ buildPythonPackage rec { pythonRelaxDeps = [ "av" - "datasets" "draccus" "gymnasium" "rerun-sdk" "torch" "torchvision" + "wandb" ]; dependencies = [ @@ -109,6 +110,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook writableTmpDirAsHomeHook + pytest-timeout ]; disabledTests = [ @@ -124,6 +126,9 @@ buildPythonPackage rec { "test_dataset_initialization" "test_factory" "test_from_pretrained_nonexistent_path" + "test_load_config_nonexistent_path_tries_hub" + "test_make_env_from_hub_async" + "test_make_env_from_hub_with_trust" "test_policy_defaults" "test_save_and_load_pretrained" @@ -149,18 +154,24 @@ buildPythonPackage rec { # Regex: "Can't instantiate abstract class NonCallableStep with abstract method __call_" # Input: "Can't instantiate abstract class NonCallableStep without an implementation for abstract method '__call__'" "test_construction_rejects_step_without_call" + + # TypeError: 'NoneType' object is not subscriptable + "test_pi0_rtc_inference_with_prev_chunk" ]; disabledTestPaths = [ # Sometimes hang forever on some CPU models "tests/policies/test_sac_policy.py" + + # Sometimes hang forever + "tests/policies/rtc/test_modeling_rtc.py" ]; meta = { description = "Making AI for Robotics more accessible with end-to-end learning"; homepage = "https://github.com/huggingface/lerobot"; - changelog = "https://github.com/huggingface/lerobot/releases/tag/v${version}"; + changelog = "https://github.com/huggingface/lerobot/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -} +}) diff --git a/pkgs/development/python-modules/magika/default.nix b/pkgs/development/python-modules/magika/default.nix index 504063f6e12c..a1846e289f69 100644 --- a/pkgs/development/python-modules/magika/default.nix +++ b/pkgs/development/python-modules/magika/default.nix @@ -1,20 +1,30 @@ { lib, + stdenv, buildPythonPackage, - click, fetchPypi, + + # build-system + hatchling, + + # dependencies + click, numpy, onnxruntime, - hatchling, python-dotenv, tabulate, tqdm, + + # tests pytestCheckHook, dacite, versionCheckHook, }: -buildPythonPackage rec { +let + isNotAarch64Linux = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); +in +buildPythonPackage (finalAttrs: { pname = "magika"; version = "1.0.1"; pyproject = true; @@ -23,7 +33,7 @@ buildPythonPackage rec { # Pypi tarball contains a pure python implementation of magika # while GitHub source requires compiling magika-cli src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-MT+Mv83Jp+VcJChicyMKJzK4mCXlipPeK1dlMTk7g5g="; }; @@ -63,14 +73,19 @@ buildPythonPackage rec { "test_magika_module_with_previously_missdetected_samples" ]; - pythonImportsCheck = [ "magika" ]; + # aarch64-linux fails cpuinfo test, because /sys/devices/system/cpu/ does not exist in the sandbox: + # terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException' + # + # -> Skip all tests that require importing magika + pythonImportsCheck = lib.optionals isNotAarch64Linux [ "magika" ]; + doCheck = isNotAarch64Linux; meta = { description = "Detect file content types with deep learning"; homepage = "https://github.com/google/magika"; - changelog = "https://github.com/google/magika/blob/python-v${version}/python/CHANGELOG.md"; + changelog = "https://github.com/google/magika/blob/python-v${finalAttrs.version}/python/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ mihaimaruseac ]; mainProgram = "magika-python-client"; }; -} +}) diff --git a/pkgs/development/python-modules/markitdown/default.nix b/pkgs/development/python-modules/markitdown/default.nix index c47f7361a2ef..cffa8aa21a21 100644 --- a/pkgs/development/python-modules/markitdown/default.nix +++ b/pkgs/development/python-modules/markitdown/default.nix @@ -1,15 +1,22 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, + + # build-system hatchling, + + # dependencies beautifulsoup4, defusedxml, ffmpeg-headless, + lxml, magika, mammoth, markdownify, numpy, + olefile, openai, openpyxl, pandas, @@ -20,15 +27,20 @@ python-pptx, requests, speechrecognition, - youtube-transcript-api, - olefile, xlrd, - lxml, + youtube-transcript-api, + + # tests pytestCheckHook, + + # passthru gitUpdater, }: -buildPythonPackage rec { +let + isNotAarch64Linux = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); +in +buildPythonPackage (finalAttrs: { pname = "markitdown"; version = "0.1.4"; pyproject = true; @@ -36,11 +48,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "microsoft"; repo = "markitdown"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-WKA2eY8wY3SM9xZ7Cek5eUcJbO5q6eMDx2aTKfQnFvE="; }; - sourceRoot = "${src.name}/packages/markitdown"; + sourceRoot = "${finalAttrs.src.name}/packages/markitdown"; build-system = [ hatchling ]; @@ -71,7 +83,12 @@ buildPythonPackage rec { youtube-transcript-api ]; - pythonImportsCheck = [ "markitdown" ]; + # aarch64-linux fails cpuinfo test, because /sys/devices/system/cpu/ does not exist in the sandbox: + # terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException' + # + # -> Skip all tests that require importing markitdown + pythonImportsCheck = lib.optionals isNotAarch64Linux [ "markitdown" ]; + doCheck = isNotAarch64Linux; nativeCheckInputs = [ pytestCheckHook ]; @@ -88,8 +105,8 @@ buildPythonPackage rec { meta = { description = "Python tool for converting files and office documents to Markdown"; homepage = "https://github.com/microsoft/markitdown"; - changelog = "https://github.com/microsoft/markitdown/releases/tag/${src.tag}"; + changelog = "https://github.com/microsoft/markitdown/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/oslo-db/default.nix b/pkgs/development/python-modules/oslo-db/default.nix index 031645894afc..b09352d3cf3b 100644 --- a/pkgs/development/python-modules/oslo-db/default.nix +++ b/pkgs/development/python-modules/oslo-db/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "oslo-db"; - version = "17.4.0"; + version = "18.0.0"; pyproject = true; src = fetchPypi { pname = "oslo_db"; inherit version; - hash = "sha256-FLYvWMQWMwy7GIpTKbFNlQF2Ye+K6h1yoP+STuz5EKk="; + hash = "sha256-lL/zJBrTie9YZsFpGd4AWuDlud8YFO65TUAnxXUnCSM="; }; build-system = [ diff --git a/pkgs/development/python-modules/rembg/default.nix b/pkgs/development/python-modules/rembg/default.nix index 58652d3d6d0f..209a1df7c07f 100644 --- a/pkgs/development/python-modules/rembg/default.nix +++ b/pkgs/development/python-modules/rembg/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -36,6 +37,9 @@ withCli ? false, }: +let + isNotAarch64Linux = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); +in buildPythonPackage (finalAttrs: { pname = "rembg"; version = "2.0.72"; @@ -106,7 +110,12 @@ buildPythonPackage (finalAttrs: { "NUMBA_CACHE_DIR" ]; - pythonImportsCheck = [ "rembg" ]; + # aarch64-linux fails cpuinfo test, because /sys/devices/system/cpu/ does not exist in the sandbox: + # terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException' + # + # -> Skip all tests that require importing rembg + pythonImportsCheck = lib.optionals isNotAarch64Linux [ "rembg" ]; + doCheck = isNotAarch64Linux; meta = { description = "Tool to remove background from images"; diff --git a/pkgs/development/python-modules/sabctools/default.nix b/pkgs/development/python-modules/sabctools/default.nix index 072e4f14ea03..2c2b74e3c47b 100644 --- a/pkgs/development/python-modules/sabctools/default.nix +++ b/pkgs/development/python-modules/sabctools/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "sabctools"; - version = "9.3.0"; + version = "9.3.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-CE11hjSkZFSmeUh3V3U4y/z77wS/hBUHRo40Y19YnX4="; + hash = "sha256-oZMYxukDhEbE0ybCbGcD40PNy4ktBei4bk0rccb3B4k="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/spacy-loggers/default.nix b/pkgs/development/python-modules/spacy-loggers/default.nix index b111a608cbcd..6d26d06df22f 100644 --- a/pkgs/development/python-modules/spacy-loggers/default.nix +++ b/pkgs/development/python-modules/spacy-loggers/default.nix @@ -1,35 +1,62 @@ { lib, - fetchPypi, + fetchFromGitHub, buildPythonPackage, + + # build-system + setuptools, + + # dependencies wandb, wasabi, + + # tests + pytestCheckHook, + spacy, + spacy-loggers, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "spacy-loggers"; version = "1.0.5"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-1gsL2/kVpg5RbMLmU7rv+Ubwz8RhtFLRGk1UWMb+XyQ="; + src = fetchFromGitHub { + owner = "explosion"; + repo = "spacy-loggers"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Kl8FSs+sbIF2Ml5AJhP5aY7lWnDLqUr7QBAq+63SW5Q="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ wandb wasabi ]; pythonImportsCheck = [ "spacy_loggers" ]; + nativeCheckInputs = [ + spacy + pytestCheckHook + ]; # skipping the checks, because it requires a cycle dependency to spacy as well. doCheck = false; + passthru = { + tests.pytest = spacy-loggers.overridePythonAttrs { + doCheck = true; + }; + }; + meta = { description = "Logging utilities for spaCy"; homepage = "https://github.com/explosion/spacy-loggers"; + changelog = "https://github.com/explosion/spacy-loggers/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ stunkymonkey ]; }; -} +}) diff --git a/pkgs/development/python-modules/torchdata/default.nix b/pkgs/development/python-modules/torchdata/default.nix index f74d9e159970..0466f6b68e00 100644 --- a/pkgs/development/python-modules/torchdata/default.nix +++ b/pkgs/development/python-modules/torchdata/default.nix @@ -19,9 +19,10 @@ parameterized, pytest-xdist, pytestCheckHook, + pythonAtLeast, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "torchdata"; version = "0.11.0"; pyproject = true; @@ -29,7 +30,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "meta-pytorch"; repo = "data"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-TSkZLL4WDSacuX4tl0+1bKSJCRI3LEhAyU3ztdlUvgk="; }; @@ -55,16 +56,24 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ - # RuntimeError: DataLoader timed out after 5 seconds - "test_ind_worker_queue" - ]; + disabledTests = + lib.optionals (pythonAtLeast "3.14") [ + # _pickle.PicklingError: Can't pickle local object <...worker_set_affinity at 0x7ffbcfa1ba00> + "test_set_affinity_in_worker_init" + + # RuntimeError: DataLoader timed out after 5 seconds + "test_ind_worker_queue" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # RuntimeError: DataLoader timed out after 5 seconds + "test_ind_worker_queue" + ]; meta = { description = "Iterative enhancement to the PyTorch torch.utils.data.DataLoader and torch.utils.data.Dataset/IterableDataset"; homepage = "https://github.com/meta-pytorch/data"; - changelog = "https://github.com/meta-pytorch/data/releases/tag/${src.tag}"; + changelog = "https://github.com/meta-pytorch/data/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -} +}) diff --git a/pkgs/development/python-modules/torchtune/default.nix b/pkgs/development/python-modules/torchtune/default.nix index 1fac454501f0..ce757924e984 100644 --- a/pkgs/development/python-modules/torchtune/default.nix +++ b/pkgs/development/python-modules/torchtune/default.nix @@ -35,7 +35,7 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "torchtune"; version = "0.6.1"; pyproject = true; @@ -43,7 +43,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "meta-pytorch"; repo = "torchtune"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-evhQBpZiUXriL0PAYkEzGypH21iRs37Ix6Nl5YAyeQ0="; }; @@ -134,11 +134,11 @@ buildPythonPackage rec { meta = { description = "PyTorch native post-training library"; homepage = "https://github.com/meta-pytorch/torchtune"; - changelog = "https://github.com/meta-pytorch/torchtune/releases/tag/${src.tag}"; + changelog = "https://github.com/meta-pytorch/torchtune/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ GaetanLepage sarahec ]; }; -} +}) diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index e7b2ef517b11..56aa5a429995 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -2,10 +2,12 @@ lib, stdenv, fetchFromGitHub, + pythonAtLeast, ## wandb-core - buildGo125Module, + buildGoModule, gitMinimal, + writableTmpDirAsHomeHook, versionCheckHook, ## gpu-stats @@ -20,11 +22,9 @@ # dependencies click, - docker-pycreds, gitpython, platformdirs, protobuf, - psutil, pydantic, pyyaml, requests, @@ -72,16 +72,15 @@ torch, torchvision, tqdm, - writableTmpDirAsHomeHook, }: let - version = "0.21.4"; + version = "0.24.0"; src = fetchFromGitHub { owner = "wandb"; repo = "wandb"; tag = "v${version}"; - hash = "sha256-1l68nU/rmYg/Npg1EVraGr2tu/lkNAo9M7Q0IyckEoc="; + hash = "sha256-dICa/sIFEHI59gJxrvWyI9Uc3rbwXi+Xh60O/hElZh0="; }; gpu-stats = rustPlatform.buildRustPackage { @@ -108,7 +107,7 @@ let }; }; - wandb-core = buildGo125Module rec { + wandb-core = buildGoModule rec { pname = "wandb-core"; inherit src version; @@ -126,6 +125,7 @@ let nativeBuildInputs = [ gitMinimal + writableTmpDirAsHomeHook ]; nativeInstallCheckInputs = [ @@ -151,7 +151,7 @@ let }; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wandb"; pyproject = true; @@ -193,11 +193,9 @@ buildPythonPackage rec { dependencies = [ click - docker-pycreds gitpython platformdirs protobuf - psutil pydantic pyyaml requests @@ -382,16 +380,19 @@ buildPythonPackage rec { # Breaks in sandbox: "Timed out waiting for wandb service to start" "test_setup_offline" + ] + ++ lib.optionals (pythonAtLeast "3.14") [ + # AttributeError: '...' object has no attribute '__annotations__' + "test_watch_graph_torch_jit" + "test_watch_parameters_torch_jit" ]; - pythonImportsCheck = [ "wandb" ]; - meta = { description = "CLI and library for interacting with the Weights and Biases API"; homepage = "https://github.com/wandb/wandb"; - changelog = "https://github.com/wandb/wandb/raw/v${version}/CHANGELOG.md"; + changelog = "https://github.com/wandb/wandb/raw/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ samuela ]; broken = gpu-stats.meta.broken || wandb-core.meta.broken; }; -} +}) diff --git a/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix b/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix index f2897b10053a..e62f8cf5d07e 100644 --- a/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix +++ b/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix @@ -10,13 +10,13 @@ buildHomeAssistantComponent rec { owner = "jmcollin78"; domain = "versatile_thermostat"; - version = "8.5.1"; + version = "8.6.0"; src = fetchFromGitHub { inherit owner; repo = domain; tag = version; - hash = "sha256-zSpeiSK8FyXlM1U8jjSVl1nLQX/IplvKHfS6XZUNxo4="; + hash = "sha256-rzNznV2YfBUxgYdc+qZeDIBVeMfwPwvDyYVON980SCg="; }; dependencies = [ diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix index e9693fd06ac5..d5e53541d06f 100644 --- a/pkgs/tools/security/chipsec/default.nix +++ b/pkgs/tools/security/chipsec/default.nix @@ -81,6 +81,7 @@ python3.pkgs.buildPythonApplication rec { maintainers = with lib.maintainers; [ johnazoidberg erdnaxe + staslyakhov ]; platforms = if withDriver then [ "x86_64-linux" ] else with lib.platforms; linux ++ darwin; # https://github.com/chipsec/chipsec/issues/1793 diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ba71c0a1d2a5..2afa87a9aaab 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -756,6 +756,9 @@ mapAliases { godot_4_3-export-templates = throw "'godot_4_3-export-templates' has been renamed to/replaced by 'godot_4_3-export-templates-bin'"; # Converted to throw 2025-10-27 godot_4_4-export-templates = throw "'godot_4_4-export-templates' has been renamed to/replaced by 'godot_4_4-export-templates-bin'"; # Converted to throw 2025-10-27 goldwarden = throw "'goldwarden' has been removed, as it no longer works with new Bitwarden versions and is abandoned upstream"; # Added 2025-09-16 + goocanvas2 = warnAlias "'goocanvas2' has been renamed to goocanvas_2" goocanvas_2; # Added 2026-01-17 + goocanvas3 = warnAlias "'goocanvas3' has been renamed to goocanvas_3" goocanvas_3; # Added 2026-01-17 + goocanvas = warnAlias "'goocanvas' has been renamed to goocanvas_1" goocanvas_1; # Added 2026-01-17 gphotos-sync = throw "'gphotos-sync' has been removed, as it was archived upstream due to API changes that ceased its functions"; # Added 2025-11-06 gprbuild-boot = throw "'gprbuild-boot' has been renamed to/replaced by 'gnatPackages.gprbuild-boot'"; # Converted to throw 2025-10-27 gpxsee-qt5 = throw "gpxsee-qt5 was removed, use gpxsee instead"; # Added 2025-09-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec659972c0ec..f1774d927b81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2756,18 +2756,8 @@ with pkgs; gruut-ipa = with python3.pkgs; toPythonApplication gruut-ipa; - gssdp = callPackage ../development/libraries/gssdp { }; - - gssdp_1_6 = callPackage ../development/libraries/gssdp/1.6.nix { }; - - gssdp-tools = callPackage ../development/libraries/gssdp/tools.nix { }; - gup = callPackage ../development/tools/build-managers/gup { }; - gupnp = callPackage ../development/libraries/gupnp { }; - - gupnp_1_6 = callPackage ../development/libraries/gupnp/1.6.nix { }; - gvm-tools = with python3.pkgs; toPythonApplication gvm-tools; gzip = callPackage ../tools/compression/gzip { }; @@ -2960,10 +2950,6 @@ with pkgs; ksmoothdock = libsForQt5.callPackage ../applications/misc/ksmoothdock { }; - libcryptui = callPackage ../development/libraries/libcryptui { - gtk3 = if stdenv.hostPlatform.isDarwin then gtk3-x11 else gtk3; - }; - limine-full = limine.override { enableAll = true; }; liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { @@ -3092,11 +3078,6 @@ with pkgs; ; lerna = lerna_8; - libhandy = callPackage ../development/libraries/libhandy { }; - - # Needed for apps that still depend on the unstable version of the library (not libhandy-1) - libhandy_0 = callPackage ../development/libraries/libhandy/0.x.nix { }; - libint = callPackage ../development/libraries/libint { }; libintPsi4 = callPackage ../development/libraries/libint { enableFortran = false; @@ -5943,21 +5924,6 @@ with pkgs; black-macchiato = with python3Packages; toPythonApplication black-macchiato; - build2 = callPackage ../development/tools/build-managers/build2 { - # Break cycle by using self-contained toolchain for bootstrapping - build2 = buildPackages.callPackage ../development/tools/build-managers/build2/bootstrap.nix { }; - }; - - # Dependency of build2, must also break cycle for this - libbutl = callPackage ../development/libraries/libbutl { - build2 = build2.bootstrap; - inherit (darwin) DarwinTools; - }; - - bdep = callPackage ../development/tools/build-managers/build2/bdep.nix { }; - - bpkg = callPackage ../development/tools/build-managers/build2/bpkg.nix { }; - buildkite-test-collector-rust = callPackage ../development/tools/continuous-integration/buildkite-test-collector-rust { @@ -6956,10 +6922,6 @@ with pkgs; nixStoreDir = config.nix.storeDir or builtins.storeDir; }; - goocanvas = callPackage ../development/libraries/goocanvas { }; - goocanvas2 = callPackage ../development/libraries/goocanvas/2.x.nix { }; - goocanvas3 = callPackage ../development/libraries/goocanvas/3.x.nix { }; - gst_all_1 = recurseIntoAttrs (callPackage ../development/libraries/gstreamer { }); grantlee = libsForQt5.callPackage ../development/libraries/grantlee { }; @@ -6988,8 +6950,6 @@ with pkgs; pangomm_2_42 = callPackage ../development/libraries/pangomm/2.42.nix { }; - gtk2 = callPackage ../development/libraries/gtk/2.x.nix { }; - gtk2-x11 = gtk2.override { cairo = cairo.override { x11Support = true; }; pango = pango.override { @@ -6999,10 +6959,6 @@ with pkgs; gdktarget = "x11"; }; - gtk3 = callPackage ../development/libraries/gtk/3.x.nix { }; - - gtk4 = callPackage ../development/libraries/gtk/4.x.nix { }; - # On darwin gtk uses cocoa by default instead of x11. gtk3-x11 = gtk3.override { cairo = cairo.override { x11Support = true; }; @@ -7013,14 +6969,6 @@ with pkgs; x11Support = true; }; - gtkmm2 = callPackage ../development/libraries/gtkmm/2.x.nix { }; - gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { }; - gtkmm4 = callPackage ../development/libraries/gtkmm/4.x.nix { }; - - gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix { }; - - gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix { }; - gtk-mac-integration-gtk2 = gtk-mac-integration.override { gtk = gtk2; }; @@ -7035,21 +6983,9 @@ with pkgs; gtksourceview5 = callPackage ../development/libraries/gtksourceview/5.x.nix { }; - gtksourceviewmm = callPackage ../development/libraries/gtksourceviewmm { }; - - gtksourceviewmm4 = callPackage ../development/libraries/gtksourceviewmm/4.x.nix { }; - - gtkspell2 = callPackage ../development/libraries/gtkspell { }; - - gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { }; - gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { }; hamlib = hamlib_3; - hamlib_3 = callPackage ../development/libraries/hamlib { }; - hamlib_4 = callPackage ../development/libraries/hamlib/4.nix { }; - - heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { }; harfbuzzFull = harfbuzz.override { withGraphite2 = true; @@ -7060,8 +6996,6 @@ with pkgs; highfive-mpi = highfive.override { hdf5 = hdf5-mpi; }; - hspell = callPackage ../development/libraries/hspell { }; - hspellDicts = callPackage ../development/libraries/hspell/dicts.nix { }; hunspellDicts = recurseIntoAttrs (callPackages ../by-name/hu/hunspell/dictionaries.nix { }); @@ -7116,13 +7050,6 @@ with pkgs; libXinerama = xorg.libXinerama; }; - indicator-application-gtk2 = - callPackage ../development/libraries/indicator-application/gtk2.nix - { }; - indicator-application-gtk3 = - callPackage ../development/libraries/indicator-application/gtk3.nix - { }; - indilib = callPackage ../development/libraries/science/astronomy/indilib { }; indi-3rdparty = recurseIntoAttrs ( callPackages ../development/libraries/science/astronomy/indilib/indi-3rdparty.nix { } @@ -7158,24 +7085,10 @@ with pkgs; itk = itk_5; - jemalloc = callPackage ../development/libraries/jemalloc { }; - - rust-jemalloc-sys = callPackage ../development/libraries/jemalloc/rust.nix { }; rust-jemalloc-sys-unprefixed = rust-jemalloc-sys.override { unprefixed = true; }; json2yaml = haskell.lib.compose.justStaticExecutables haskellPackages.json2yaml; - keybinder = callPackage ../development/libraries/keybinder { - lua = lua5_1; - }; - - keybinder3 = callPackage ../development/libraries/keybinder3 { - gtk3 = if stdenv.hostPlatform.isDarwin then gtk3-x11 else gtk3; - }; - - krb5 = callPackage ../development/libraries/kerberos/krb5.nix { - inherit (buildPackages.darwin) bootstrap_cmds; - }; libkrb5 = krb5; # TODO(de11n) Try to make krb5 reuse libkrb5 as a dependency l-smash = callPackage ../development/libraries/l-smash { @@ -7184,27 +7097,10 @@ with pkgs; lcms = lcms2; - libagar = callPackage ../development/libraries/libagar { }; - libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { }; - - libao = callPackage ../development/libraries/libao { - usePulseAudio = config.pulseaudio or (lib.meta.availableOn stdenv.hostPlatform libpulseaudio); - }; - libappindicator-gtk2 = libappindicator.override { gtkVersion = "2"; }; libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; }; libasn1c = callPackage ../servers/osmocom/libasn1c/default.nix { }; - libbap = callPackage ../development/libraries/libbap { - inherit (ocaml-ng.ocamlPackages_4_14) - bap - ocaml - findlib - ctypes - ctypes-foreign - ; - }; - libbass = (callPackage ../development/libraries/audio/libbass { }).bass; libbass_fx = (callPackage ../development/libraries/audio/libbass { }).bass_fx; libbassmidi = (callPackage ../development/libraries/audio/libbass { }).bassmidi; @@ -7225,24 +7121,10 @@ with pkgs; else pkgs.libcanberra-gtk2; - libcec = callPackage ../development/libraries/libcec { }; - - libcec_platform = callPackage ../development/libraries/libcec/platform.nix { }; - - libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; }; - libchamplain_libsoup3 = libchamplain.override { withLibsoup3 = true; }; libchipcard = callPackage ../development/libraries/aqbanking/libchipcard.nix { }; - libcxxrt = callPackage ../development/libraries/libcxxrt { - stdenv = - if stdenv.hostPlatform.useLLVM or false then - overrideCC stdenv buildPackages.llvmPackages.tools.clangNoLibcxx - else - stdenv; - }; - libdbiDriversBase = libdbiDrivers.override { libmysqlclient = null; sqlite = null; @@ -7251,42 +7133,19 @@ with pkgs; libdbusmenu-gtk2 = libdbusmenu.override { gtkVersion = "2"; }; libdbusmenu-gtk3 = libdbusmenu.override { gtkVersion = "3"; }; - libdvdnav = callPackage ../development/libraries/libdvdnav { }; - libdvdnav_4_2_1 = callPackage ../development/libraries/libdvdnav/4.2.1.nix { - libdvdread = libdvdread_4_9_9; - }; - - libdvdread = callPackage ../development/libraries/libdvdread { }; - libdvdread_4_9_9 = callPackage ../development/libraries/libdvdread/4.9.9.nix { }; - dwarfdump = libdwarf.bin; libfm-extra = libfm.override { extraOnly = true; }; - libgda5 = callPackage ../development/libraries/libgda/5.x.nix { }; - - libgda6 = callPackage ../development/libraries/libgda/6.x.nix { }; - - libgnome-games-support = callPackage ../development/libraries/libgnome-games-support { }; - libgnome-games-support_2_0 = - callPackage ../development/libraries/libgnome-games-support/2.0.nix - { }; - - libextractor = callPackage ../development/libraries/libextractor { - libmpeg2 = mpeg2dec; - }; - libfive = libsForQt5.callPackage ../development/libraries/libfive { }; # Use Apple’s fork of libffi by default, which provides APIs and trampoline functionality that is not yet # merged upstream. This is needed by some packages (such as cffi). # # `libffiReal` is provided in case the upstream libffi package is needed on Darwin instead of the fork. - libffiReal = callPackage ../development/libraries/libffi { }; libffi = if stdenv.hostPlatform.isDarwin then darwin.libffi else libffiReal; - libffi_3_3 = callPackage ../development/libraries/libffi/3.3.nix { }; # https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=README;h=fd6e1a83f55696c1f7a08f6dfca08b2d6b7617ec;hb=70058cd9f944d620764e57c838209afae8a58c78#l118 libgpg-error-gen-posix-lock-obj = libgpg-error.override { @@ -10190,10 +10049,6 @@ with pkgs; chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or { }); - chuck = callPackage ../applications/audio/chuck { - inherit (darwin) DarwinTools; - }; - clipgrab = libsForQt5.callPackage ../applications/video/clipgrab { }; cni = callPackage ../applications/networking/cluster/cni { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 112db2c2d0be..0110bcdeb1b1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14975,7 +14975,7 @@ with self; hash = "sha256-DFiMUH7tXmLRLtHMHkkcb/Oh9ZxPs9Q14UIUs3qzklE="; }; propagatedBuildInputs = [ - pkgs.goocanvas + pkgs.goocanvas_1 pkgs.gtk2 Gtk2 ]; @@ -14998,7 +14998,7 @@ with self; }; buildInputs = [ pkgs.gtk3 ]; propagatedBuildInputs = [ - pkgs.goocanvas2 + pkgs.goocanvas_2 Gtk3 ]; meta = { @@ -15018,7 +15018,7 @@ with self; hash = "sha256-uoBnNuvMnePYFBp2Omgr3quxy4cCveKZrf1XSs6HUFI="; }; propagatedBuildInputs = [ - pkgs.goocanvas2 + pkgs.goocanvas_2 Gtk3 ]; meta = {