diff --git a/nixos/modules/services/networking/nftables.nix b/nixos/modules/services/networking/nftables.nix index 7ee1b7caafed..7275d25ad5e1 100644 --- a/nixos/modules/services/networking/nftables.nix +++ b/nixos/modules/services/networking/nftables.nix @@ -67,6 +67,9 @@ in There are other programs that use iptables internally too, such as libvirt. For information on how the two firewalls interact, see . + + Some network configurations may prevent VMs from having network access, see + . ''; }; diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 87e69c402e10..9ebc3c240416 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -166,6 +166,7 @@ let --setenv OC_PASS \ --setenv NC_PASS \ --quiet \ + -- \ ${command} elif [[ "$USER" != nextcloud ]]; then if [[ -x /run/wrappers/bin/sudo ]]; then @@ -174,6 +175,7 @@ let --preserve-env=OC_PASS \ --preserve-env=NC_PASS \ --user=nextcloud \ + -- \ ${command} else exec ${lib.getExe' pkgs.util-linux "runuser"} \ @@ -181,6 +183,7 @@ let --whitelist-environment=OC_PASS \ --whitelist-environment=NC_PASS \ --user=nextcloud \ + -- \ ${command} fi else diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix index 69ea179c954b..378d852bb39a 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-code"; publisher = "anthropic"; - version = "2.0.24"; - hash = "sha256-5lPa2xBDqdVFdwVBiGz0u8Cp/oHvUTNEzvyKy4t2qvw="; + version = "2.0.25"; + hash = "sha256-I4z39qCDraRbpFlgUPW6KQcuALZYRqlLT6poJzs/8d8="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix index faec57bc9b36..138ce2e99ed4 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mednafen-pce-fast"; - version = "0-unstable-2025-10-10"; + version = "0-unstable-2025-10-17"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-pce-fast-libretro"; - rev = "22ca252ac248de126f5c7df8f8ff07a31a7e7731"; - hash = "sha256-7mG7TCTPuu3T6x50Lw85lwcZh80zSTG4XbDhoxCSw/0="; + rev = "d5c2b28ee6931ae43a4a79455937693ae8ccc8a1"; + hash = "sha256-67SLilFN88TVdbtpb97dw87QVLJWIib44kifVvZMXYE="; }; makefile = "Makefile"; diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix index 8690a64d5509..235b5a2c1d07 100644 --- a/pkgs/by-name/am/amazon-q-cli/package.nix +++ b/pkgs/by-name/am/amazon-q-cli/package.nix @@ -3,24 +3,27 @@ fetchFromGitHub, rustPlatform, versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "amazon-q-cli"; - version = "1.17.1"; + version = "1.18.1"; + + passthru.updateScript = nix-update-script { }; src = fetchFromGitHub { owner = "aws"; repo = "amazon-q-developer-cli"; - tag = "v${finalAttrs.version}"; - hash = "sha256-bRin4JKnBsWLvk+dIwHWAf4KKD1n6FOf2wICYNZpHd4="; + tag = finalAttrs.version; + hash = "sha256-wAcxXDEadPgyb3OpQXWxOEX3AMtf0ubx0J/H9Iff+rk="; }; nativeBuildInputs = [ rustPlatform.bindgenHook ]; - cargoHash = "sha256-Isa7kxnov4D+Sd7b4LJW52TIR864CDFkAjAHJoVQRcA="; + cargoHash = "sha256-jjx9HBJQ5eTS8+0Wus8hfNPZ+eETKHjjX3BsEq2LRn0="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/ap/api-linter/package.nix b/pkgs/by-name/ap/api-linter/package.nix index faa37966618c..43d272e8c323 100644 --- a/pkgs/by-name/ap/api-linter/package.nix +++ b/pkgs/by-name/ap/api-linter/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "api-linter"; - version = "1.71.0"; + version = "1.72.0"; src = fetchFromGitHub { owner = "googleapis"; repo = "api-linter"; tag = "v${version}"; - hash = "sha256-WZvaPYiz1pHW6OLl6ahV3/b9RXW6S/c/kbQxJFfAn28="; + hash = "sha256-RI2JBeDeB37AhCMYpZzUKl10hcLNL5uOkMwRSBCtJG0="; }; - vendorHash = "sha256-KW5+THuV7U09ZV0eShLCDJYDPOM09/bUi7t0WiVx6pk="; + vendorHash = "sha256-lILGYebnm3OkqsrXdElV1vDzyhVAk4iJGZrffKX9RTA="; subPackages = [ "cmd/api-linter" ]; diff --git a/pkgs/by-name/as/asusctl/package.nix b/pkgs/by-name/as/asusctl/package.nix index d27dcb359fea..db51d5237c31 100644 --- a/pkgs/by-name/as/asusctl/package.nix +++ b/pkgs/by-name/as/asusctl/package.nix @@ -18,16 +18,16 @@ }: rustPlatform.buildRustPackage rec { pname = "asusctl"; - version = "6.1.15"; + version = "6.1.16"; src = fetchFromGitLab { owner = "asus-linux"; repo = "asusctl"; tag = version; - hash = "sha256-ckazulETorMaYc860ELV/kABPv9+YF+EvpapNqNnXuI="; + hash = "sha256-Ndwzy/2Rg5W1cF6YFjoUtgN1156VZW4Gs1DgJTrmu/w="; }; - cargoHash = "sha256-qryRfwffP+AiaFjZ6mw5GHI/xlV1EhOsdhJhJw6Zn74="; + cargoHash = "sha256-+j682yZx54DXh+45b9GzSD29/aYALI/y1YbmlfQd09Q="; postPatch = '' files=" diff --git a/pkgs/by-name/bi/bio-gappa/package.nix b/pkgs/by-name/bi/bio-gappa/package.nix index 334afeff26f7..f619ad313517 100644 --- a/pkgs/by-name/bi/bio-gappa/package.nix +++ b/pkgs/by-name/bi/bio-gappa/package.nix @@ -34,6 +34,17 @@ stdenv.mkDerivation (finalAttrs: { xz ]; + # CMake 2.8.7 is deprecated and is no longer supported by CMake > 4 + # https://github.com/NixOS/nixpkgs/issues/445447 + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + "cmake_minimum_required (VERSION 2.8.7 FATAL_ERROR)" \ + "cmake_minimum_required (VERSION 3.10 FATAL_ERROR)" + substituteInPlace libs/genesis/CMakeLists.txt --replace-fail \ + "cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)" \ + "cmake_minimum_required (VERSION 3.10 FATAL_ERROR)" + ''; + installPhase = '' runHook preInstall mkdir -p $out/bin diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/by-name/ca/carla/package.nix similarity index 87% rename from pkgs/applications/audio/carla/default.nix rename to pkgs/by-name/ca/carla/package.nix index ece20404eac8..5e89d64292bf 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/by-name/ca/carla/package.nix @@ -11,17 +11,16 @@ libsndfile, pkg-config, python3Packages, + libsForQt5, which, gtk3 ? null, - qtbase ? null, withFrontend ? true, withGtk3 ? true, withQt ? true, - wrapQtAppsHook ? null, }: -assert withQt -> qtbase != null; -assert withQt -> wrapQtAppsHook != null; +assert withQt -> libsForQt5.qtbase != null; +assert withQt -> libsForQt5.wrapQtAppsHook != null; stdenv.mkDerivation (finalAttrs: { pname = "carla"; @@ -30,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "falkTX"; repo = "carla"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-21QaFCIjGjRTcJtf2nwC5RcVJF8JgcFPIbS8apvf9tw="; }; @@ -38,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.wrapPython pkg-config which - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; pythonPath = @@ -58,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { libpulseaudio libsndfile ] - ++ lib.optional withQt qtbase + ++ lib.optional withQt libsForQt5.qtbase ++ lib.optional withGtk3 gtk3; propagatedBuildInputs = finalAttrs.pythonPath; @@ -99,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { done ''; - meta = with lib; { + meta = { homepage = "https://kx.studio/Applications:Carla"; description = "Audio plugin host"; longDescription = '' @@ -108,8 +107,8 @@ stdenv.mkDerivation (finalAttrs: { It uses JACK as the default and preferred audio driver but also supports native drivers like ALSA, DirectSound or CoreAudio. ''; - license = licenses.gpl2Plus; - maintainers = [ maintainers.minijackson ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ minijackson ]; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/cf/cfripper/package.nix b/pkgs/by-name/cf/cfripper/package.nix index 86eb84d06828..cbbd6cbdc633 100644 --- a/pkgs/by-name/cf/cfripper/package.nix +++ b/pkgs/by-name/cf/cfripper/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cfripper"; - version = "1.18.0"; + version = "1.19.0"; pyproject = true; src = fetchFromGitHub { owner = "Skyscanner"; repo = "cfripper"; tag = "v${version}"; - hash = "sha256-9cnOy7XBN3BRjUh6ST9RsKpAPJ8wrzJHtKMKhp7sg1g="; + hash = "sha256-4qDZANerC46CV0/+6dItNDCKSPsd5HjiK1+BFZktouw="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/cl/claude-code-router/package.nix b/pkgs/by-name/cl/claude-code-router/package.nix index 435a85ea4cb5..5d4aad31b6f4 100644 --- a/pkgs/by-name/cl/claude-code-router/package.nix +++ b/pkgs/by-name/cl/claude-code-router/package.nix @@ -13,20 +13,15 @@ let in buildNpmPackage' (finalAttrs: { pname = "claude-code-router"; - version = "1.0.59"; + version = "1.0.64"; src = fetchFromGitHub { owner = "musistudio"; repo = "claude-code-router"; - rev = "4617d66492cf37539d9567044f6ffec7844af2ee"; - hash = "sha256-LC1JIOLaNLYNIIDofgFj+is4mwLjRjD3aAOt/nHRUmo="; + rev = "1a4462a92362e8c41d4539dc1a79fb85fccf9559"; + hash = "sha256-q818e8PcKjdBqYk6WfGLKQ8pybXWVxmNV8KX7GjEQq0="; }; - patches = [ - # pnpm install --fix-lockfile --lockfile-only - ./pnpm-lock.patch - ]; - postPatch = '' substituteInPlace src/cli.ts \ --replace-fail '"node"' '"${lib.getExe nodejs_24}"' @@ -34,9 +29,9 @@ buildNpmPackage' (finalAttrs: { npmDeps = null; pnpmDeps = pnpm_9.fetchDeps { - inherit (finalAttrs) pname src patches; + inherit (finalAttrs) pname src; fetcherVersion = 2; - hash = "sha256-aPAY7JhzzYQero8f0/w3jtf5IwpDnoZCXGQKzRbj9aU="; + hash = "sha256-BLPGTbDvvI40kuXfE/p3+s9hkE0reXr7OJA6UGXN4ys="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cl/claude-code-router/pnpm-lock.patch b/pkgs/by-name/cl/claude-code-router/pnpm-lock.patch deleted file mode 100644 index b060b630d425..000000000000 --- a/pkgs/by-name/cl/claude-code-router/pnpm-lock.patch +++ /dev/null @@ -1,90 +0,0 @@ ---- a/pnpm-lock.yaml -+++ b/pnpm-lock.yaml -@@ -356,6 +356,12 @@ - resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} - engines: {node: '>= 8'} - -+ '@types/mute-stream@0.0.4': -+ resolution: {integrity: sha512-CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow==} -+ -+ '@types/node@22.18.9': -+ resolution: {integrity: sha512-5yBtK0k/q8PjkMXbTfeIEP/XVYnz1R9qZJ3yUicdEW7ppdDJfe+MqXEhpqDL3mtn4Wvs1u0KLEG0RXzCgNpsSg==} -+ - '@types/node@24.7.0': - resolution: {integrity: sha512-IbKooQVqUBrlzWTi79E8Fw78l8k1RNtlDDNWsFZs7XonuQSJ8oNYfEeclhprUldXISRMLzBpILuKgPlIxm+/Yw==} - -@@ -904,6 +910,9 @@ - resolution: {integrity: sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==} - engines: {node: '>=10'} - -+ safer-buffer@2.1.2: -+ resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} -+ - secure-json-parse@4.1.0: - resolution: {integrity: sha512-l4KnYfEyqYJxDwlNVyRfO2E4NTHfMKAWdUuA8J0yve2Dz/E/PdBepY03RvyJpssIpRFwJoCD55wA+mEDs6ByWA==} - -@@ -1026,11 +1035,18 @@ - tr46@0.0.3: - resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} - -+ type-fest@0.21.3: -+ resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==} -+ engines: {node: '>=10'} -+ - typescript@5.9.3: - resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==} - engines: {node: '>=14.17'} - hasBin: true - -+ undici-types@6.21.0: -+ resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==} -+ - undici-types@7.14.0: - resolution: {integrity: sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==} - -@@ -1253,7 +1269,7 @@ - '@inquirer/figures': 1.0.13 - '@inquirer/type': 2.0.0 - '@types/mute-stream': 0.0.4 -- '@types/node': 22.18.8 -+ '@types/node': 22.18.9 - '@types/wrap-ansi': 3.0.0 - ansi-escapes: 4.3.2 - cli-width: 4.1.0 -@@ -1386,6 +1402,14 @@ - '@nodelib/fs.scandir': 2.1.5 - fastq: 1.19.1 - -+ '@types/mute-stream@0.0.4': -+ dependencies: -+ '@types/node': 24.7.0 -+ -+ '@types/node@22.18.9': -+ dependencies: -+ undici-types: 6.21.0 -+ - '@types/node@24.7.0': - dependencies: - undici-types: 7.14.0 -@@ -1956,6 +1980,8 @@ - - safe-stable-stringify@2.5.0: {} - -+ safer-buffer@2.1.2: {} -+ - secure-json-parse@4.1.0: {} - - semver@5.7.2: {} -@@ -2054,8 +2080,12 @@ - - tr46@0.0.3: {} - -+ type-fest@0.21.3: {} -+ - typescript@5.9.3: {} - -+ undici-types@6.21.0: {} -+ - undici-types@7.14.0: {} - - undici@7.16.0: {} diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index 07ec9ee16c3c..e90b62d35f7a 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -1,12 +1,12 @@ { "name": "@anthropic-ai/claude-code", - "version": "2.0.24", + "version": "2.0.25", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@anthropic-ai/claude-code", - "version": "2.0.24", + "version": "2.0.25", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 2c81854f4e18..f6a6d9d7b6b8 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -7,14 +7,14 @@ }: buildNpmPackage (finalAttrs: { pname = "claude-code"; - version = "2.0.24"; + version = "2.0.25"; src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz"; - hash = "sha256-pi8EdN/XyzMGWBcTiV8pr9GODcBs0uPFarWjQMoCaEs="; + hash = "sha256-ix/JSPBLnvCPtyqJ6beAaOpuimphpkrkIw5HCdeeGkM="; }; - npmDepsHash = "sha256-XylBq0/zu7iSTPiLAkewQFeh1OmtJv9nUfnCb66opVE="; + npmDepsHash = "sha256-NjmCmOwepKaSZ+vji0sUlZ1nSkcG02kNokGe37YYtX0="; postPatch = '' cp ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/cr/crd2pulumi/package.nix b/pkgs/by-name/cr/crd2pulumi/package.nix index 9d39e7bdf99a..ef663572db1d 100644 --- a/pkgs/by-name/cr/crd2pulumi/package.nix +++ b/pkgs/by-name/cr/crd2pulumi/package.nix @@ -30,6 +30,6 @@ buildGoModule rec { mainProgram = "crd2pulumi"; homepage = "https://github.com/pulumi/crd2pulumi"; license = licenses.asl20; - maintainers = with maintainers; [ flokli ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/by-name/de/deadbeef/package.nix similarity index 95% rename from pkgs/applications/audio/deadbeef/default.nix rename to pkgs/by-name/de/deadbeef/package.nix index afcd574395f4..6179b42afcad 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/by-name/de/deadbeef/package.nix @@ -62,18 +62,16 @@ let inherit (lib) optionals; - - version = "1.10.0"; in -clangStdenv.mkDerivation { +clangStdenv.mkDerivation (finalAttrs: { pname = "deadbeef"; - inherit version; + version = "1.10.0"; src = fetchFromGitHub { owner = "DeaDBeeF-Player"; repo = "deadbeef"; fetchSubmodules = true; - rev = version; + tag = finalAttrs.version; hash = "sha256-qa0ULmE15lV2vkyXPNW9kSISQZEANrjwJwykTiifk5Q="; }; @@ -155,16 +153,16 @@ clangStdenv.mkDerivation { enableParallelBuilding = true; - meta = with lib; { + meta = { description = "Ultimate Music Player for GNU/Linux"; mainProgram = "deadbeef"; homepage = "http://deadbeef.sourceforge.net/"; downloadPage = "https://github.com/DeaDBeeF-Player/deadbeef"; - license = licenses.gpl2; + license = lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ ]; }; -} +}) diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/by-name/df/dfasma/package.nix similarity index 85% rename from pkgs/applications/audio/dfasma/default.nix rename to pkgs/by-name/df/dfasma/package.nix index dd3827ab8a19..96ad53f3bb7b 100644 --- a/pkgs/applications/audio/dfasma/default.nix +++ b/pkgs/by-name/df/dfasma/package.nix @@ -1,12 +1,10 @@ { - mkDerivation, + stdenv, lib, fetchFromGitHub, fftw, libsndfile, - qtbase, - qtmultimedia, - qmake, + libsForQt5, }: let @@ -36,13 +34,13 @@ let }; in -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dfasma"; version = "1.4.5"; src = fetchFromGitHub { sha256 = "09fcyjm0hg3y51fnjax88m93im39nbynxj79ffdknsazmqw9ac0h"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; repo = "dfasma"; owner = "gillesdegottex"; }; @@ -50,11 +48,14 @@ mkDerivation rec { buildInputs = [ fftw libsndfile - qtbase - qtmultimedia + libsForQt5.qtbase + libsForQt5.qtmultimedia ]; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ + libsForQt5.qmake + libsForQt5.wrapQtAppsHook + ]; postPatch = '' cp -Rv "${reaperFork.src}"/* external/REAPER @@ -62,7 +63,7 @@ mkDerivation rec { substituteInPlace dfasma.pro --replace "CONFIG += file_sdif" ""; ''; - meta = with lib; { + meta = { description = "Analyse and compare audio files in time and frequency"; mainProgram = "dfasma"; longDescription = '' @@ -75,9 +76,9 @@ mkDerivation rec { ''; homepage = "https://gillesdegottex.gitlab.io/dfasma-website/"; license = [ - licenses.gpl3Plus + lib.licenses.gpl3Plus reaperFork.meta.license ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/dn/dnsproxy/package.nix b/pkgs/by-name/dn/dnsproxy/package.nix index 422da13b90ba..cb2c9d252d91 100644 --- a/pkgs/by-name/dn/dnsproxy/package.nix +++ b/pkgs/by-name/dn/dnsproxy/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "dnsproxy"; - version = "0.76.1"; + version = "0.77.0"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = "dnsproxy"; tag = "v${finalAttrs.version}"; - hash = "sha256-XbFa0KN5RYcdjXHKSnSs0ba+9YDFGZN/DafV4gOSow0="; + hash = "sha256-xq/lhwGyVvhKFQqwgtdomi/pZyrTShI60Sz/fEplEIw="; }; - vendorHash = "sha256-87WXRBzV7ROsWAhtS8vcpvj4x1yIcFDaEje8inAqwoo="; + vendorHash = "sha256-Ti+dfz9f8xXpTmmVIUAuheBQzNnYUJ2QIb0IWotNzsA="; ldflags = [ "-s" diff --git a/pkgs/applications/audio/espeak-ng/mbrola.patch b/pkgs/by-name/es/espeak-ng/mbrola.patch similarity index 100% rename from pkgs/applications/audio/espeak-ng/mbrola.patch rename to pkgs/by-name/es/espeak-ng/mbrola.patch diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/by-name/es/espeak-ng/package.nix similarity index 100% rename from pkgs/applications/audio/espeak-ng/default.nix rename to pkgs/by-name/es/espeak-ng/package.nix diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix index 766e6d422f4d..f11f9d768b89 100644 --- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix +++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix @@ -13,13 +13,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "firefly-iii-data-importer"; - version = "1.8.4"; + version = "1.9.0"; src = fetchFromGitHub { owner = "firefly-iii"; repo = "data-importer"; tag = "v${finalAttrs.version}"; - hash = "sha256-xo1CgsPdqSw7VFlPx5aidB7h7fwot95XYlPxyW7S8yw="; + hash = "sha256-07i/78dF6yynSGAHc91899hLD1MKacBUJ5d455hn9mE="; }; buildInputs = [ php84 ]; @@ -38,12 +38,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-6sTCXSMAgMQH7tQjl3UvPgqRShdEUV1Xi4R/M/j2Xxc="; + vendorHash = "sha256-i4DZ62J5v/tskoaQ1GaE7b1VJcFOFIJW8xC8R4h4tHk="; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; name = "${finalAttrs.pname}-npm-deps"; - hash = "sha256-gYCjxZP7pytYYgJEvW78SmzX9jZAjkAMlRv9doc+JqE="; + hash = "sha256-KRMdcY9pkyXOPCwcNXOK1FJYWIcvDE6DRVX/aG8KzCs="; }; composerRepository = php84.mkComposerRepository { diff --git a/pkgs/applications/audio/greg/default.nix b/pkgs/by-name/gr/greg/package.nix similarity index 53% rename from pkgs/applications/audio/greg/default.nix rename to pkgs/by-name/gr/greg/package.nix index 44bd16adf092..da9eca5d24ff 100644 --- a/pkgs/applications/audio/greg/default.nix +++ b/pkgs/by-name/gr/greg/package.nix @@ -1,34 +1,33 @@ { lib, fetchFromGitHub, - pythonPackages, + python3Packages, }: -with pythonPackages; -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "greg"; version = "0.4.8"; format = "setuptools"; - disabled = !isPy3k; + disabled = !python3Packages.isPy3k; src = fetchFromGitHub { owner = "manolomartinez"; repo = "greg"; tag = "v${version}"; - sha256 = "sha256-o4+tXVJTgT52JyJOC+Glr2cvZjbTaZL8TIsmz+A4vE4="; + hash = "sha256-o4+tXVJTgT52JyJOC+Glr2cvZjbTaZL8TIsmz+A4vE4="; }; propagatedBuildInputs = [ - setuptools - feedparser + python3Packages.setuptools + python3Packages.feedparser ]; - meta = with lib; { + meta = { homepage = "https://github.com/manolomartinez/greg"; description = "Command-line podcast aggregator"; mainProgram = "greg"; - license = licenses.gpl3; - maintainers = with maintainers; [ edwtjo ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ edwtjo ]; }; } diff --git a/pkgs/applications/audio/hqplayer-desktop/default.nix b/pkgs/by-name/hq/hqplayer-desktop/package.nix similarity index 87% rename from pkgs/applications/audio/hqplayer-desktop/default.nix rename to pkgs/by-name/hq/hqplayer-desktop/package.nix index 36fc6235dad5..2b8acc8aa1ab 100644 --- a/pkgs/applications/audio/hqplayer-desktop/default.nix +++ b/pkgs/by-name/hq/hqplayer-desktop/package.nix @@ -12,13 +12,8 @@ libusb-compat-0_1, llvmPackages, mpfr, - qtcharts, - qtdeclarative, - qtwayland, - qtwebengine, - qtwebview, wavpack, - wrapQtAppsHook, + kdePackages, }: let @@ -44,7 +39,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook dpkg - wrapQtAppsHook + kdePackages.wrapQtAppsHook ]; buildInputs = [ @@ -56,11 +51,11 @@ stdenv.mkDerivation { libusb-compat-0_1 llvmPackages.openmp mpfr - qtcharts - qtdeclarative - qtwayland - qtwebengine - qtwebview + kdePackages.qtcharts + kdePackages.qtdeclarative + kdePackages.qtwayland + kdePackages.qtwebengine + kdePackages.qtwebview wavpack ]; @@ -111,12 +106,12 @@ stdenv.mkDerivation { patchelf --replace-needed libomp.so.5 libomp.so $out/bin/.hqplayer5*-wrapped ''; - meta = with lib; { + meta = { homepage = "https://www.signalyst.com"; description = "High-end upsampling multichannel software HD-audio player"; - license = licenses.unfree; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = builtins.attrNames srcs; - maintainers = with maintainers; [ lovesegfault ]; + maintainers = with lib.maintainers; [ lovesegfault ]; }; } diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/by-name/ia/iannix/package.nix similarity index 67% rename from pkgs/applications/audio/iannix/default.nix rename to pkgs/by-name/ia/iannix/package.nix index a6b3cd769205..1ba5fd2405cd 100644 --- a/pkgs/applications/audio/iannix/default.nix +++ b/pkgs/by-name/ia/iannix/package.nix @@ -1,15 +1,13 @@ { - mkDerivation, + stdenv, lib, fetchFromGitHub, alsa-lib, pkg-config, - qtbase, - qtscript, - qmake, + libsForQt5, }: -mkDerivation { +stdenv.mkDerivation { pname = "iannix"; version = "unstable-2020-12-09"; @@ -22,24 +20,25 @@ mkDerivation { nativeBuildInputs = [ pkg-config - qmake + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; buildInputs = [ alsa-lib - qtbase - qtscript + libsForQt5.qtbase + libsForQt5.qtscript ]; qmakeFlags = [ "PREFIX=/" ]; installFlags = [ "INSTALL_ROOT=$(out)" ]; - meta = with lib; { + meta = { description = "Graphical open-source sequencer"; mainProgram = "iannix"; homepage = "https://www.iannix.org/"; - license = licenses.lgpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ freezeboy ]; + license = lib.licenses.lgpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ freezeboy ]; }; } diff --git a/pkgs/applications/audio/jack-autoconnect/default.nix b/pkgs/by-name/ja/jack-autoconnect/package.nix similarity index 67% rename from pkgs/applications/audio/jack-autoconnect/default.nix rename to pkgs/by-name/ja/jack-autoconnect/package.nix index 9d84c9ff669e..f46a4882b66b 100644 --- a/pkgs/applications/audio/jack-autoconnect/default.nix +++ b/pkgs/by-name/ja/jack-autoconnect/package.nix @@ -1,13 +1,12 @@ { + stdenv, lib, - mkDerivation, fetchFromGitHub, pkg-config, - qmake, - qtbase, libjack2, + libsForQt5, }: -mkDerivation { +stdenv.mkDerivation { pname = "jack_autoconnect"; # It does not have any versions (yet?) @@ -17,16 +16,18 @@ mkDerivation { owner = "kripton"; repo = "jack_autoconnect"; rev = "fe0c8f69149e30979e067646f80b9d326341c02b"; - sha256 = "sha256-imvNc498Q2W9RKmiOoNepSoJzIv2tGvFG6hx+seiifw="; + hash = "sha256-imvNc498Q2W9RKmiOoNepSoJzIv2tGvFG6hx+seiifw="; }; buildInputs = [ - qtbase + libsForQt5.qtbase libjack2 ]; + nativeBuildInputs = [ pkg-config - qmake + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; installPhase = '' @@ -34,12 +35,12 @@ mkDerivation { cp -- jack_autoconnect "$out/bin" ''; - meta = with lib; { + meta = { homepage = "https://github.com/kripton/jack_autoconnect"; description = "Tiny application that reacts on port registrations by clients and connects them"; mainProgram = "jack_autoconnect"; - maintainers = with maintainers; [ unclechu ]; - license = licenses.gpl2Only; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ unclechu ]; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/jackmix/no_error.patch b/pkgs/by-name/ja/jackmix/no_error.patch similarity index 100% rename from pkgs/applications/audio/jackmix/no_error.patch rename to pkgs/by-name/ja/jackmix/no_error.patch diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/by-name/ja/jackmix/package.nix similarity index 88% rename from pkgs/applications/audio/jackmix/default.nix rename to pkgs/by-name/ja/jackmix/package.nix index d4a0bf6064a4..7b57e6571bcb 100644 --- a/pkgs/applications/audio/jackmix/default.nix +++ b/pkgs/by-name/ja/jackmix/package.nix @@ -1,25 +1,25 @@ { - mkDerivation, + stdenv, lib, fetchFromGitHub, pkg-config, scons, - qtbase, lash, libjack2, jack ? libjack2, alsa-lib, + libsForQt5, fetchpatch, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jackmix"; version = "0.6.0"; src = fetchFromGitHub { owner = "kampfschlaefer"; repo = "jackmix"; - rev = version; + tag = finalAttrs.version; sha256 = "0p59411vk38lccn24r7nih10jpgg9i46yc26zpc3x13amxwwpd4h"; }; @@ -35,9 +35,10 @@ mkDerivation rec { nativeBuildInputs = [ scons pkg-config + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase + libsForQt5.qtbase lash jack alsa-lib @@ -55,4 +56,4 @@ mkDerivation rec { maintainers = with maintainers; [ kampfschlaefer ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ju/jugglinglab/package.nix b/pkgs/by-name/ju/jugglinglab/package.nix index a391cac9205b..38b3c9eabfe0 100644 --- a/pkgs/by-name/ju/jugglinglab/package.nix +++ b/pkgs/by-name/ju/jugglinglab/package.nix @@ -34,6 +34,13 @@ maven.buildMavenPackage rec { ./fix-default-maven-plugin-versions.patch ]; + # use non-absolute paths for Exec and Icon fields in the desktop item + postPatch = '' + substituteInPlace "bin/packaging/debian/Juggling Lab.desktop" \ + --replace-fail "/opt/juggling-lab/bin/Juggling\ Lab" "jugglinglab" \ + --replace-fail "/opt/juggling-lab/lib/Juggling_Lab.png" "jugglinglab" + ''; + mvnHash = "sha256-1Uzo9nRw+YR/sd7CC9MTPe/lttkRX6BtmcsHaagP1Do="; # fix jar timestamps for reproducibility @@ -54,6 +61,14 @@ maven.buildMavenPackage rec { install -Dm755 bin/ortools-lib/ortools-${platformName}/* -t $out/lib/ortools-lib ''} + install -Dm644 \ + "bin/packaging/debian/Juggling Lab.png" \ + "$out/share/icons/hicolor/256x256/apps/jugglinglab.png" + + install -Dm644 \ + "bin/packaging/debian/Juggling Lab.desktop" \ + "$out/share/applications/jugglinglab.desktop" + runHook postInstall ''; diff --git a/pkgs/by-name/ku/kubevpn/package.nix b/pkgs/by-name/ku/kubevpn/package.nix index f7bd3d678bfb..b5354c6261ea 100644 --- a/pkgs/by-name/ku/kubevpn/package.nix +++ b/pkgs/by-name/ku/kubevpn/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "kubevpn"; - version = "2.9.9"; + version = "2.9.10"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; tag = "v${finalAttrs.version}"; - hash = "sha256-iGharffqrN5Vh9GhoajRjh+2R6hevhvrjtH4WIUq8nw="; + hash = "sha256-5yuJfGWNEQ/1ufV1rVze2JrL/67/UlYdG2YH9i+gI3w="; }; vendorHash = null; diff --git a/pkgs/by-name/l8/l8w8jwt/package.nix b/pkgs/by-name/l8/l8w8jwt/package.nix index 8449da40c884..1f6765e9cc0e 100644 --- a/pkgs/by-name/l8/l8w8jwt/package.nix +++ b/pkgs/by-name/l8/l8w8jwt/package.nix @@ -47,6 +47,11 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + postPatch = '' + substituteInPlace lib/chillbuff/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = { description = "Minimal, OpenSSL-less and super lightweight JWT library written in C"; homepage = "https://codeberg.org/GlitchedPolygons/l8w8jwt"; @@ -54,5 +59,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ jherland ]; platforms = lib.platforms.unix; + broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64; }; }) diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/by-name/la/ladspa-sdk/package.nix similarity index 82% rename from pkgs/applications/audio/ladspa-sdk/default.nix rename to pkgs/by-name/la/ladspa-sdk/package.nix index 0103db6a7422..6f154ea224d8 100644 --- a/pkgs/applications/audio/ladspa-sdk/default.nix +++ b/pkgs/by-name/la/ladspa-sdk/package.nix @@ -4,22 +4,22 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ladspa-sdk"; version = "1.15"; src = fetchurl { - url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; + url = "https://www.ladspa.org/download/ladspa_sdk_${finalAttrs.version}.tgz"; sha256 = "1vgx54cgsnc3ncl9qbgjbmq12c444xjafjkgr348h36j16draaa2"; }; - sourceRoot = "ladspa_sdk_${version}/src"; + sourceRoot = "ladspa_sdk_${finalAttrs.version}/src"; strictDeps = true; patchPhase = '' sed -i 's@/usr/@$(out)/@g' Makefile substituteInPlace Makefile \ - --replace /tmp/test.wav $NIX_BUILD_TOP/${sourceRoot}/test.wav + --replace /tmp/test.wav $NIX_BUILD_TOP/${finalAttrs.sourceRoot}/test.wav ''; makeFlags = [ @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/audio/ladspa-sdk/ladspah.nix b/pkgs/by-name/la/ladspaH/package.nix similarity index 84% rename from pkgs/applications/audio/ladspa-sdk/ladspah.nix rename to pkgs/by-name/la/ladspaH/package.nix index fae714eb19ae..7c2515002b1c 100644 --- a/pkgs/applications/audio/ladspa-sdk/ladspah.nix +++ b/pkgs/by-name/la/ladspaH/package.nix @@ -3,11 +3,11 @@ stdenv, fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ladspa.h"; version = "1.15"; src = fetchurl { - url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; + url = "https://www.ladspa.org/download/ladspa_sdk_${finalAttrs.version}.tgz"; sha256 = "1vgx54cgsnc3ncl9qbgjbmq12c444xjafjkgr348h36j16draaa2"; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/linux-firmware/package.nix b/pkgs/by-name/li/linux-firmware/package.nix index f31439d6f313..b20668e4a8f7 100644 --- a/pkgs/by-name/li/linux-firmware/package.nix +++ b/pkgs/by-name/li/linux-firmware/package.nix @@ -22,13 +22,13 @@ let in stdenvNoCC.mkDerivation rec { pname = "linux-firmware"; - version = "20251011"; + version = "20251021"; src = fetchFromGitLab { owner = "kernel-firmware"; repo = "linux-firmware"; tag = version; - hash = "sha256-LFVrrVCqJORiHVnhIY0l7B4pRHI2MS0o/GbgOUDqO8s="; + hash = "sha256-hG5PGLmeVqe/kyr9Q113mlLZvP32GTi20vxHRhxKalw="; }; postUnpack = '' diff --git a/pkgs/applications/audio/linvstmanager/default.nix b/pkgs/by-name/li/linvstmanager/package.nix similarity index 71% rename from pkgs/applications/audio/linvstmanager/default.nix rename to pkgs/by-name/li/linvstmanager/package.nix index 6da4c7fcc626..5358d1d975d7 100644 --- a/pkgs/applications/audio/linvstmanager/default.nix +++ b/pkgs/by-name/li/linvstmanager/package.nix @@ -3,28 +3,27 @@ stdenv, fetchFromGitHub, cmake, - qtbase, - wrapQtAppsHook, + qt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "linvstmanager"; version = "1.1.1"; src = fetchFromGitHub { owner = "Goli4thus"; repo = "linvstmanager"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-K6eugimMy/MZgHYkg+zfF8DDqUuqqoeymxHtcFGu2Uk="; }; nativeBuildInputs = [ cmake - wrapQtAppsHook + qt5.wrapQtAppsHook ]; buildInputs = [ - qtbase + qt5.qtbase ]; postPatch = '' @@ -32,12 +31,12 @@ stdenv.mkDerivation rec { --replace-fail "cmake_minimum_required(VERSION 3.0.0)" "cmake_minimum_required(VERSION 3.10)" ''; - meta = with lib; { + meta = { description = "Graphical companion application for various bridges like LinVst, etc"; mainProgram = "linvstmanager"; homepage = "https://github.com/Goli4thus/linvstmanager"; - license = with licenses; [ gpl3 ]; - platforms = platforms.linux; - maintainers = [ maintainers.GabrielDougherty ]; + license = with lib.licenses; [ gpl3 ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ GabrielDougherty ]; }; -} +}) diff --git a/pkgs/applications/audio/mbrola/voices.nix b/pkgs/by-name/mb/mbrola-voices/package.nix similarity index 100% rename from pkgs/applications/audio/mbrola/voices.nix rename to pkgs/by-name/mb/mbrola-voices/package.nix diff --git a/pkgs/applications/audio/mbrola/default.nix b/pkgs/by-name/mb/mbrola/package.nix similarity index 100% rename from pkgs/applications/audio/mbrola/default.nix rename to pkgs/by-name/mb/mbrola/package.nix diff --git a/pkgs/applications/audio/mellowplayer/default.nix b/pkgs/by-name/me/mellowplayer/package.nix similarity index 77% rename from pkgs/applications/audio/mellowplayer/default.nix rename to pkgs/by-name/me/mellowplayer/package.nix index 418e80e15c20..89429be73733 100644 --- a/pkgs/applications/audio/mellowplayer/default.nix +++ b/pkgs/by-name/me/mellowplayer/package.nix @@ -1,43 +1,38 @@ { + stdenv, cmake, fetchFromGitLab, lib, libnotify, - mkDerivation, pkg-config, - qtbase, - qtdeclarative, - qtgraphicaleffects, - qtquickcontrols2, - qttools, - qtwebengine, - stdenv, + libsForQt5, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "MellowPlayer"; version = "3.6.8"; src = fetchFromGitLab { owner = "ColinDuquesnoy"; repo = "MellowPlayer"; - rev = version; + tag = finalAttrs.version; hash = "sha256-rsF2xQet7U8d4oGU/HgghvE3vvmkxjlGXPBlLD9mWTk="; }; nativeBuildInputs = [ cmake pkg-config + libsForQt5.wrapQtAppsHook ]; buildInputs = [ libnotify - qtbase - qtdeclarative - qtgraphicaleffects - qtquickcontrols2 - qttools - qtwebengine + libsForQt5.qtbase + libsForQt5.qtdeclarative + libsForQt5.qtgraphicaleffects + libsForQt5.qtquickcontrols2 + libsForQt5.qttools + libsForQt5.qtwebengine ]; doCheck = true; @@ -63,18 +58,18 @@ mkDerivation rec { (lib.optionalString (pkg ? qtQmlPrefix) '' export QML2_IMPORT_PATH="${pkg}/${pkg.qtQmlPrefix}"''${QML2_IMPORT_PATH:+':'}$QML2_IMPORT_PATH '') - ]) buildInputs + ]) finalAttrs.buildInputs ) )); - meta = with lib; { - inherit (qtbase.meta) platforms; + meta = { + inherit (libsForQt5.qtbase.meta) platforms; broken = stdenv.hostPlatform.isDarwin; # test build fails, but the project is not maintained anymore description = "Cloud music integration for your desktop"; mainProgram = "MellowPlayer"; homepage = "https://gitlab.com/ColinDuquesnoy/MellowPlayer"; - license = licenses.gpl2; - maintainers = with maintainers; [ kalbasit ]; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ kalbasit ]; }; -} +}) diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/by-name/mi/mixxx/package.nix similarity index 93% rename from pkgs/applications/audio/mixxx/default.nix rename to pkgs/by-name/mi/mixxx/package.nix index 82bd51e8ad17..ee9cbed563a7 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/by-name/mi/mixxx/package.nix @@ -36,11 +36,6 @@ portaudio, portmidi, protobuf, - qt5compat, - qtbase, - qtdeclarative, - qtkeychain, - qtsvg, rubberband, serd, sord, @@ -51,7 +46,7 @@ upower, vamp-plugin-sdk, wavpack, - wrapQtAppsHook, + kdePackages, }: stdenv.mkDerivation rec { @@ -74,7 +69,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + kdePackages.wrapQtAppsHook ]; buildInputs = [ @@ -110,11 +105,11 @@ stdenv.mkDerivation rec { portaudio portmidi protobuf - qt5compat - qtbase - qtdeclarative - qtkeychain - qtsvg + kdePackages.qt5compat + kdePackages.qtbase + kdePackages.qtdeclarative + kdePackages.qtkeychain + kdePackages.qtsvg rubberband serd sord diff --git a/pkgs/applications/audio/munt/mt32emu-qt.nix b/pkgs/by-name/mt/mt32emu-qt/package.nix similarity index 68% rename from pkgs/applications/audio/munt/mt32emu-qt.nix rename to pkgs/by-name/mt/mt32emu-qt/package.nix index ca2d22cc8071..a7eb6f529ca3 100644 --- a/pkgs/applications/audio/munt/mt32emu-qt.nix +++ b/pkgs/by-name/mt/mt32emu-qt/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - mkDerivation, fetchFromGitHub, alsa-lib, cmake, @@ -9,24 +8,20 @@ libmt32emu, pkg-config, portaudio, - qtbase, - qtmultimedia, withJack ? stdenv.hostPlatform.isUnix, libjack2, + libsForQt5, }: -let - char2underscore = char: str: lib.replaceStrings [ char ] [ "_" ] str; -in -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mt32emu-qt"; version = "1.11.1"; src = fetchFromGitHub { owner = "munt"; repo = "munt"; - rev = "${char2underscore "-" pname}_${char2underscore "." version}"; - sha256 = "sha256-PqYPYnKPlnU3PByxksBscl4GqDRllQdmD6RWpy/Ura0="; + tag = "mt32emu_qt_${lib.replaceString "." "_" finalAttrs.version}"; + hash = "sha256-PqYPYnKPlnU3PByxksBscl4GqDRllQdmD6RWpy/Ura0="; }; postPatch = '' @@ -36,13 +31,14 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config + libsForQt5.wrapQtAppsHook ]; buildInputs = [ libmt32emu portaudio - qtbase - qtmultimedia + libsForQt5.qtbase + libsForQt5.qtmultimedia ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib @@ -58,11 +54,11 @@ mkDerivation rec { postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications - mv $out/bin/${pname}.app $out/Applications/ - ln -s $out/{Applications/${pname}.app/Contents/MacOS,bin}/${pname} + mv $out/bin/mt32emu-qt.app $out/Applications/ + ln -s $out/{Applications/mt32emu-qt.app/Contents/MacOS,bin}/mt32emu-qt ''; - meta = with lib; { + meta = { homepage = "https://munt.sourceforge.net/"; description = "Synthesizer application built on Qt and libmt32emu"; mainProgram = "mt32emu-qt"; @@ -71,8 +67,8 @@ mkDerivation rec { synthesis and conversion of pre-recorded SMF files to WAVE making use of the mt32emu library and the Qt framework. ''; - license = with licenses; [ gpl3Plus ]; - maintainers = with maintainers; [ OPNA2608 ]; - platforms = platforms.all; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ OPNA2608 ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/by-name/mu/muse/package.nix similarity index 93% rename from pkgs/applications/audio/muse/default.nix rename to pkgs/by-name/mu/muse/package.nix index 5bf3612596b2..411bc19c4c0f 100644 --- a/pkgs/applications/audio/muse/default.nix +++ b/pkgs/by-name/mu/muse/package.nix @@ -5,8 +5,6 @@ cmake, extra-cmake-modules, pkg-config, - qttools, - wrapQtAppsHook, alsa-lib, dssi, fluidsynth, @@ -20,11 +18,11 @@ lilv, lrdf, lv2, - qtsvg, rtaudio, rubberband, sord, serd, + libsForQt5, }: stdenv.mkDerivation (finalAttrs: { @@ -34,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "muse-sequencer"; repo = "muse"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-LxibuqopMHuKEfTWXSEXc1g3wTm2F3NQRiV71FHvaY0="; }; @@ -44,8 +42,8 @@ stdenv.mkDerivation (finalAttrs: { cmake extra-cmake-modules pkg-config - qttools - wrapQtAppsHook + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; buildInputs = [ @@ -62,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { lilv lrdf lv2 - qtsvg + libsForQt5.qtsvg rtaudio rubberband sord diff --git a/pkgs/by-name/ne/newsboat/package.nix b/pkgs/by-name/ne/newsboat/package.nix index e98d0b26141c..477fdd0d8a7f 100644 --- a/pkgs/by-name/ne/newsboat/package.nix +++ b/pkgs/by-name/ne/newsboat/package.nix @@ -3,6 +3,9 @@ stdenv, rustPlatform, fetchFromGitHub, + fetchpatch, + cargo, + rustc, stfl, sqlite, curl, @@ -17,7 +20,7 @@ nix-update-script, }: -rustPlatform.buildRustPackage (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "newsboat"; version = "2.41"; @@ -28,19 +31,35 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-LhEhbK66OYwAD/pel81N7Hgh/xEvnFR8GlZzgqZIe5M="; }; - cargoHash = "sha256-CyhyzNw2LXwIVf/SX2rQRvEex5LmjZfZKgCe88jthz0="; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-CyhyzNw2LXwIVf/SX2rQRvEex5LmjZfZKgCe88jthz0="; + }; - # TODO: Check if that's still needed + # fix macOS build + patches = [ + (fetchpatch { + url = "https://github.com/newsboat/newsboat/commit/4139a0ba1ec87e442ef1408823b07fc739742f9d.patch"; + hash = "sha256-zdtdpUQGATq/9w+hAY/Va9Ob95c8VT2D9aKFmAF+O0c="; + }) + (fetchpatch { + url = "https://github.com/newsboat/newsboat/commit/4eb748b6b6b63acddb3582e012442e519e8704ea.patch"; + hash = "sha256-A/0WbuMIapTsLoziUPr95ZctIr2hW7JOJSdMVaWayYI="; + }) + ]; + + # allow other ncurses versions on Darwin postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - # Allow other ncurses versions on Darwin - substituteInPlace config.sh \ - --replace "ncurses5.4" "ncurses" + substituteInPlace config.sh --replace-fail "ncurses5.4" "ncurses" ''; nativeBuildInputs = [ pkg-config asciidoctor gettext + cargo + rustc + rustPlatform.cargoSetupHook ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper @@ -60,12 +79,6 @@ rustPlatform.buildRustPackage (finalAttrs: { gettext ]; - env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=deprecated-declarations" ]; - - postBuild = '' - make -j $NIX_BUILD_CORES prefix="$out" - ''; - # https://github.com/NixOS/nixpkgs/pull/98471#issuecomment-703100014 . We set # these for all platforms, since upstream's gettext crate behavior might # change in the future. @@ -73,16 +86,13 @@ rustPlatform.buildRustPackage (finalAttrs: { GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include"; GETTEXT_BIN_DIR = "${lib.getBin gettext}/bin"; + makeFlags = [ "prefix=$(out)" ]; + enableParallelBuilding = true; + doCheck = true; + checkTarget = "test"; - preCheck = '' - make -j $NIX_BUILD_CORES test - ''; - - postInstall = '' - make -j $NIX_BUILD_CORES prefix="$out" install - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' for prog in $out/bin/*; do wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" done @@ -92,13 +102,6 @@ rustPlatform.buildRustPackage (finalAttrs: { updateScript = nix-update-script { }; }; - installPhase = '' - runHook preInstall - install -Dm755 newsboat $out/bin/newsboat - install -Dm755 podboat $out/bin/podboat - runHook postInstall - ''; - meta = { homepage = "https://newsboat.org/"; changelog = "https://github.com/newsboat/newsboat/blob/${finalAttrs.src.tag}/CHANGELOG.md"; diff --git a/pkgs/applications/audio/nootka/default.nix b/pkgs/by-name/no/nootka/package.nix similarity index 59% rename from pkgs/applications/audio/nootka/default.nix rename to pkgs/by-name/no/nootka/package.nix index 88a5ed0c4301..7640384181eb 100644 --- a/pkgs/applications/audio/nootka/default.nix +++ b/pkgs/by-name/no/nootka/package.nix @@ -9,26 +9,21 @@ libpulseaudio, libvorbis, soundtouch, - qtbase, - qtdeclarative, - qtgraphicaleffects, - qtquickcontrols2, - qttools, - wrapQtAppsHook, + qt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nootka"; version = "2.0.2"; src = fetchurl { - url = "mirror://sourceforge/nootka/${pname}-${version}-source.tar.bz2"; - sha256 = "sha256-ZHdyLZ3+TCpQ77tcNuDlN2124qLDZu9DdH5x7RI1HIs="; + url = "mirror://sourceforge/nootka/nootka-${finalAttrs.version}-source.tar.bz2"; + hash = "sha256-ZHdyLZ3+TCpQ77tcNuDlN2124qLDZu9DdH5x7RI1HIs="; }; nativeBuildInputs = [ cmake - wrapQtAppsHook + qt5.wrapQtAppsHook ]; buildInputs = [ alsa-lib @@ -37,11 +32,11 @@ stdenv.mkDerivation rec { libpulseaudio libvorbis soundtouch - qtbase - qtdeclarative - qtgraphicaleffects - qtquickcontrols2 - qttools + qt5.qtbase + qt5.qtdeclarative + qt5.qtgraphicaleffects + qt5.qtquickcontrols2 + qt5.qttools ]; cmakeFlags = [ @@ -50,15 +45,15 @@ stdenv.mkDerivation rec { "-DENABLE_PULSEAUDIO=ON" ]; - meta = with lib; { + meta = { description = "Application for practicing playing musical scores and ear training"; mainProgram = "nootka"; homepage = "https://nootka.sourceforge.io/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ mmlb orivej ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/nv/nvidia-mig-parted/package.nix b/pkgs/by-name/nv/nvidia-mig-parted/package.nix index 0701e1fa2206..d135c3fb44b8 100644 --- a/pkgs/by-name/nv/nvidia-mig-parted/package.nix +++ b/pkgs/by-name/nv/nvidia-mig-parted/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "nvidia-mig-parted"; - version = "0.12.3"; + version = "0.13.0"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "mig-parted"; tag = "v${finalAttrs.version}"; - hash = "sha256-B4vSNG3+qbUqCvEmBz+VUgrnvhNvCR74uvo4uo+bD/Q="; + hash = "sha256-oSoPgap/LFjJ1tW3KLlcQ/zdym9A9h5zownktVxdQfY="; }; vendorHash = null; diff --git a/pkgs/by-name/op/openstack-rs/package.nix b/pkgs/by-name/op/openstack-rs/package.nix index e680073a1203..be2db56c5724 100644 --- a/pkgs/by-name/op/openstack-rs/package.nix +++ b/pkgs/by-name/op/openstack-rs/package.nix @@ -9,15 +9,15 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "openstack-rs"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "gtema"; repo = "openstack"; tag = "v${finalAttrs.version}"; - hash = "sha256-wK4CDG0W8cI+64wbK4PMvDy50b0WAktmJo+7Wf1ucjQ="; + hash = "sha256-90yuCPUS9yv2UbPOPj+aE8s3qMJXsda41uoMRAVYQ1g="; }; - cargoHash = "sha256-q1Q4GBWmdjIpjyN2wH9baxtgwvF6gG0aaqqVDn1ji44="; + cargoHash = "sha256-qUCgRCfCuu6bSSlUsY18QQHIOtOwwPyYnA2sCpuf10I="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/audio/patchance/default.nix b/pkgs/by-name/pa/patchance/package.nix similarity index 72% rename from pkgs/applications/audio/patchance/default.nix rename to pkgs/by-name/pa/patchance/package.nix index c527bc7037c2..dbe985fd808f 100644 --- a/pkgs/applications/audio/patchance/default.nix +++ b/pkgs/by-name/pa/patchance/package.nix @@ -1,27 +1,26 @@ { lib, fetchurl, - buildPythonApplication, + python3Packages, libjack2, - pyqt5, qt5, which, bash, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "patchance"; version = "1.1.0"; src = fetchurl { url = "https://github.com/Houston4444/Patchance/releases/download/v${version}/Patchance-${version}-source.tar.gz"; - sha256 = "sha256-wlkEKkPH2C/y7TQicIVycWbtLUdX2hICcUWi7nFN51w="; + hash = "sha256-wlkEKkPH2C/y7TQicIVycWbtLUdX2hICcUWi7nFN51w="; }; format = "other"; nativeBuildInputs = [ - pyqt5 # pyuic5 and pyrcc5 to build resources. + python3Packages.pyqt5 # pyuic5 and pyrcc5 to build resources. qt5.qttools # lrelease to build translations. which # which to find lrelease. qt5.wrapQtAppsHook @@ -30,7 +29,7 @@ buildPythonApplication rec { libjack2 bash ]; - propagatedBuildInputs = [ pyqt5 ]; + propagatedBuildInputs = [ python3Packages.pyqt5 ]; dontWrapQtApps = true; # The program is a python script. @@ -54,12 +53,12 @@ buildPythonApplication rec { done ''; - meta = with lib; { + meta = { homepage = "https://github.com/Houston4444/Patchance"; description = "JACK Patchbay GUI"; mainProgram = "patchance"; - license = licenses.gpl2; - maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ orivej ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/by-name/pe/petrifoo/package.nix similarity index 84% rename from pkgs/applications/audio/petrifoo/default.nix rename to pkgs/by-name/pe/petrifoo/package.nix index 71eb8a766482..864c1668c47a 100644 --- a/pkgs/applications/audio/petrifoo/default.nix +++ b/pkgs/by-name/pe/petrifoo/package.nix @@ -7,7 +7,7 @@ cmake, gtk2, libjack2, - libgnomecanvas, + gnome2, libpthreadstubs, libsamplerate, libsndfile, @@ -17,12 +17,12 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "petri-foo"; version = "0.1.87"; src = fetchurl { - url = "mirror://sourceforge/petri-foo/${pname}-${version}.tar.bz2"; + url = "mirror://sourceforge/petri-foo/petri-foo-${finalAttrs.version}.tar.bz2"; sha256 = "0b25iicgn8c42487fdw32ycfrll1pm2zjgy5djvgw6mfcaa4gizh"; }; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { alsa-lib gtk2 libjack2 - libgnomecanvas + gnome2.libgnomecanvas libpthreadstubs libsamplerate libsndfile @@ -61,13 +61,13 @@ stdenv.mkDerivation rec { openssl ]; - meta = with lib; { + meta = { description = "MIDI controllable audio sampler"; longDescription = "a fork of Specimen"; homepage = "https://petri-foo.sourceforge.net"; - license = licenses.gpl2Plus; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; maintainers = [ ]; mainProgram = "petri-foo"; }; -} +}) diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/by-name/pi/pithos/package.nix similarity index 85% rename from pkgs/applications/audio/pithos/default.nix rename to pkgs/by-name/pi/pithos/package.nix index 1cf887ab07cd..e293b5b28ed0 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/by-name/pi/pithos/package.nix @@ -8,7 +8,7 @@ appstream-glib, glib, wrapGAppsHook3, - pythonPackages, + python3Packages, gtk3, adwaita-icon-theme, gobject-introspection, @@ -17,7 +17,7 @@ gst_all_1, }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "pithos"; version = "1.6.2"; @@ -61,17 +61,17 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = [ adwaita-icon-theme ] - ++ (with pythonPackages; [ + ++ (with python3Packages; [ pygobject3 pylast ]); - meta = with lib; { + meta = { broken = stdenv.hostPlatform.isDarwin; description = "Pandora Internet Radio player for GNOME"; mainProgram = "pithos"; homepage = "https://pithos.github.io/"; - license = licenses.gpl3; - maintainers = with maintainers; [ obadz ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ obadz ]; }; } diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix index f6341f7f1bef..24531f410f2f 100644 --- a/pkgs/by-name/pi/pixi/package.nix +++ b/pkgs/by-name/pi/pixi/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pixi"; - version = "0.56.0"; + version = "0.57.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "pixi"; tag = "v${finalAttrs.version}"; - hash = "sha256-3YVIJLzFNJ5PlgT7NnxOtyA363A+qMpQPTr1N1E2daI="; + hash = "sha256-nWN+SCxlDeSzbnJtSIVVYw5G2WULdzD5VQ+Jc1xnpwI="; }; - cargoHash = "sha256-z9lsxQ08ZJ1xjhIXSP6adO+sMJk3adUKrXqKJy4MA0g="; + cargoHash = "sha256-YHLN6jPSsNxWQJI+uDYgfetQFnMk8v2ev/EPjSRrCJY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/audio/pragha/default.nix b/pkgs/by-name/pr/pragha/package.nix similarity index 83% rename from pkgs/applications/audio/pragha/default.nix rename to pkgs/by-name/pr/pragha/package.nix index a96b037d8c5b..067359851eb7 100644 --- a/pkgs/applications/audio/pragha/default.nix +++ b/pkgs/by-name/pr/pragha/package.nix @@ -1,14 +1,13 @@ { lib, + stdenv, intltool, - mkDerivation, installShellFiles, pkg-config, fetchFromGitHub, dbus-glib, desktop-file-utils, hicolor-icon-theme, - qtbase, sqlite, taglib, zlib, @@ -17,6 +16,7 @@ libcddb, libcdio, gst_all_1, + libsForQt5, withGstPlugins ? true, glyr, withGlyr ? true, @@ -45,15 +45,15 @@ assert withGlyr -> withLastfm; assert withLastfm -> withCD; -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pragha"; version = "1.3.99.1"; src = fetchFromGitHub { owner = "pragha-music-player"; repo = "pragha"; - rev = "v${version}"; - sha256 = "sha256-C4zh2NHqP4bwKMi5s+3AfEtKqxRlzL66H8OyNonGzxE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-C4zh2NHqP4bwKMi5s+3AfEtKqxRlzL66H8OyNonGzxE="; }; nativeBuildInputs = [ @@ -62,6 +62,7 @@ mkDerivation rec { xfce.xfce4-dev-tools desktop-file-utils installShellFiles + libsForQt5.wrapQtAppsHook ]; buildInputs = @@ -73,7 +74,7 @@ mkDerivation rec { gtk3 hicolor-icon-theme libpeas - qtbase + libsForQt5.qtbase sqlite taglib zlib @@ -108,17 +109,17 @@ mkDerivation rec { postInstall = '' qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") - install -m 444 data/${pname}.desktop $out/share/applications + install -m 444 data/pragha.desktop $out/share/applications install -d $out/share/pixmaps - installManPage data/${pname}.1 + installManPage data/pragha.1 ''; - meta = with lib; { + meta = { description = "Lightweight GTK+ music manager - fork of Consonance Music Manager"; mainProgram = "pragha"; homepage = "https://pragha-music-player.github.io/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ mbaeten ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ mbaeten ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/applications/audio/projectm_3/default.nix b/pkgs/by-name/pr/projectm_3/package.nix similarity index 88% rename from pkgs/applications/audio/projectm_3/default.nix rename to pkgs/by-name/pr/projectm_3/package.nix index 09db5ad83393..fb283966c723 100644 --- a/pkgs/applications/audio/projectm_3/default.nix +++ b/pkgs/by-name/pr/projectm_3/package.nix @@ -1,37 +1,37 @@ { stdenv, - mkDerivation, lib, fetchFromGitHub, autoreconfHook, pkg-config, SDL2, - qtdeclarative, libpulseaudio, glm, which, + libsForQt5, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "projectm"; version = "3.1.12"; src = fetchFromGitHub { owner = "projectM-visualizer"; repo = "projectM"; - rev = "v${version}"; - sha256 = "sha256-oEfOx93JyR94II5NkUCvMwqxuV7ktpOHZ8PNMLCiqDw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-oEfOx93JyR94II5NkUCvMwqxuV7ktpOHZ8PNMLCiqDw="; }; nativeBuildInputs = [ pkg-config autoreconfHook which + libsForQt5.wrapQtAppsHook ]; buildInputs = [ SDL2 - qtdeclarative + libsForQt5.qtdeclarative libpulseaudio glm ]; @@ -65,4 +65,4 @@ mkDerivation rec { Read an audio input and produces mesmerizing visuals, detecting tempo, and rendering advanced equations into a limitless array of user-contributed visualizations. ''; }; -} +}) diff --git a/pkgs/applications/audio/puredata/expose-error.patch b/pkgs/by-name/pu/puredata/expose-error.patch similarity index 100% rename from pkgs/applications/audio/puredata/expose-error.patch rename to pkgs/by-name/pu/puredata/expose-error.patch diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/by-name/pu/puredata/package.nix similarity index 100% rename from pkgs/applications/audio/puredata/default.nix rename to pkgs/by-name/pu/puredata/package.nix diff --git a/pkgs/applications/audio/puredata/wrapper.nix b/pkgs/by-name/pu/puredata/wrapper.nix similarity index 100% rename from pkgs/applications/audio/puredata/wrapper.nix rename to pkgs/by-name/pu/puredata/wrapper.nix diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/by-name/qj/qjackctl/package.nix similarity index 65% rename from pkgs/applications/audio/qjackctl/default.nix rename to pkgs/by-name/qj/qjackctl/package.nix index 49adf9fab6f9..fc2a1cdd8bf4 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/by-name/qj/qjackctl/package.nix @@ -1,20 +1,18 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, pkg-config, cmake, alsa-lib, libjack2, dbus, - qtbase, - qttools, - qtx11extras, + libsForQt5, # Enable jack session support jackSession ? false, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.9.91"; pname = "qjackctl"; @@ -23,14 +21,14 @@ mkDerivation rec { src = fetchFromGitHub { owner = "rncbc"; repo = "qjackctl"; - rev = "${pname}_${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-YfdRyylU/ktFvsh18FjpnG9MkV1HxHJBhRnHWQ7I+hY="; + tag = "qjackctl_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; + hash = "sha256-YfdRyylU/ktFvsh18FjpnG9MkV1HxHJBhRnHWQ7I+hY="; }; buildInputs = [ - qtbase - qtx11extras - qttools + libsForQt5.qtbase + libsForQt5.qtx11extras + libsForQt5.qttools alsa-lib libjack2 dbus @@ -39,6 +37,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config + libsForQt5.wrapQtAppsHook ]; cmakeFlags = [ @@ -46,12 +45,12 @@ mkDerivation rec { "-DCONFIG_JACK_SESSION=${toString jackSession}" ]; - meta = with lib; { + meta = { description = "Qt application to control the JACK sound server daemon"; mainProgram = "qjackctl"; homepage = "https://github.com/rncbc/qjackctl"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/by-name/qm/qmidinet/package.nix similarity index 55% rename from pkgs/applications/audio/qmidinet/default.nix rename to pkgs/by-name/qm/qmidinet/package.nix index 782ddc613260..ba981125e1ac 100644 --- a/pkgs/applications/audio/qmidinet/default.nix +++ b/pkgs/by-name/qm/qmidinet/package.nix @@ -1,40 +1,42 @@ { - mkDerivation, + stdenv, lib, fetchurl, pkg-config, - qtbase, - qttools, alsa-lib, libjack2, + libsForQt5, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.9.4"; pname = "qmidinet"; src = fetchurl { - url = "mirror://sourceforge/qmidinet/${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/qmidinet/qmidinet-${finalAttrs.version}.tar.gz"; sha256 = "sha256-7Ui4kUgYgpPVAaaINrd6WGZoYon5UuHszGVaHafb/p0="; }; hardeningDisable = [ "format" ]; buildInputs = [ - qtbase - qttools + libsForQt5.qtbase + libsForQt5.qttools alsa-lib libjack2 ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + libsForQt5.wrapQtAppsHook + ]; - meta = with lib; { + meta = { description = "MIDI network gateway application that sends and receives MIDI data (ALSA Sequencer and/or JACK MIDI) over the network"; mainProgram = "qmidinet"; homepage = "http://qmidinet.sourceforge.net/"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.magnetophon ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ magnetophon ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/by-name/qs/qsampler/package.nix similarity index 66% rename from pkgs/applications/audio/qsampler/default.nix rename to pkgs/by-name/qs/qsampler/package.nix index 46e7a5c7fea3..1abc916de994 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/by-name/qs/qsampler/package.nix @@ -1,23 +1,22 @@ { lib, + stdenv, fetchurl, autoconf, automake, libtool, pkg-config, - qttools, liblscp, libgig, - qtbase, - mkDerivation, + libsForQt5, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qsampler"; version = "0.6.1"; src = fetchurl { - url = "mirror://sourceforge/qsampler/${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/qsampler/qsampler-${finalAttrs.version}.tar.gz"; sha256 = "1wr7k739zx2nz00b810f60g9k3y92w05nfci987hw7y2sks9rd8j"; }; @@ -26,24 +25,25 @@ mkDerivation rec { automake libtool pkg-config - qttools + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; buildInputs = [ liblscp libgig - qtbase + libsForQt5.qtbase ]; preConfigure = "make -f Makefile.svn"; enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "http://www.linuxsampler.org"; description = "Graphical frontend to LinuxSampler"; mainProgram = "qsampler"; - license = licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/audio/raysession/default.nix b/pkgs/by-name/ra/raysession/package.nix similarity index 76% rename from pkgs/applications/audio/raysession/default.nix rename to pkgs/by-name/ra/raysession/package.nix index ad6ae6e03dd9..27cfceef16e6 100644 --- a/pkgs/applications/audio/raysession/default.nix +++ b/pkgs/by-name/ra/raysession/package.nix @@ -1,22 +1,20 @@ { lib, fetchurl, - buildPythonApplication, + python3Packages, libjack2, - pyliblo3, - pyqt5, which, bash, qt5, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "raysession"; version = "0.14.4"; src = fetchurl { url = "https://github.com/Houston4444/RaySession/releases/download/v${version}/RaySession-${version}-source.tar.gz"; - sha256 = "sha256-cr9kqZdqY6Wq+RkzwYxNrb/PLFREKUgWeVNILVUkc7A="; + hash = "sha256-cr9kqZdqY6Wq+RkzwYxNrb/PLFREKUgWeVNILVUkc7A="; }; postPatch = '' @@ -30,7 +28,7 @@ buildPythonApplication rec { format = "other"; nativeBuildInputs = [ - pyqt5 # pyuic5 and pyrcc5 to build resources. + python3Packages.pyqt5 # pyuic5 and pyrcc5 to build resources. qt5.qttools # lrelease to build translations. which # which to find lrelease. qt5.wrapQtAppsHook @@ -40,8 +38,8 @@ buildPythonApplication rec { bash ]; dependencies = [ - pyliblo3 - pyqt5 + python3Packages.pyliblo3 + python3Packages.pyqt5 ]; dontWrapQtApps = true; # The program is a python script. @@ -62,11 +60,11 @@ buildPythonApplication rec { done ''; - meta = with lib; { + meta = { homepage = "https://github.com/Houston4444/RaySession"; description = "Session manager for Linux musical programs"; - license = licenses.gpl2; - maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ orivej ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/rc/rclone/package.nix b/pkgs/by-name/rc/rclone/package.nix index fa6fa70030d6..1f54edecca42 100644 --- a/pkgs/by-name/rc/rclone/package.nix +++ b/pkgs/by-name/rc/rclone/package.nix @@ -17,7 +17,7 @@ buildGoModule rec { pname = "rclone"; - version = "1.71.1"; + version = "1.71.2"; outputs = [ "out" @@ -28,10 +28,10 @@ buildGoModule rec { owner = "rclone"; repo = "rclone"; tag = "v${version}"; - hash = "sha256-CvU07yzqBtQVjNtwnOLnSwULNkDMSmNTNyLFpDYy/w4="; + hash = "sha256-fmqIjwWhWj8ucw/OP6B9dCGKaF8eiVQdJEtK0a6G9E4="; }; - vendorHash = "sha256-Hapwa+WYz6a22HauRjRUl7q0ZlwR/j/zwex0VebgC+g="; + vendorHash = "sha256-0RK2gc3InPZZnAEgv01fgG19cWeKCsBP6JN2OCVY8O4="; subPackages = [ "." ]; diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/by-name/sa/samplv1/package.nix similarity index 75% rename from pkgs/applications/audio/samplv1/default.nix rename to pkgs/by-name/sa/samplv1/package.nix index c15e62c3612a..9991c26e50db 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/by-name/sa/samplv1/package.nix @@ -8,27 +8,24 @@ liblo, libsndfile, lv2, - qtbase, - qttools, rubberband, - wrapQtAppsHook, cmake, - qtsvg, + kdePackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "samplv1"; version = "1.3.2"; src = fetchurl { - url = "mirror://sourceforge/samplv1/samplv1-${version}.tar.gz"; + url = "mirror://sourceforge/samplv1/samplv1-${finalAttrs.version}.tar.gz"; hash = "sha256-YCxt9RAP02uAigddA6HjBt2ryM6MyOtI3L2eLg0AhFg="; }; nativeBuildInputs = [ - qttools + kdePackages.qttools pkg-config - wrapQtAppsHook + kdePackages.wrapQtAppsHook cmake ]; @@ -38,9 +35,9 @@ stdenv.mkDerivation rec { liblo libsndfile lv2 - qtbase + kdePackages.qtbase rubberband - qtsvg + kdePackages.qtsvg ]; meta = { @@ -51,4 +48,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/applications/audio/sayonara/default.nix b/pkgs/by-name/sa/sayonara/package.nix similarity index 83% rename from pkgs/applications/audio/sayonara/default.nix rename to pkgs/by-name/sa/sayonara/package.nix index bd9331d6bc7e..ac4043f3b686 100644 --- a/pkgs/applications/audio/sayonara/default.nix +++ b/pkgs/by-name/sa/sayonara/package.nix @@ -1,5 +1,5 @@ { - mkDerivation, + stdenv, cmake, fetchFromGitLab, nix-update-script, @@ -9,11 +9,10 @@ ninja, pcre, pkg-config, - qtbase, - qttools, taglib, zlib, python3, + libsForQt5, }: let @@ -23,14 +22,14 @@ let ] ); in -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sayonara"; version = "1.10.0-stable1"; src = fetchFromGitLab { owner = "luciocarreras"; repo = "sayonara-player"; - rev = version; + tag = finalAttrs.version; hash = "sha256-ZcuWe1dsLJS4/nLXSSKB7wzPU9COFyE4vPSwZIo0bgI="; }; @@ -44,13 +43,14 @@ mkDerivation rec { cmake ninja pkg-config - qttools + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; buildInputs = [ libpulseaudio pcre - qtbase + libsForQt5.qtbase taglib zlib py @@ -80,11 +80,11 @@ mkDerivation rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Sayonara music player"; homepage = "https://sayonara-player.com/"; - license = licenses.gpl3; - maintainers = with maintainers; [ deepfire ]; - platforms = platforms.unix; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ deepfire ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/se/semantic-release/package.nix b/pkgs/by-name/se/semantic-release/package.nix index a8d5c57bd61c..7287e7a67d55 100644 --- a/pkgs/by-name/se/semantic-release/package.nix +++ b/pkgs/by-name/se/semantic-release/package.nix @@ -9,16 +9,16 @@ buildNpmPackage rec { pname = "semantic-release"; - version = "25.0.0"; + version = "25.0.1"; src = fetchFromGitHub { owner = "semantic-release"; repo = "semantic-release"; rev = "v${version}"; - hash = "sha256-B+j84GeRw9YFMx8kTXPqqs57ClgZtziAh/BXh47WfVc="; + hash = "sha256-6OgqZh9OXITPwOtCD209H7KjPGf2MK/sCcrzZgpasyE="; }; - npmDepsHash = "sha256-0eHK2FiRRzfvCrGag0/KDq/3nWZbwnM1FEhtKu4mrHE="; + npmDepsHash = "sha256-/Ba4udEUZAEfUmMcUHykkLGPvH9lr8Wxb+6FkJKYiWQ="; dontNpmBuild = true; diff --git a/pkgs/applications/audio/seq66/default.nix b/pkgs/by-name/se/seq66/package.nix similarity index 73% rename from pkgs/applications/audio/seq66/default.nix rename to pkgs/by-name/se/seq66/package.nix index 90ed92fa2039..0d0415ba25cb 100644 --- a/pkgs/applications/audio/seq66/default.nix +++ b/pkgs/by-name/se/seq66/package.nix @@ -4,55 +4,53 @@ fetchFromGitHub, autoreconfHook, pkg-config, - qttools, which, alsa-lib, libjack2, liblo, - qtbase, - wrapQtAppsHook, + qt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "seq66"; version = "0.99.21"; src = fetchFromGitHub { owner = "ahlstromcj"; repo = "seq66"; - rev = version; + tag = finalAttrs.version; hash = "sha256-0joa69nSX3lcpoRq9YToNA75Sg9dlYMGRZEfcJm9Vjg="; }; nativeBuildInputs = [ autoreconfHook pkg-config - qttools + qt5.qttools which - wrapQtAppsHook + qt5.wrapQtAppsHook ]; buildInputs = [ alsa-lib libjack2 liblo - qtbase + qt5.qtbase ]; postPatch = '' for d in libseq66/src libsessions/include libsessions/src seq_qt5/src seq_rtmidi/src; do - substituteInPlace "$d/Makefile.am" --replace-fail '$(git_info)' '${version}' + substituteInPlace "$d/Makefile.am" --replace-fail '$(git_info)' '${finalAttrs.version}' done ''; enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://github.com/ahlstromcj/seq66"; description = "Loop based midi sequencer with Qt GUI derived from seq24 and sequencer64"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ orivej ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ orivej ]; mainProgram = "qseq66"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/by-name/sy/synthv1/package.nix similarity index 50% rename from pkgs/applications/audio/synthv1/default.nix rename to pkgs/by-name/sy/synthv1/package.nix index 4f6582a875cc..cda48be4f6ae 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/by-name/sy/synthv1/package.nix @@ -1,42 +1,44 @@ { - mkDerivation, lib, + stdenv, fetchurl, pkg-config, - qtbase, - qttools, libjack2, alsa-lib, liblo, lv2, + libsForQt5, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "synthv1"; version = "0.9.23"; src = fetchurl { - url = "mirror://sourceforge/synthv1/${pname}-${version}.tar.gz"; - sha256 = "sha256-0V72T51icT/t9fJf4mwcMYZLjzTPnmiCbU+BdwnCmw4="; + url = "mirror://sourceforge/synthv1/synthv1-${finalAttrs.version}.tar.gz"; + hash = "sha256-0V72T51icT/t9fJf4mwcMYZLjzTPnmiCbU+BdwnCmw4="; }; buildInputs = [ - qtbase - qttools + libsForQt5.qtbase + libsForQt5.qttools libjack2 alsa-lib liblo lv2 ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + libsForQt5.wrapQtAppsHook + ]; - meta = with lib; { + meta = { description = "Old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx"; mainProgram = "synthv1_jack"; homepage = "https://synthv1.sourceforge.io/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix index 3ae9850b5285..fb2da8295749 100644 --- a/pkgs/by-name/to/tombi/package.nix +++ b/pkgs/by-name/to/tombi/package.nix @@ -9,19 +9,19 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tombi"; - version = "0.6.33"; + version = "0.6.37"; src = fetchFromGitHub { owner = "tombi-toml"; repo = "tombi"; tag = "v${finalAttrs.version}"; - hash = "sha256-K8r+AmIOD0WjC7U4x0Xr6KUiGMykk9lHQs38MIKa4MQ="; + hash = "sha256-oQx38k/ANf/+SA7FZqw8tQejt4WQd5yPPgcMEuFcUGU="; }; # Tests relies on the presence of network doCheck = false; cargoBuildFlags = [ "--package tombi-cli" ]; - cargoHash = "sha256-dz9AtZTCKSQuk9LpNVSxx/yLIujzG5U4vE/OdapCqvM="; + cargoHash = "sha256-bj+d03asqABk4RphtCPQoM8E36Hb26yzAhSMIgrg7DI="; postPatch = '' substituteInPlace Cargo.toml \ diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/by-name/tr/traverso/package.nix similarity index 74% rename from pkgs/applications/audio/traverso/default.nix rename to pkgs/by-name/tr/traverso/package.nix index d58ccbf940f0..c554ac5683c9 100644 --- a/pkgs/applications/audio/traverso/default.nix +++ b/pkgs/by-name/tr/traverso/package.nix @@ -1,5 +1,5 @@ { - mkDerivation, + stdenv, lib, fetchurl, cmake, @@ -15,22 +15,24 @@ libsndfile, libvorbis, portaudio, - qtbase, wavpack, + libsForQt5, }: -mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "traverso"; version = "0.49.6"; src = fetchurl { - url = "https://traverso-daw.org/traverso-0.49.6.tar.gz"; + url = "https://traverso-daw.org/traverso-${finalAttrs.version}.tar.gz"; sha256 = "12f7x8kw4fw1j0xkwjrp54cy4cv1ql0zwz2ba5arclk4pf6bhl7q"; }; nativeBuildInputs = [ cmake pkg-config + libsForQt5.wrapQtAppsHook ]; + buildInputs = [ alsa-lib fftw @@ -43,7 +45,7 @@ mkDerivation { libsndfile.dev libvorbis portaudio - qtbase + libsForQt5.qtbase wavpack ]; @@ -56,15 +58,15 @@ mkDerivation { hardeningDisable = [ "format" ]; - meta = with lib; { + meta = { description = "Cross-platform multitrack audio recording and audio editing suite"; mainProgram = "traverso"; homepage = "https://traverso-daw.org/"; - license = with licenses; [ + license = with lib.licenses; [ gpl2Plus lgpl21Plus ]; - platforms = platforms.all; - maintainers = with maintainers; [ coconnor ]; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ coconnor ]; }; -} +}) diff --git a/pkgs/by-name/ur/ursadb/package.nix b/pkgs/by-name/ur/ursadb/package.nix index 108c9ef067cc..ec3f808df0ee 100644 --- a/pkgs/by-name/ur/ursadb/package.nix +++ b/pkgs/by-name/ur/ursadb/package.nix @@ -25,6 +25,12 @@ stdenv.mkDerivation (finalAttrs: { --replace "target_clangformat_setup(ursadb_test)" "" \ --replace 'target_include_directories(ursadb_test PUBLIC ${"$"}{CMAKE_SOURCE_DIR})' "" \ --replace "ursadb_test" "" + + substituteInPlace extern/spdlog/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)" + substituteInPlace extern/libzmq/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.0.2)" "cmake_minimum_required(VERSION 3.10)" \ + --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)" ''; nativeBuildInputs = [ @@ -37,6 +43,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; maintainers = with maintainers; [ msm ]; platforms = platforms.unix; - broken = stdenv.hostPlatform.isDarwin; + broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64; }; }) diff --git a/pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix b/pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix index b64d19521905..8f2d5bcb4c1a 100644 --- a/pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix +++ b/pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { pkg-config ]; - patchPhase = lib.optionalString stdenv.hostPlatform.isMusl '' + postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1 ''; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d6bd8bc4302a..b42dbb5a4b33 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -747,43 +747,6 @@ with haskellLib; # https://github.com/illia-shkroba/pfile/issues/2 pfile = doJailbreak super.pfile; - # Manually maintained - cachix-api = overrideCabal (drv: { - # FIXME: should use overrideSrc - version = "1.7.9"; - src = pkgs.fetchFromGitHub { - owner = "cachix"; - repo = "cachix"; - tag = "v1.7.9"; - hash = "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A="; - }; - postUnpack = "sourceRoot=$sourceRoot/cachix-api"; - }) super.cachix-api; - cachix = ( - overrideCabal - (drv: { - # FIXME: should use overrideSrc - version = "1.7.9"; - src = pkgs.fetchFromGitHub { - owner = "cachix"; - repo = "cachix"; - tag = "v1.7.9"; - hash = "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A="; - }; - postUnpack = "sourceRoot=$sourceRoot/cachix"; - # Fix ambiguous 'show' reference: https://github.com/cachix/cachix/pull/704 - postPatch = '' - sed -i 's/<> show i/<> Protolude.show i/' src/Cachix/Client/NixVersion.hs - ''; - }) - ( - super.cachix.override { - nix = self.hercules-ci-cnix-store.nixPackage; - hnix-store-core = self.hnix-store-core_0_8_0_0; - } - ) - ); - # Overly strict bounds on postgresql-simple (< 0.7), tasty (< 1.5) and tasty-quickcheck (< 0.11) # https://github.com/tdammers/migrant/pull/5 migrant-core = doJailbreak super.migrant-core; @@ -4070,3 +4033,41 @@ with haskellLib; ); } ) + +# Cachix packages +# Manually maintained +// ( + let + version = "1.9.1"; + + src = pkgs.fetchFromGitHub { + owner = "cachix"; + repo = "cachix"; + tag = "v${version}"; + hash = "sha256-IwnNtbNVrlZIHh7h4Wz6VP0Furxg9Hh0ycighvL5cZc="; + }; + in + { + cachix-api = overrideSrc { + inherit version; + src = src + "/cachix-api"; + } super.cachix-api; + + cachix = lib.pipe super.cachix [ + (overrideSrc { + inherit version; + src = src + "/cachix"; + }) + (addBuildDepends [ + self.pqueue + ]) + ( + drv: + drv.override { + nix = self.hercules-ci-cnix-store.nixPackage; + hnix-store-core = self.hnix-store-core_0_8_0_0; + } + ) + ]; + } +) diff --git a/pkgs/development/python-modules/aioamazondevices/default.nix b/pkgs/development/python-modules/aioamazondevices/default.nix index da0b52e3eb23..b1153a351968 100644 --- a/pkgs/development/python-modules/aioamazondevices/default.nix +++ b/pkgs/development/python-modules/aioamazondevices/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "aioamazondevices"; - version = "6.4.4"; + version = "6.4.6"; pyproject = true; src = fetchFromGitHub { owner = "chemelli74"; repo = "aioamazondevices"; tag = "v${version}"; - hash = "sha256-zp6lWRnyDTHi1Pm2Ra8xCrRBGfge1wli1EEebv5T8gM="; + hash = "sha256-EjgZ/zmUSCaLDUmijYMCXvwpl4dWfjmTdlO5VLuzIHg="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/bluecurrent-api/default.nix b/pkgs/development/python-modules/bluecurrent-api/default.nix index 33e250cbe4cd..a92ed1b08aca 100644 --- a/pkgs/development/python-modules/bluecurrent-api/default.nix +++ b/pkgs/development/python-modules/bluecurrent-api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bluecurrent-api"; - version = "1.3.1"; + version = "1.3.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bluecurrent"; repo = "HomeAssistantAPI"; tag = "v${version}"; - hash = "sha256-PX0pD7X0o7OVtlz4Q5KuDBH83jtTaIdMnuLvAMTP8+U="; + hash = "sha256-a0IqtRj761h1P8Q3xrFY1XPFl6J6HaArv6IfO88OJco="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index 1ea295a14750..a39d79049575 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "3.14.2"; + version = "3.15.0"; pyproject = true; src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = "bthome-ble"; tag = "v${version}"; - hash = "sha256-kxKQnHrRZE7ugrRn7VSwQ99TtEX/DmH5x4Yy22UsXjA="; + hash = "sha256-AFALd5owqwaXPiMs0zHkGKpNqcpKG2O/JXXvuEF4d3s="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/cometx/default.nix b/pkgs/development/python-modules/cometx/default.nix index eb83df977162..c232b0b2c56a 100644 --- a/pkgs/development/python-modules/cometx/default.nix +++ b/pkgs/development/python-modules/cometx/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "cometx"; - version = "3.0.1"; + version = "3.1.0"; pyproject = true; build-system = [ setuptools ]; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "comet-ml"; repo = "cometx"; tag = version; - hash = "sha256-Dudg1GLeo9WhtZnW+PEi10pxA+EDUBs2u3oIBMN8w30="; + hash = "sha256-7rxEJNmJsFExfvYCuO/JOgj7yRFBjceE1bhRL1hFoPU="; }; dependencies = [ diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix index 946c08e01cab..e50704fd8598 100644 --- a/pkgs/development/python-modules/docling-core/default.nix +++ b/pkgs/development/python-modules/docling-core/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "docling-core"; - version = "2.48.4"; + version = "2.49.0"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling-core"; tag = "v${version}"; - hash = "sha256-nGV0/8lL+JCGml8TF8+wBRax4WsAXQ0+f8fzy5k2gZI="; + hash = "sha256-c/uU5qeoCXNuMJwsG/Z2+M4N+M8j66fuiSr461on8Aw="; }; build-system = [ diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index 6a7c8b51bee3..04d5d9b8f5f6 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -95,6 +95,64 @@ buildPythonPackage rec { # see: https://github.com/Toblerity/Fiona/issues/1273 "test_append_memoryfile_drivers" + + # AssertionError CLI exists with non-zero error code + # This is a regression introduced by https://github.com/NixOS/nixpkgs/pull/448189 + "test_bbox_json_yes" + "test_bbox_no" + "test_bbox_where" + "test_bbox_yes" + "test_bbox_yes_two_files" + "test_bool_seq" + "test_bounds_explode_with_obj" + "test_calc_seq" + "test_collect_ld" + "test_collect_no_rs" + "test_collect_noparse" + "test_collect_noparse_records" + "test_collect_noparse_rs" + "test_collect_rec_buffered" + "test_collect_rs" + "test_creation_options" + "test_different_crs" + "test_distrib" + "test_distrib_no_rs" + "test_dst_crs_default_to_src_crs" + "test_dst_crs_epsg3857" + "test_dst_crs_no_src" + "test_existing_property" + "test_explode" + "test_explode_output_rs" + "test_explode_pp" + "test_explode_with_id" + "test_filter" + "test_fio_load_layer" + "test_fio_load_layer_append" + "test_load__auto_detect_format" + "test_load__auto_detect_format" + "test_load__auto_detect_format" + "test_load__auto_detect_format" + "test_load__auto_detect_format" + "test_map_count" + "test_multi_layer" + "test_one" + "test_precision" + "test_reduce_area" + "test_reduce_area" + "test_reduce_union" + "test_reduce_union_zip_properties" + "test_seq" + "test_seq" + "test_seq_no_rs" + "test_seq_rs" + "test_seq_rs" + "test_two" + "test_vfs" + "test_where_no" + "test_where_yes" + "test_where_yes_two_files" + "test_with_id" + "test_with_obj" ]; pythonImportsCheck = [ "fiona" ]; diff --git a/pkgs/development/python-modules/gtts/default.nix b/pkgs/development/python-modules/gtts/default.nix index 36b3f6835d75..24bc7eb2ed4f 100644 --- a/pkgs/development/python-modules/gtts/default.nix +++ b/pkgs/development/python-modules/gtts/default.nix @@ -29,6 +29,9 @@ buildPythonPackage rec { build-system = [ setuptools ]; + pythonRelaxDeps = [ + "click" + ]; dependencies = [ beautifulsoup4 click @@ -53,12 +56,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "gtts" ]; - meta = with lib; { + meta = { description = "Python library and CLI tool to interface with Google Translate text-to-speech API"; mainProgram = "gtts-cli"; homepage = "https://gtts.readthedocs.io"; changelog = "https://gtts.readthedocs.io/en/latest/changelog.html"; - license = licenses.mit; - maintainers = with maintainers; [ unode ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ unode ]; }; } diff --git a/pkgs/development/python-modules/llguidance/default.nix b/pkgs/development/python-modules/llguidance/default.nix index ff1f22856ce2..2256fc21346c 100644 --- a/pkgs/development/python-modules/llguidance/default.nix +++ b/pkgs/development/python-modules/llguidance/default.nix @@ -22,19 +22,19 @@ buildPythonPackage rec { pname = "llguidance"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "guidance-ai"; repo = "llguidance"; tag = "v${version}"; - hash = "sha256-Fe7cKZotjRexcSHcoT0Y9I3m+dRarhlBOjYR7rdJBRY="; + hash = "sha256-lnQn8587ioMXm1HiY/yBLFdofJldsw0Y6csBJiVnBrs="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src pname version; - hash = "sha256-//Vjj4QIDcZEPujMfUhZd5nx5pAyF3l3CdNvI/Wi74A="; + hash = "sha256-CMRkOeO8JMVatjjDNsaN2CcWGQS/l0onjqrCbp3/49Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mcdreforged/default.nix b/pkgs/development/python-modules/mcdreforged/default.nix index 796301df1627..c561b1b914b3 100644 --- a/pkgs/development/python-modules/mcdreforged/default.nix +++ b/pkgs/development/python-modules/mcdreforged/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "mcdreforged"; - version = "2.15.4"; + version = "2.15.5"; pyproject = true; src = fetchFromGitHub { owner = "MCDReforged"; repo = "MCDReforged"; tag = "v${version}"; - hash = "sha256-q88jAsgoIFzsOVKeA4fk69wGbnq3HcYJ2YzeZQHmYo4="; + hash = "sha256-4zThW18/6aO5gCsxx7TNM+q0Z7/c6G5zUxbCMpwEsEU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mercantile/default.nix b/pkgs/development/python-modules/mercantile/default.nix index 9d8f59cbef96..0c825469ed6e 100644 --- a/pkgs/development/python-modules/mercantile/default.nix +++ b/pkgs/development/python-modules/mercantile/default.nix @@ -2,35 +2,89 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system + setuptools, + + # dependencies click, - pytestCheckHook, + + # tests hypothesis, + pytestCheckHook, + versionCheckHook, }: buildPythonPackage rec { pname = "mercantile"; version = "1.2.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mapbox"; repo = "mercantile"; - rev = version; + tag = version; hash = "sha256-DiDXO2XnD3We6NhP81z7aIHzHrHDi/nkqy98OT9986w="; }; - propagatedBuildInputs = [ click ]; - - nativeCheckInputs = [ - pytestCheckHook - hypothesis + build-system = [ + setuptools ]; - meta = with lib; { + dependencies = [ + click + ]; + + nativeCheckInputs = [ + hypothesis + pytestCheckHook + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + + disabledTests = [ + # AssertionError CLI exists with non-zero error code + # This is a regression introduced by https://github.com/NixOS/nixpkgs/pull/448189 + "test_cli_bounding_tile" + "test_cli_bounding_tile2" + "test_cli_bounding_tile_bbox" + "test_cli_bounding_tile_geosjon" + "test_cli_children" + "test_cli_multi_bounding_tile" + "test_cli_multi_bounding_tile_seq" + "test_cli_neighbors" + "test_cli_parent" + "test_cli_parent_depth" + "test_cli_parent_failure" + "test_cli_parent_multidepth" + "test_cli_quadkey_from_mixed" + "test_cli_quadkey_from_quadkeys" + "test_cli_quadkey_from_tiles" + "test_cli_shapes" + "test_cli_shapes_collect" + "test_cli_shapes_compact" + "test_cli_shapes_failure" + "test_cli_shapes_indentation" + "test_cli_strict_overlap_contain" + "test_cli_tiles_bad_bounds" + "test_cli_tiles_bounding_tiles_seq" + "test_cli_tiles_bounding_tiles_z0" + "test_cli_tiles_geosjon" + "test_cli_tiles_implicit_stdin" + "test_cli_tiles_multi_bounds" + "test_cli_tiles_multi_bounds_seq" + "test_cli_tiles_no_bounds" + "test_cli_tiles_point_geojson" + "test_cli_tiles_points" + "test_cli_tiles_seq" + ]; + + meta = { description = "Spherical mercator tile and coordinate utilities"; mainProgram = "mercantile"; homepage = "https://github.com/mapbox/mercantile"; - license = licenses.bsd3; - maintainers = with maintainers; [ sikmir ]; + changelog = "https://github.com/mapbox/mercantile/blob/${version}/CHANGES.txt"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sikmir ]; }; } diff --git a/pkgs/development/python-modules/morecantile/default.nix b/pkgs/development/python-modules/morecantile/default.nix index c5e29eecfd02..e9f4650acb18 100644 --- a/pkgs/development/python-modules/morecantile/default.nix +++ b/pkgs/development/python-modules/morecantile/default.nix @@ -3,23 +3,27 @@ stdenv, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, - pythonOlder, + # build-system + flit, + + # dependencies attrs, click, - flit, - mercantile, pydantic, pyproj, + + # tests + mercantile, rasterio, + pytestCheckHook, + versionCheckHook, }: buildPythonPackage rec { pname = "morecantile"; version = "6.2.0"; pyproject = true; - disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "developmentseed"; @@ -28,9 +32,9 @@ buildPythonPackage rec { hash = "sha256-ohTSgkjgaANS/Pli4fao+THA4ltts6svj5CdJEgorz0="; }; - nativeBuildInputs = [ flit ]; + build-system = [ flit ]; - propagatedBuildInputs = [ + dependencies = [ attrs click pydantic @@ -41,9 +45,26 @@ buildPythonPackage rec { mercantile pytestCheckHook rasterio + versionCheckHook ]; + versionCheckProgramArg = "--version"; - disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + disabledTests = [ + # AssertionError CLI exists with non-zero error code + # This is a regression introduced by https://github.com/NixOS/nixpkgs/pull/448189 + "test_cli_shapes" + "test_cli_shapesWGS84" + "test_cli_strict_overlap_contain" + "test_cli_tiles_bad_bounds" + "test_cli_tiles_geosjon" + "test_cli_tiles_implicit_stdin" + "test_cli_tiles_multi_bounds" + "test_cli_tiles_multi_bounds_seq" + "test_cli_tiles_ok" + "test_cli_tiles_points" + "test_cli_tiles_seq" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # https://github.com/developmentseed/morecantile/issues/156 "test_tiles_when_tms_bounds_and_provided_bounds_cross_antimeridian" ]; @@ -52,7 +73,9 @@ buildPythonPackage rec { meta = { description = "Construct and use map tile grids in different projection"; - homepage = "https://developmentseed.org/morecantile/"; + homepage = "https://developmentseed.org/morecantile"; + downloadPage = "https://github.com/developmentseed/morecantile"; + changelog = "https://github.com/developmentseed/morecantile/releases/tag/${src.tag}"; license = lib.licenses.mit; teams = [ lib.teams.geospatial ]; mainProgram = "morecantile"; diff --git a/pkgs/development/python-modules/pymobiledevice3/default.nix b/pkgs/development/python-modules/pymobiledevice3/default.nix index 4204cb8df42c..f621a696435f 100644 --- a/pkgs/development/python-modules/pymobiledevice3/default.nix +++ b/pkgs/development/python-modules/pymobiledevice3/default.nix @@ -48,14 +48,14 @@ buildPythonPackage rec { pname = "pymobiledevice3"; - version = "4.27.5"; + version = "4.27.6"; pyproject = true; src = fetchFromGitHub { owner = "doronz88"; repo = "pymobiledevice3"; tag = "v${version}"; - hash = "sha256-dfbh1NvM/XccsGnJ7iTBzkdc31eOSaDs8671cibLI14="; + hash = "sha256-UOB8cNswgTKIRXU7KOr6rgc+oqj2DUu4BKqFljsQSw8="; }; build-system = [ diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 9fc55c214146..53c1513e2c9d 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -1,42 +1,43 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, - pythonOlder, - stdenv, - testers, + # build-system + cython, + gdal, + numpy, + setuptools, + + # dependencies affine, attrs, - boto3, certifi, click, click-plugins, cligj, - cython, - fsspec, - gdal, - hypothesis, + snuggs, + + # optional-dependencies ipython, matplotlib, - numpy, - packaging, - pytest-randomly, - setuptools, - shapely, - snuggs, - wheel, + boto3, - rasterio, # required to run version test + # tests + fsspec, + hypothesis, + packaging, + pytestCheckHook, + pytest-randomly, + shapely, + versionCheckHook, }: buildPythonPackage rec { pname = "rasterio"; version = "1.4.3"; - format = "pyproject"; - - disabled = pythonOlder "3.8"; + pyproject = true; src = fetchFromGitHub { owner = "rasterio"; @@ -50,15 +51,14 @@ buildPythonPackage rec { --replace-fail "cython~=3.0.2" cython ''; - nativeBuildInputs = [ + build-system = [ cython gdal numpy setuptools - wheel ]; - propagatedBuildInputs = [ + dependencies = [ affine attrs certifi @@ -83,7 +83,9 @@ buildPythonPackage rec { pytestCheckHook pytest-randomly shapely + versionCheckHook ]; + versionCheckProgramArg = "--version"; preCheck = '' rm -r rasterio # prevent importing local rasterio @@ -102,23 +104,26 @@ buildPythonPackage rec { "test_warp" "test_warpedvrt" "test_rio_warp" + + # AssertionError CLI exists with non-zero error code + # This is a regression introduced by https://github.com/NixOS/nixpkgs/pull/448189 + "test_sample_stdin" + "test_transform" + "test_transform_point" + "test_transform_point_dst_file" + "test_transform_point_multi" + "test_transform_point_src_file" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_reproject_error_propagation" ]; pythonImportsCheck = [ "rasterio" ]; - passthru.tests.version = testers.testVersion { - package = rasterio; - version = version; - command = "${rasterio}/bin/rio --version"; - }; - - meta = with lib; { + meta = { description = "Python package to read and write geospatial raster data"; mainProgram = "rio"; homepage = "https://rasterio.readthedocs.io/"; changelog = "https://github.com/rasterio/rasterio/blob/${version}/CHANGES.txt"; - license = licenses.bsd3; - teams = [ teams.geospatial ]; + license = lib.licenses.bsd3; + teams = [ lib.teams.geospatial ]; }; } diff --git a/pkgs/servers/home-assistant/custom-components/systemair/package.nix b/pkgs/servers/home-assistant/custom-components/systemair/package.nix index e55bb645fa56..f2b13e6ff225 100644 --- a/pkgs/servers/home-assistant/custom-components/systemair/package.nix +++ b/pkgs/servers/home-assistant/custom-components/systemair/package.nix @@ -1,25 +1,39 @@ { lib, + pymodbus, buildHomeAssistantComponent, fetchFromGitHub, + async-timeout, + aiohttp, }: buildHomeAssistantComponent rec { - owner = "tesharp"; + owner = "AN3Orik"; domain = "systemair"; - version = "0.2.0"; + version = "1.0.11"; src = fetchFromGitHub { inherit owner; repo = "systemair"; tag = "v${version}"; - hash = "sha256-lzFnKPkBOt2fkVGWCj1M/skSr8V39GgDHS+0HD4ACAw="; + hash = "sha256-/M9ErhtggyaY8ZZyhdPSoVCGqrhAQ9/RMRyl34Ks3mc="; }; + postPatch = '' + substituteInPlace custom_components/systemair/manifest.json \ + --replace-fail "pymodbus==" "pymodbus>=" \ + ''; + + dependencies = [ + pymodbus + async-timeout + aiohttp + ]; + meta = with lib; { - changelog = "https://github.com/tesharp/systemair/releases/tag/v${version}"; - description = "Home Assistant component for Systemair SAVE Connect 2"; - homepage = "https://github.com/tesharp/systemair"; + changelog = "https://github.com/AN3Orik/systemair/releases/tag/v${version}"; + description = "Home Assistant component for Systemair SAVE ventilation units"; + homepage = "https://github.com/AN3Orik/systemair"; maintainers = with maintainers; [ uvnikita ]; license = licenses.mit; }; diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index 8f28667c1604..348bd973f3b8 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -5,14 +5,14 @@ patches ? [ ], }: let - version = "4.4.7"; + version = "4.4.8"; in applyPatches { src = fetchFromGitHub { owner = "mastodon"; repo = "mastodon"; rev = "v${version}"; - hash = "sha256-jm8qqgYEQMDB/5p/iQecFAGIIazPuv4ruoVgy9YSlVU="; + hash = "sha256-EE0A9EH+8ND9Whig2dhM27EONjJfdVtd9g+Mo0/2iHo="; passthru = { inherit version; yarnHash = "sha256-K1EqeLi4dWnaLIaUU5apxE5ZOM98XBn6KTHWTkPLWE0="; diff --git a/pkgs/servers/mastodon/update.sh b/pkgs/servers/mastodon/update.sh index 6874b8223c3b..75d7e9b74540 100755 --- a/pkgs/servers/mastodon/update.sh +++ b/pkgs/servers/mastodon/update.sh @@ -113,6 +113,6 @@ echo "" >> gemset.nix # Create trailing newline to please EditorConfig checks echo "Updating yarnHash" yarn-berry-fetcher missing-hashes "$SOURCE_DIR/yarn.lock" > missing-hashes.json -YARN_HASH="$(yarn-berry-fetcher prefetch "$SOURCE_DIR/yarn.lock" 2>/dev/null)" +YARN_HASH="$(yarn-berry-fetcher prefetch "$SOURCE_DIR/yarn.lock" ./missing-hashes.json 2>/dev/null)" sed -i "s;sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=;$YARN_HASH;g" source.nix diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index 0a7564adfbfc..efc7719e6c8b 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -10,6 +10,7 @@ qtwayland, wrapQtAppsHook, wayland, + fetchpatch2, }: let majorVersion = lib.versions.major qtbase.version; @@ -25,6 +26,22 @@ stdenv.mkDerivation rec { hash = "sha256-JhmaAAJ1fevCPItVnneUCAalnDDaCjjkAl9QRhSkBk4="; }; + patches = [ + # TODO: remove on next release + (fetchpatch2 { + url = "https://github.com/fcitx/fcitx5-qt/commit/46a07a85d191fd77a1efc39c8ed43d0cd87788d2.patch?full_index=1"; + hash = "sha256-qv8Rj6YoFdMQLOB2R9LGgwCHKdhEji0Sg67W37jSIac="; + }) + (fetchpatch2 { + url = "https://github.com/fcitx/fcitx5-qt/commit/6ac4fdd8e90ff9c25a5219e15e83740fa38c9c71.patch?full_index=1"; + hash = "sha256-x0OdlIVmwVuq2TfBlgmfwaQszXLxwRFVf+gEU224uVA="; + }) + (fetchpatch2 { + url = "https://github.com/fcitx/fcitx5-qt/commit/1d07f7e8d6a7ae8651eda658f87ab0c9df08bef4.patch?full_index=1"; + hash = "sha256-22tKD7sbsTJcNqur9/Uf+XAvMvA7tzNQ9hUCMm+E+E0="; + }) + ]; + postPatch = '' substituteInPlace qt${majorVersion}/platforminputcontext/CMakeLists.txt \ --replace \$"{CMAKE_INSTALL_QT${majorVersion}PLUGINDIR}" $out/${qtbase.qtPluginPrefix} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index edc7765fa3df..3b48eb8809a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2032,10 +2032,6 @@ with pkgs; inherit (darwin) libresolv; }; - greg = callPackage ../applications/audio/greg { - pythonPackages = python3Packages; - }; - hocr-tools = with python3Packages; toPythonApplication hocr-tools; hopper = qt5.callPackage ../development/tools/analysis/hopper { }; @@ -2383,8 +2379,6 @@ with pkgs; protobuf = protobuf_21; }; - mellowplayer = libsForQt5.callPackage ../applications/audio/mellowplayer { }; - circus = with python310Packages; toPythonApplication circus; inherit (callPackage ../applications/networking/remote/citrix-workspace { }) @@ -3062,8 +3056,6 @@ with pkgs; hpccm = with python3Packages; toPythonApplication hpccm; - hqplayer-desktop = qt6Packages.callPackage ../applications/audio/hqplayer-desktop { }; - html-proofer = callPackage ../tools/misc/html-proofer { }; httpie = with python3Packages; toPythonApplication httpie; @@ -3078,8 +3070,6 @@ with pkgs; hyphenDicts = recurseIntoAttrs (callPackages ../development/libraries/hyphen/dictionaries.nix { }); - iannix = libsForQt5.callPackage ../applications/audio/iannix { }; - iaito = libsForQt5.callPackage ../tools/security/iaito { }; icemon = libsForQt5.callPackage ../applications/networking/icemon { }; @@ -3749,8 +3739,6 @@ with pkgs; patch = gnupatch; - patchance = python3Packages.callPackage ../applications/audio/patchance { }; - pcscliteWithPolkit = pcsclite.override { pname = "pcsclite-with-polkit"; polkitSupport = true; @@ -3835,8 +3823,6 @@ with pkgs; polaris-web = callPackage ../servers/polaris/web.nix { }; - projectm_3 = libsForQt5.callPackage ../applications/audio/projectm_3 { }; - proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix { }; pycflow2dot = with python3.pkgs; toPythonApplication pycflow2dot; @@ -3853,8 +3839,6 @@ with pkgs; pywal = with python3Packages; toPythonApplication pywal; - raysession = python3Packages.callPackage ../applications/audio/raysession { }; - remarshal = with python3Packages; toPythonApplication remarshal; riseup-vpn = qt6Packages.callPackage ../tools/networking/bitmask-vpn { @@ -10842,8 +10826,6 @@ with pkgs; confd-calico ; - carla = libsForQt5.callPackage ../applications/audio/carla { }; - cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { }; cbconvert-gui = cbconvert.gui; @@ -10914,8 +10896,6 @@ with pkgs; inherit (darwin) autoSignDarwinBinariesHook; }; - deadbeef = callPackage ../applications/audio/deadbeef { }; - deadbeefPlugins = { headerbar-gtk3 = callPackage ../applications/audio/deadbeef/plugins/headerbar-gtk3.nix { }; lyricbar = callPackage ../applications/audio/deadbeef/plugins/lyricbar.nix { }; @@ -10932,8 +10912,6 @@ with pkgs; inherit (callPackage ../development/tools/devpod { }) devpod devpod-desktop; - dfasma = libsForQt5.callPackage ../applications/audio/dfasma { }; - djv = callPackage ../by-name/dj/djv/package.nix { openexr = openexr_2; }; djview4 = djview; @@ -11015,8 +10993,7 @@ with pkgs; espeak-classic = callPackage ../applications/audio/espeak { }; - espeak-ng = callPackage ../applications/audio/espeak-ng { }; - espeak = res.espeak-ng; + espeak = espeak-ng; espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; @@ -11290,8 +11267,6 @@ with pkgs; linssid = libsForQt5.callPackage ../applications/networking/linssid { }; - linvstmanager = qt5.callPackage ../applications/audio/linvstmanager { }; - deadd-notification-center = haskell.lib.compose.justStaticExecutables ( haskellPackages.callPackage ../applications/misc/deadd-notification-center { } ); @@ -11375,8 +11350,6 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; - mt32emu-qt = libsForQt5.callPackage ../applications/audio/munt/mt32emu-qt.nix { }; - pass2csv = python3Packages.callPackage ../tools/security/pass2csv { }; pinboard = with python3Packages; toPythonApplication pinboard; @@ -11582,7 +11555,6 @@ with pkgs; subproject = "reader"; }; - jackmix = libsForQt5.callPackage ../applications/audio/jackmix { }; jackmix_jack1 = jackmix.override { jack = jack1; }; js8call = qt5.callPackage ../applications/radio/js8call { }; @@ -11668,14 +11640,10 @@ with pkgs; kvirc = libsForQt5.callPackage ../applications/networking/irc/kvirc { }; - ladspaH = callPackage ../applications/audio/ladspa-sdk/ladspah.nix { }; - ladspaPlugins = callPackage ../applications/audio/ladspa-plugins { fftw = fftwSinglePrec; }; - ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { }; - lemonbar = callPackage ../applications/window-managers/lemonbar { }; lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { }; @@ -11781,10 +11749,6 @@ with pkgs; python3Packages.callPackage ../applications/networking/instant-messengers/matrix-commander { }; - mbrola = callPackage ../applications/audio/mbrola { }; - - mbrola-voices = callPackage ../applications/audio/mbrola/voices.nix { }; - mediaelch-qt5 = callPackage ../by-name/me/mediaelch/package.nix { qtVersion = 5; }; mediaelch-qt6 = mediaelch; @@ -11810,8 +11774,6 @@ with pkgs; minitube = libsForQt5.callPackage ../applications/video/minitube { }; - mixxx = qt6Packages.callPackage ../applications/audio/mixxx { }; - mldonkey = callPackage ../applications/networking/p2p/mldonkey { ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; @@ -11875,8 +11837,6 @@ with pkgs; withConplay = false; }; - pragha = libsForQt5.callPackage ../applications/audio/pragha { }; - rofi-emoji = (callPackage ../applications/misc/rofi-emoji { }).v3; rofi-rbw = python3Packages.callPackage ../applications/misc/rofi-rbw { @@ -11940,8 +11900,6 @@ with pkgs; ninja_1_11 = callPackage ../by-name/ni/ninja/package.nix { ninjaRelease = "1.11"; }; - nootka = qt5.callPackage ../applications/audio/nootka { }; - opcua-client-gui = libsForQt5.callPackage ../misc/opcua-client-gui { }; ostinato = libsForQt5.callPackage ../applications/networking/ostinato { @@ -12113,10 +12071,6 @@ with pkgs; sed = gnused; }; - petrifoo = callPackage ../applications/audio/petrifoo { - inherit (gnome2) libgnomecanvas; - }; - pdfpc = callPackage ../applications/misc/pdfpc { inherit (gst_all_1) gstreamer @@ -12138,10 +12092,6 @@ with pkgs; inherit (pidginPackages) pidgin; - pithos = callPackage ../applications/audio/pithos { - pythonPackages = python3Packages; - }; - pineapple-pictures = qt6Packages.callPackage ../applications/graphics/pineapple-pictures { }; plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { }; @@ -12171,9 +12121,8 @@ with pkgs; pulseview = libsForQt5.callPackage ../applications/science/electronics/pulseview { }; - puredata = callPackage ../applications/audio/puredata { }; puredata-with-plugins = - plugins: callPackage ../applications/audio/puredata/wrapper.nix { inherit plugins; }; + plugins: callPackage ../by-name/pu/puredata/wrapper.nix { inherit plugins; }; pure-maps = libsForQt5.callPackage ../applications/misc/pure-maps { }; @@ -12213,19 +12162,13 @@ with pkgs; wrapQemuBinfmtP = callPackage ../applications/virtualization/qemu/binfmt-p-wrapper.nix { }; - qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { }; - qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { }; qmplay2-qt5 = qmplay2.override { qtVersion = "5"; }; qmplay2-qt6 = qmplay2.override { qtVersion = "6"; }; - qmidinet = libsForQt5.callPackage ../applications/audio/qmidinet { }; - qnotero = libsForQt5.callPackage ../applications/office/qnotero { }; - qsampler = libsForQt5.callPackage ../applications/audio/qsampler { }; - qsstv = qt5.callPackage ../applications/radio/qsstv { }; qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { }; @@ -12357,14 +12300,10 @@ with pkgs; rusty-psn-gui = rusty-psn.override { withGui = true; }; - sayonara = libsForQt5.callPackage ../applications/audio/sayonara { }; - scantailor-advanced = callPackage ../applications/graphics/scantailor/advanced.nix { }; scantailor-universal = callPackage ../applications/graphics/scantailor/universal.nix { }; - seq66 = qt5.callPackage ../applications/audio/seq66 { }; - sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { }; stag = callPackage ../applications/misc/stag { @@ -12634,8 +12573,6 @@ with pkgs; transmission_4-qt6 = transmission_4.override { enableQt6 = true; }; transmission_4-qt = transmission_4-qt5; - traverso = libsForQt5.callPackage ../applications/audio/traverso { }; - tinywl = callPackage ../applications/window-managers/tinywl { wlroots = wlroots_0_19; }; @@ -13123,8 +13060,6 @@ with pkgs; stdenv = llvmPackages.stdenv; }; - samplv1 = qt6.callPackage ../applications/audio/samplv1 { }; - beancount = with python3.pkgs; toPythonApplication beancount; beancount_2 = with python3.pkgs; toPythonApplication beancount_2; @@ -13526,8 +13461,6 @@ with pkgs; stuntrally = callPackage ../games/stuntrally { boost = boost183; }; - synthv1 = libsForQt5.callPackage ../applications/audio/synthv1 { }; - the-powder-toy = callPackage ../by-name/th/the-powder-toy/package.nix { lua = lua5_2; }; @@ -14252,7 +14185,6 @@ with pkgs; libjack2 = jack2.override { prefix = "lib"; }; - jack-autoconnect = libsForQt5.callPackage ../applications/audio/jack-autoconnect { }; jack_autoconnect = jack-autoconnect; j2cli = with python311Packages; toPythonApplication j2cli; @@ -14288,8 +14220,6 @@ with pkgs; openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { }; - muse = libsForQt5.callPackage ../applications/audio/muse { }; - nixDependencies = recurseIntoAttrs ( callPackage ../tools/package-management/nix/dependencies-scope.nix { } ); diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 7d5d53b82af6..0c1aa36b17ae 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -3701,10 +3701,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "002dkzdc1xqhvz5sdnj4vb0apczhs07mnpgq4kkd5dd1ka2pp6af"; + sha256 = "103h6wjpcqp3i034hi44za2v365yz7qk9s5df8lmasq43nqvkbmp"; type = "gem"; }; - version = "4.1.1"; + version = "4.2.1"; }; singleton = { groups = [ "default" ];