diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 8c837cfdd851..a4ac00d73bf3 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -80,11 +80,11 @@ }: let - drvName = "android-studio-${channel}-${version}"; filename = "android-studio-${version}-linux.tar.gz"; androidStudio = stdenv.mkDerivation { - name = "${drvName}-unwrapped"; + pname = "${pname}-unwrapped"; + inherit version; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/${filename}"; @@ -228,7 +228,7 @@ let # (e.g. `mksdcard`) have `/lib/ld-linux.so.2` set as the interpreter. An FHS # environment is used as a work around for that. fhsEnv = buildFHSEnv { - pname = "${drvName}-fhs-env"; + pname = "${pname}-fhs-env"; inherit version; multiPkgs = pkgs: [ ncurses5 @@ -245,8 +245,9 @@ let androidStudio, androidSdk ? null, }: - runCommand drvName + runCommand "${pname}-${version}" { + inherit pname version; startScript = let hasAndroidSdk = androidSdk != null; @@ -283,7 +284,7 @@ let unset ANDROID_HOME fi ''} - exec ${fhsEnv}/bin/${drvName}-fhs-env ${lib.getExe androidStudio} "$@" + exec ${lib.getExe fhsEnv} ${lib.getExe androidStudio} "$@" ''; preferLocalBuild = true; allowSubstitutes = false; @@ -292,7 +293,6 @@ let withSdk = androidSdk: mkAndroidStudioWrapper { inherit androidStudio androidSdk; }; in { - inherit version; unwrapped = androidStudio; full = withSdk androidenv.androidPkgs.androidsdk; inherit withSdk; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 41081b11c66a..ca576607d033 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -16,8 +16,8 @@ let inherit tiling_wm; }; stableVersion = { - version = "2025.2.2.8"; # "Android Studio Otter 2 Feature Drop | 2025.2.2 Patch 1" - sha256Hash = "sha256-xs9ABQ9f8/gtxcoiZkf/xEtmTOj6rb4Ty+w70/+C4Ss="; + version = "2025.2.3.9"; # "Android Studio Otter 3 Feature Drop | 2025.2.3" + sha256Hash = "sha256-mG6myss22nI/LIVQzM19jNPouLe7JEbTqL85u6+Rq8E="; }; betaVersion = { version = "2025.2.3.8"; # "Android Studio Otter 3 Feature Drop | 2025.2.3 RC 3" diff --git a/pkgs/by-name/an/android-studio-tools/package.nix b/pkgs/by-name/an/android-studio-tools/package.nix index 21cf5da0d646..a461d9b81ec7 100644 --- a/pkgs/by-name/an/android-studio-tools/package.nix +++ b/pkgs/by-name/an/android-studio-tools/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation { pname = "android-studio-tools"; - version = "13114758"; + version = "14742923"; src = fetchzip { # The only difference between the Linux and Mac versions is a single comment at the top of all the scripts # Therefore, we will use the Linux version and just patch the comment - url = "https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip"; - hash = "sha256-dt8nwjL8wyRfBZOedCPYXh7zyeMUeH0gOPpTcpxCegU="; + url = "https://dl.google.com/android/repository/commandlinetools-linux-14742923_latest.zip"; + hash = "sha256-oimC4ToDFIa8Rlv+5RB+swl8M5PHdX4omlrMZMQEx8M="; }; postPatch = '' diff --git a/pkgs/by-name/an/android-translation-layer/package.nix b/pkgs/by-name/an/android-translation-layer/package.nix index 63c5bcec6098..c40a55978d1f 100644 --- a/pkgs/by-name/an/android-translation-layer/package.nix +++ b/pkgs/by-name/an/android-translation-layer/package.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation { pname = "android-translation-layer"; - version = "0-unstable-2025-09-14"; + version = "0-unstable-2026-01-08"; src = fetchFromGitLab { owner = "android_translation_layer"; repo = "android_translation_layer"; - rev = "9de91586994af5078decda17db92ce50c5673951"; - hash = "sha256-iRjP++WzLsV7oDGNdF3m9JJJS7zLrG5W46U3h39H5uk="; + rev = "b4d749b9b7f1a8620b976f03a2924d0661f7232f"; + hash = "sha256-SeMxbqyD3MXDR4fHans7pdQSa/SLoWOl9QhnpH7CWCY="; }; patches = [ diff --git a/pkgs/by-name/an/antigravity/information.json b/pkgs/by-name/an/antigravity/information.json index 14b4a35ac914..9ca34b9e4abd 100644 --- a/pkgs/by-name/an/antigravity/information.json +++ b/pkgs/by-name/an/antigravity/information.json @@ -1,22 +1,22 @@ { - "version": "1.15.6", + "version": "1.15.8", "vscodeVersion": "1.104.0", "sources": { "x86_64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.6-5250816192937984/linux-x64/Antigravity.tar.gz", - "sha256": "e399b13e4b6d8ec5b57a746478a87b0f7652f8a69024febd4c25ec847a4c8ea6" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.8-5724687216017408/linux-x64/Antigravity.tar.gz", + "sha256": "44afc76e06599b5eed8eab68db3d2c553c77ea6b9cc7652250e3d1a58bbb1498" }, "aarch64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.6-5250816192937984/linux-arm/Antigravity.tar.gz", - "sha256": "645247bc7c6c637b07610884350588e888eabd22e32a2786695606bebbb97900" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.8-5724687216017408/linux-arm/Antigravity.tar.gz", + "sha256": "a39cb7fb78eaceb939e82cf8024fc7e16694a61b32d2af61ba414fe4284e41cd" }, "x86_64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.6-5250816192937984/darwin-x64/Antigravity.zip", - "sha256": "d99b852cf831c4a1d3207a9cbef0b2cb92a68fdbb84f121d908d694617f0a8a4" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.8-5724687216017408/darwin-x64/Antigravity.zip", + "sha256": "2554e90087f83e92655650a66d51f47c5577fade58627d5ec8b4221e5ed62ed8" }, "aarch64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.6-5250816192937984/darwin-arm/Antigravity.zip", - "sha256": "85d62d8efc97777d77c176809025235d9138a7f3d1b3d6003526499b8e48ec3c" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.8-5724687216017408/darwin-arm/Antigravity.zip", + "sha256": "cc3199592ff91325e395ba9fff1a0cd9f3c709bec52ec36d30f27101d6231239" } } } diff --git a/pkgs/by-name/ar/art-standalone/package.nix b/pkgs/by-name/ar/art-standalone/package.nix index 9b4434f9876b..f6d383897132 100644 --- a/pkgs/by-name/ar/art-standalone/package.nix +++ b/pkgs/by-name/ar/art-standalone/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "art-standalone"; - version = "0-unstable-2025-09-03"; + version = "0-unstable-2025-10-09"; src = fetchFromGitLab { owner = "android_translation_layer"; repo = "art_standalone"; - rev = "10d60509c9073791f9eca1d2b8443d40a40edc05"; - hash = "sha256-Xg6s58jymma1sNb6P7pwWFpYq1O6GoynrgPeLZRD+rI="; + rev = "e78bf68917bcaaf58fef3960cd88793b3b7f39cc"; + hash = "sha256-0r6Ap41AMSHhZpMJ5QoWiGGcHPj35et4kiA20xs9uLs="; }; patches = [ diff --git a/pkgs/by-name/bi/bionic-translation/package.nix b/pkgs/by-name/bi/bionic-translation/package.nix index ac4dd2c2f324..9e22b92f86d7 100644 --- a/pkgs/by-name/bi/bionic-translation/package.nix +++ b/pkgs/by-name/bi/bionic-translation/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bionic-translation"; - version = "0-unstable-2025-07-07"; + version = "0-unstable-2025-11-25"; src = fetchFromGitLab { owner = "android_translation_layer"; repo = "bionic_translation"; - rev = "18c65637bf02dba86415dd009036b72f62cbb37d"; - hash = "sha256-cqmWT9mbYJRLaX1Ey0lDfRFYM7JXuwayDN4o2WJIAVc="; + rev = "5c31d4366fbb0af70690e72e5a861e7b44ffb1ef"; + hash = "sha256-dlHjx6+yymvIjDEs2TZexZUIUz32iKD0r+H4AJ89xig="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/cadical/package.nix b/pkgs/by-name/ca/cadical/package.nix index f3269d749265..7cc3cdf1e68e 100644 --- a/pkgs/by-name/ca/cadical/package.nix +++ b/pkgs/by-name/ca/cadical/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, copyPkgconfigItems, makePkgconfigItem, - version ? "2.2.0", + version ? "3.0.0", }: stdenv.mkDerivation rec { @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { rev = "rel-${version}"; hash = { - "2.2.0" = "sha256-6O0lz0YJzk1eJblQ0/f9PnSYqD8WoendIZioQiGUpCg="; + "3.0.0" = "sha256-pymbSC6bwQQ0YCtJd3xWZiC22UEkFiKSLObSOnoQj9I="; + "2.2.1" = "sha256-dYRaw9DI63Nqz0IJkfQYU4y00KSfq1Xv0xZuL1G15CY="; "2.1.3" = "sha256-W3kO+6nVzkmJXyHJU+NZWP0oatK3gon4EWF1/03rgL4="; "2.0.0" = "sha256-qoeEM9SdpuFuBPeQlCzuhPLcJ+bMQkTUTGiT8QdU8rc="; } diff --git a/pkgs/by-name/ca/cadical_2/package.nix b/pkgs/by-name/ca/cadical_2/package.nix new file mode 100644 index 000000000000..657d086ae196 --- /dev/null +++ b/pkgs/by-name/ca/cadical_2/package.nix @@ -0,0 +1,6 @@ +{ + cadical, + version ? "2.2.1", +}: + +cadical.override { inherit version; } diff --git a/pkgs/by-name/fz/fzf-make/package.nix b/pkgs/by-name/fz/fzf-make/package.nix index 9bce264bc85b..789c44dbac92 100644 --- a/pkgs/by-name/fz/fzf-make/package.nix +++ b/pkgs/by-name/fz/fzf-make/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "fzf-make"; - version = "0.65.0"; + version = "0.67.0"; src = fetchFromGitHub { owner = "kyu08"; repo = "fzf-make"; tag = "v${version}"; - hash = "sha256-KL2dRyfwwa365hEMeVixAP9DFx3QObJVeesj95tOUmo="; + hash = "sha256-ciUixT+ELBL90rPe1wUyp41ZL2a6YhEDY+n66cOB1xk="; }; - cargoHash = "sha256-QaR0Se8ecNKj7OcngwEOrK63VT200D+/Xm3RaIiLdec="; + cargoHash = "sha256-pVkoxMYcPUjzpN3nbyECtLS8wXo78P1ybOdl3P05Zkc="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/hn/hns/package.nix b/pkgs/by-name/hn/hns/package.nix new file mode 100644 index 000000000000..dd4072eb9e05 --- /dev/null +++ b/pkgs/by-name/hn/hns/package.nix @@ -0,0 +1,43 @@ +{ + lib, + fetchFromGitHub, + python3, +}: + +python3.pkgs.buildPythonApplication (finalAttrs: { + pname = "hns"; + version = "1.0.8"; + pyproject = true; + + src = fetchFromGitHub { + owner = "primaprashant"; + repo = "hns"; + tag = finalAttrs.version; + hash = "sha256-VO9EX8aIudijAyzTH9cXIa1magN+wkIE0lsP+DGl8hw="; + }; + + build-system = [ + python3.pkgs.hatchling + ]; + + dependencies = with python3.pkgs; [ + click + faster-whisper + numpy + pyperclip + requests + rich + sounddevice + ]; + + pythonImportsCheck = [ + "hns" + ]; + + meta = { + description = "Speech-to-text CLI to transcribe voice from microphone directly to clipboard"; + homepage = "https://hns-cli.dev"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ afh ]; + }; +}) diff --git a/pkgs/by-name/is/isabelle/components/isabelle-linter.nix b/pkgs/by-name/is/isabelle/components/isabelle-linter.nix index 879cf0520bb0..f87f2603f36a 100644 --- a/pkgs/by-name/is/isabelle/components/isabelle-linter.nix +++ b/pkgs/by-name/is/isabelle/components/isabelle-linter.nix @@ -1,11 +1,11 @@ { - stdenv, + stdenvNoCC, lib, fetchFromGitHub, isabelle, }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "isabelle-linter"; version = "2025-1-1.0.0"; diff --git a/pkgs/by-name/is/isabelle/fix-copied-permissions.patch b/pkgs/by-name/is/isabelle/fix-copied-permissions.patch new file mode 100644 index 000000000000..5bfbd583ac34 --- /dev/null +++ b/pkgs/by-name/is/isabelle/fix-copied-permissions.patch @@ -0,0 +1,10 @@ +--- a/src/Pure/System/isabelle_system.scala ++++ b/src/Pure/System/isabelle_system.scala +@@ -214,6 +214,7 @@ object Isabelle_System { + Files.copy(src.toPath, target.toPath, + StandardCopyOption.COPY_ATTRIBUTES, + StandardCopyOption.REPLACE_EXISTING) ++ target.setWritable(true) + } + catch { + case ERROR(msg) => diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix index c0c9d040127a..c44851d0e337 100644 --- a/pkgs/by-name/is/isabelle/package.nix +++ b/pkgs/by-name/is/isabelle/package.nix @@ -12,6 +12,8 @@ verit, vampire, eprover-ho, + cvc5, + csdp, rlwrap, perl, procps, @@ -19,6 +21,7 @@ isabelle-components, symlinkJoin, fetchhg, + electron, }: let @@ -84,10 +87,20 @@ let ''; }; + cvc5' = cvc5.overrideAttrs { + version = "1.2.0"; + src = fetchFromGitHub { + owner = "cvc5"; + repo = "cvc5"; + tag = "cvc5-1.2.0"; + hash = "sha256-Um1x+XgQ5yWSoqtx1ZWbVAnNET2C4GVasIbn0eNfico="; + }; + }; + in stdenv.mkDerivation (finalAttrs: { pname = "isabelle"; - version = "2025-1"; + version = "2025-2"; dirname = "Isabelle${finalAttrs.version}"; @@ -95,17 +108,17 @@ stdenv.mkDerivation (finalAttrs: { if stdenv.hostPlatform.isDarwin then fetchurl { url = "https://isabelle.in.tum.de/website-${finalAttrs.dirname}/dist/${finalAttrs.dirname}_macos.tar.gz"; - hash = "sha256-WKlrsXP6oZHy6NTaaQYpddtgE2QGhBZ4uKai61dtQ14="; + hash = "sha256-jxh0luKV8WmVLpRHRa+eSuAMnBzS7UytvPfYmOREkT4="; } else if stdenv.hostPlatform.isx86 then fetchurl { url = "https://isabelle.in.tum.de/website-${finalAttrs.dirname}/dist/${finalAttrs.dirname}_linux.tar.gz"; - hash = "sha256-0SA28X3fIKMV3wZtlJvBxq9MZkI6GevVuSNzgqJ4xQU="; + hash = "sha256-ogpQe8fBJw2L6WqfP77AY0U4d4nS3CxNPfYmDUe/szw="; } else fetchurl { url = "https://isabelle.in.tum.de/website-${finalAttrs.dirname}/dist/${finalAttrs.dirname}_linux_arm.tar.gz"; - hash = "sha256-BUhdK8qhdV2Den+4bbdd9T6MD/BtGpxp+1Axj21NxrI="; + hash = "sha256-ZQqWabSgh2da+zQpTYLe0vBwTUfVgN2e1FzdyfF2S90="; }; nativeBuildInputs = [ java ]; @@ -116,6 +129,14 @@ stdenv.mkDerivation (finalAttrs: { vampire' eprover-ho net-tools + cvc5' + csdp + ]; + + patches = [ + # Make "isabelle build" work when generating documents + # See: https://github.com/NixOS/nixpkgs/issues/289529 + ./fix-copied-permissions.patch ]; propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ procps ]; @@ -151,6 +172,17 @@ stdenv.mkDerivation (finalAttrs: { VAMPIRE_EXTRA_OPTIONS="--mode casc" EOF + cat >contrib/cvc5-*/etc/settings <contrib/csdp-*/etc/settings <contrib/polyml-*/etc/settings <>etc/settings - for comp in contrib/jdk* contrib/polyml-* contrib/verit-* contrib/vampire-* contrib/e-*; do + for comp in contrib/jdk* contrib/polyml-* contrib/verit-* contrib/vampire-* \ + contrib/e-* contrib/cvc5-* contrib/csdp-*; do rm -rf $comp/${if stdenv.hostPlatform.isx86 then "x86" else "arm"}* done rm -rf contrib/*/src @@ -192,10 +225,15 @@ stdenv.mkDerivation (finalAttrs: { arch=${ if stdenv.hostPlatform.system == "aarch64-linux" then "arm64-linux" else stdenv.hostPlatform.system } - for f in contrib/*/$arch/{z3,nunchaku,spass,zipperposition}; do + for f in contrib/*/$arch/{z3,nunchaku,SPASS,zipperposition}; do patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f"${lib.optionalString stdenv.hostPlatform.isAarch64 " || true"} done patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) contrib/bash_process-*/$arch/bash_process + + ln -sf ${electron}/bin/electron contrib/vscodium-*/*/electron + rm contrib/vscodium-*/*/*.so{,.*} + rm contrib/vscodium-*/*/chrome* + for d in contrib/kodkodi-*/jni/$arch; do patchelf --set-rpath "${ lib.concatStringsSep ":" [ @@ -278,36 +316,48 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.jvanbruegge + lib.maintainers.sempiternal-aurora + ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" ]; - platforms = lib.platforms.unix; }; - passthru.withComponents = - f: - let - isabelle = finalAttrs.finalPackage; - base = "$out/${isabelle.dirname}"; - components = f isabelle-components; - in - symlinkJoin { - name = "isabelle-with-components-${isabelle.version}"; - paths = [ isabelle ] ++ (map (c: c.override { inherit isabelle; }) components); + passthru = { + vampire = vampire'; + polyml = polyml'; + cvc5 = cvc5'; + sha1 = sha1; + withComponents = + f: + let + isabelle = finalAttrs.finalPackage; + base = "$out/${isabelle.dirname}"; + components = f isabelle-components; + in + symlinkJoin { + name = "isabelle-with-components-${isabelle.version}"; + paths = [ isabelle ] ++ (map (c: c.override { inherit isabelle; }) components); - postBuild = '' - rm $out/bin/* + postBuild = '' + rm $out/bin/* - cd ${base} - rm bin/* - cp ${isabelle}/${isabelle.dirname}/bin/* bin/ - rm etc/components - cat ${isabelle}/${isabelle.dirname}/etc/components > etc/components + cd ${base} + rm bin/* + cp ${isabelle}/${isabelle.dirname}/bin/* bin/ + rm etc/components + cat ${isabelle}/${isabelle.dirname}/etc/components > etc/components - export HOME=$TMP - bin/isabelle install $out/bin - patchShebangs $out/bin - '' - + lib.concatMapStringsSep "\n" (c: '' - echo contrib/${c.pname}-${c.version} >> ${base}/etc/components - '') components; - }; + export HOME=$TMP + bin/isabelle install $out/bin + patchShebangs $out/bin + '' + + lib.concatMapStringsSep "\n" (c: '' + echo contrib/${c.pname}-${c.version} >> ${base}/etc/components + '') components; + }; + }; }) diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index e197f6a9c080..10d3907cde96 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "2.38.0"; + version = "2.39.0"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${version}"; - hash = "sha256-XDxmX0tucNUmJAgDgRtD9sYG1/URWWUOTx7PQ1PBTYY="; + hash = "sha256-gVRm0bMGmKap4k4g6h+TvdJlK3VBj7HKyABTNrjd7rw="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "chatmail-core"; inherit version src; - hash = "sha256-I13Us7H3DqbAfdEsmHgMBVgvsBZP9Sh21eqYGF7VoSw="; + hash = "sha256-hcyOhefNOt6YyLqFM1ZJWwohmcOJo/NjW6rLSlWUDnU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mi/minigalaxy/package.nix b/pkgs/by-name/mi/minigalaxy/package.nix index 51791c74717d..61a041684c5a 100644 --- a/pkgs/by-name/mi/minigalaxy/package.nix +++ b/pkgs/by-name/mi/minigalaxy/package.nix @@ -18,14 +18,14 @@ python3Packages.buildPythonApplication rec { pname = "minigalaxy"; - version = "1.4.0"; + version = "1.4.1"; pyproject = true; src = fetchFromGitHub { owner = "sharkwouter"; repo = "minigalaxy"; tag = version; - hash = "sha256-ZHTjppdLxKDURceonbH7dJz+krBhu3lr2P7QPVDxRZw="; + hash = "sha256-YZhgVeWdVaNiTj7hvYuHbaVtoKN6EFoOANWdkrlj4dU="; }; patches = [ diff --git a/pkgs/by-name/mp/mpls/package.nix b/pkgs/by-name/mp/mpls/package.nix index b2e71a124d95..4bcfd83c4686 100644 --- a/pkgs/by-name/mp/mpls/package.nix +++ b/pkgs/by-name/mp/mpls/package.nix @@ -7,13 +7,13 @@ }: buildGoModule rec { pname = "mpls"; - version = "0.16.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = "mhersson"; repo = "mpls"; tag = "v${version}"; - hash = "sha256-O//9AeJ9x8WF+0ub6KK91efPr9Hdbx1Ab4X0oaUhwss="; + hash = "sha256-DDvjTbACn9qCmfJR6rcGQxVNik9wUCiNYxiYMsEkMXc="; }; vendorHash = "sha256-QtNQnJtYLmSTTLwKKQ8P6O6wyctgwN8OcGZkMXa+Ark="; diff --git a/pkgs/by-name/op/openlinkhub/package.nix b/pkgs/by-name/op/openlinkhub/package.nix index e218679edffc..b377af8d1585 100644 --- a/pkgs/by-name/op/openlinkhub/package.nix +++ b/pkgs/by-name/op/openlinkhub/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "openlinkhub"; - version = "0.7.3"; + version = "0.7.5"; src = fetchFromGitHub { owner = "jurkovic-nikola"; repo = "OpenLinkHub"; tag = version; - hash = "sha256-Q9caDjiEQl2TAS6Myb3lHh9Th+/XPunMSTA06IMespM="; + hash = "sha256-Jq31ZcJtl0ZmjNsMOiTTt2eZIIYn2DRVPE4Q5FTx6OM="; }; proxyVendor = true; diff --git a/pkgs/by-name/sa/savepagenow/package.nix b/pkgs/by-name/sa/savepagenow/package.nix index b2687794190b..3d6c5f7f9ef2 100644 --- a/pkgs/by-name/sa/savepagenow/package.nix +++ b/pkgs/by-name/sa/savepagenow/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "savepagenow"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; src = fetchFromGitHub { owner = "pastpages"; repo = "savepagenow"; tag = version; - sha256 = "sha256-omQ28GqgBKC8W51c0qb6Tg06obXskyfF+2dg/13ah1M="; + sha256 = "sha256-ztM1g71g8SN1LTyFF7sxaLhC3+nVsC9fJwfYPjkUsdE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/by-name/sl/slimserver/package.nix b/pkgs/by-name/sl/slimserver/package.nix index 1241c5717bc7..6de031572e4d 100644 --- a/pkgs/by-name/sl/slimserver/package.nix +++ b/pkgs/by-name/sl/slimserver/package.nix @@ -45,100 +45,59 @@ perlPackages.buildPerlPackage rec { nativeBuildInputs = [ makeWrapper ]; + # slimserver vendors quite a few CPAN packages + # this list is intended to only replace compiled modules + # which can be found in CPAN/arch in the slimserver repo + # replacements are added here AND removed in prePatch to + # avoid module mismatches buildInputs = with perlPackages; [ - AnyEvent - ArchiveZip - AsyncUtil AudioScan - CarpAssert - CarpClan - CGI - ClassAccessor - ClassAccessorChained - ClassC3 - # ClassC3Componentised # Error: DBIx::Class::Row::throw_exception(): DBIx::Class::Relationship::BelongsTo::belongs_to(): Can't infer join condition for track - ClassDataInheritable - ClassInspector - ClassISA - ClassMember - ClassSingleton - ClassVirtual ClassXSAccessor - CompressRawZlib - CryptOpenSSLRSA - DataDump - DataPage - DataURIEncode DBDSQLite DBI - # DBIxClass # https://github.com/LMS-Community/slimserver/issues/138 DigestSHA1 EncodeDetect EV - ExporterLite - FileBOM - FileCopyRecursive - # FileNext # https://github.com/LMS-Community/slimserver/pull/1140 - FileReadBackwards - FileSlurp - FileWhich HTMLParser - HTTPCookies - HTTPDaemon - HTTPMessage ImageScale IOAIO IOInterface IOSocketSSL - IOString JSONXS JSONXSVersionOneAndTwo - # LogLog4perl # Internal error: Root Logger not initialized. - LWP - LWPProtocolHttps MP3CutGapless - NetHTTP - NetHTTPSNB - PathClass - ProcBackground - # SQLAbstract # DBI Exception: DBD::SQLite::db prepare_cached failed: no such function: ARRAY - SQLAbstractLimit SubName TemplateToolkit - TextUnidecode - TieCacheLRU - TieCacheLRUExpires - TieRegexpHash - TimeDate - URI - URIFind - UUIDTiny XMLParser - XMLSimple YAMLLibYAML ] - # ++ (lib.optional stdenv.hostPlatform.isDarwin perlPackages.MacFSEvents) - ++ (lib.optional stdenv.hostPlatform.isLinux perlPackages.LinuxInotify2); + ++ lib.optionals stdenv.hostPlatform.isLinux [ + LinuxInotify2 + ]; prePatch = '' # remove vendored binaries rm -rf Bin - # remove most vendored modules, keeping necessary ones - mkdir -p CPAN_used/Class/C3/ CPAN_used/SQL/ CPAN_used/File/ - rm -r CPAN/SQL/Abstract/Limit.pm - cp -rv CPAN/Class/C3/Componentised.pm CPAN_used/Class/C3/ - cp -rv CPAN/DBIx CPAN_used/ - cp -rv CPAN/File/Next.pm CPAN_used/File/ - cp -rv CPAN/Log CPAN_used/ - cp -rv CPAN/SQL/* CPAN_used/SQL/ - rm -r CPAN - mv CPAN_used CPAN - - # another set of vendored/modified modules exist in lib, more selectively cleaned for now - rm -rf lib/Audio + # remove precompiled cpan modules + rm -rf CPAN/arch + # remove the precompiled modules, they come from buildInputs + rm -rf CPAN/Class/XSAccessor{,.pm} + rm -rf CPAN/DBD{,.pm} + rm -rf CPAN/DBI{,.pm} + rm -rf CPAN/Digest/SHA1{,.pm} + rm -rf CPAN/Encode/Detect{,.pm} + rm -rf CPAN/HTML/Parser{,.pm} + rm -rf CPAN/Image{,.pm} + rm -rf CPAN/IO/AIO{,.pm} + rm -rf CPAN/IO/Interface{,.pm} + rm -rf CPAN/JSON/XS{,.pm} + rm -rf CPAN/MP3/Cut/Gapless{,.pm} + rm -rf CPAN/Sub/Name{,.pm} + rm -rf CPAN/XML/Parser{,.pm} + rm -rf CPAN/YAML/XS{,.pm} ${lib.optionalString (!enableUnfreeFirmware) '' # remove unfree firmware diff --git a/pkgs/by-name/sp/spade/package.nix b/pkgs/by-name/sp/spade/package.nix index f431abb2de03..97b89f94cb78 100644 --- a/pkgs/by-name/sp/spade/package.nix +++ b/pkgs/by-name/sp/spade/package.nix @@ -10,24 +10,24 @@ git, pkg-config, openssl, - python312, + python314, swim, }: rustPlatform.buildRustPackage rec { pname = "spade"; - version = "0.13.0"; + version = "0.16.0"; src = fetchFromGitLab { owner = "spade-lang"; repo = "spade"; rev = "v${version}"; - hash = "sha256-eWeEbwIm+PC0XHmvV3xZqUIcA01arnalbGFtPTUP9tg="; + hash = "sha256-Q9LiyCkrHQxnTorAqPOykS4F06c01pYPW9t82xEn6DY="; # only needed for vatch, which contains test data fetchSubmodules = true; }; - cargoHash = "sha256-YMUeHr9eUOYIcO7PbaFgZa0Ib10GMF+jT10ZCSG7PNo="; + cargoHash = "sha256-zuj34DpQKu7uWYgL/JTq7zLTPvZKQ/eedBXrkN1Pvg0="; # TODO: somehow respect https://nixos.org/manual/nixpkgs/stable/#var-passthru-updateScript-commit passthru.updateScript = _experimental-update-script-combinators.sequence [ @@ -55,8 +55,19 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ python312 ]; - env.NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isDarwin "-L${python312}/lib/python3.12/config-3.12-darwin -lpython3.12"; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + python314 + ]; + env.NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isDarwin "-L${python314}/lib/python3.14/config-3.14-darwin -lpython3.14"; + + cargoBuildFlags = [ + "--workspace" + # TODO: --exclude the excluded crates listed in release.sh? + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # "Undefined symbols for architecture arm:" ... + "--exclude=spade-surfer-plugin" + ]; passthru.tests = { inherit swim; diff --git a/pkgs/by-name/st/stp/package.nix b/pkgs/by-name/st/stp/package.nix index f6b63167cbd8..45eb1b76ca84 100644 --- a/pkgs/by-name/st/stp/package.nix +++ b/pkgs/by-name/st/stp/package.nix @@ -15,7 +15,7 @@ minisat, cryptominisat, gmp, - cadical, + cadical_2, gtest, lit, outputcheck, @@ -85,8 +85,8 @@ stdenv.mkDerivation (finalAttrs: { cadicalDependency = symlinkJoin { name = "stp-${finalAttrs.version}-cadical"; paths = [ - cadical.lib - cadical.dev + cadical_2.lib + cadical_2.dev ]; }; in diff --git a/pkgs/by-name/sw/swim/package.nix b/pkgs/by-name/sw/swim/package.nix index 353065cc663c..0b56dd642b9b 100644 --- a/pkgs/by-name/sw/swim/package.nix +++ b/pkgs/by-name/sw/swim/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "swim"; - version = "0.13.0"; + version = "0.16.0"; src = fetchFromGitLab { owner = "spade-lang"; repo = "swim"; rev = "v${version}"; - hash = "sha256-0H45kOIwFMdp+eIQJNutLUC/jEpWKsPfEZXDUOUa12g="; + hash = "sha256-8JUy5gMZv7qzksrnoCwS4Wxk8xvy02sYGKHxwncAy7c="; }; - cargoHash = "sha256-fF+43tZzr6lxVovMCIaDwf9JKweqiMMR+BNojIqQREY="; + cargoHash = "sha256-M4gwOAEPN3J7Ftirotbdk/UOE0hqbYpxBDO65YPXxBc="; preConfigure = '' # de-vendor spade git submodule diff --git a/pkgs/by-name/th/thunar-unwrapped/package.nix b/pkgs/by-name/th/thunar-unwrapped/package.nix index f52ce309c469..a417ad65ff47 100644 --- a/pkgs/by-name/th/thunar-unwrapped/package.nix +++ b/pkgs/by-name/th/thunar-unwrapped/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "thunar"; - version = "4.20.6"; + version = "4.20.7"; outputs = [ "out" @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "xfce"; repo = "thunar"; tag = "thunar-${finalAttrs.version}"; - hash = "sha256-Ll1mJEkkxYGASWQ2z7GRiubNjggqeHXzgGSXQK+10qs="; + hash = "sha256-ii3ObvKCTXube3rnn+JdCsxTZDubrKcevBgpiGVbL/c="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/xm/xmrig-mo/package.nix b/pkgs/by-name/xm/xmrig-mo/package.nix index d6f550b366a4..cca1e11cabe1 100644 --- a/pkgs/by-name/xm/xmrig-mo/package.nix +++ b/pkgs/by-name/xm/xmrig-mo/package.nix @@ -6,13 +6,13 @@ xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; - version = "6.24.0-mo1"; + version = "6.25.0-mo1"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - hash = "sha256-l3dN1lKn+Vt2JPmBm452kRe39UCnW3TIhUbHXkHXBrM="; + hash = "sha256-+537nSbTi3IjU1PtKrGKoBMxYmdT2sxMJSk4RxoFpiw="; }; meta = { diff --git a/pkgs/by-name/zm/zmk-studio/darwin-dont-sign.patch b/pkgs/by-name/zm/zmk-studio/darwin-dont-sign.patch new file mode 100644 index 000000000000..794a5464dca7 --- /dev/null +++ b/pkgs/by-name/zm/zmk-studio/darwin-dont-sign.patch @@ -0,0 +1,13 @@ +diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json +index 8fd57bf..6a27557 100644 +--- a/src-tauri/tauri.conf.json ++++ b/src-tauri/tauri.conf.json +@@ -33,7 +33,7 @@ + "exceptionDomain": "", + "frameworks": [], + "providerShortName": null, +- "signingIdentity": "-" ++ "signingIdentity": null + }, + "resources": [], + "shortDescription": "", diff --git a/pkgs/by-name/zm/zmk-studio/package.nix b/pkgs/by-name/zm/zmk-studio/package.nix new file mode 100644 index 000000000000..a9d65a64e7b1 --- /dev/null +++ b/pkgs/by-name/zm/zmk-studio/package.nix @@ -0,0 +1,98 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + fetchNpmDeps, + npm-lockfile-fix, + + cargo-tauri, + makeBinaryWrapper, + nodejs, + npmHooks, + pkg-config, + wrapGAppsHook3, + + glib-networking, + udev, + webkitgtk_4_1, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "zmk-studio"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "zmkfirmware"; + repo = "zmk-studio"; + tag = "v${finalAttrs.version}"; + + postFetch = '' + # add missing integrity fields to lockfile + ${lib.getExe npm-lockfile-fix} $out/package-lock.json + ''; + + hash = "sha256-7UwY+272JNqzQf1juOzDkiW2DNKHC5xg4cGguwAgwNc="; + }; + + patches = [ + ./darwin-dont-sign.patch + ]; + + # building the download page requires the app to fetch the github API at build-time + # this page would only ever be visited if it wasn't built with tauri, so we disable it instead + postPatch = '' + # turn `npm run generate-data` into a NOOP + substituteInPlace package.json \ + --replace-fail '"generate-data": "' '"generate-data": "true || ' + + # remove download page + rm download.html src/download.tsx src/DownloadPage.tsx + substituteInPlace vite.config.ts \ + --replace-fail 'download: "./download.html",' "" + ''; + + cargoRoot = "src-tauri"; + buildAndTestSubdir = "src-tauri"; + + cargoHash = "sha256-BNX2vhsHaSk3eiadVPH6To0CgbOEGJ1JVKkW3Hw7QH0="; + + npmDeps = fetchNpmDeps { + name = "zmk-studio-${finalAttrs.version}-npm-deps"; + inherit (finalAttrs) src patches; + hash = "sha256-htCqTX/w1GP3b8wBD9p60Lwpjr2V7sv05unRv2IrP1A="; + }; + + nativeBuildInputs = [ + cargo-tauri.hook + nodejs + npmHooks.npmConfigHook + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + pkg-config + wrapGAppsHook3 + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + makeBinaryWrapper + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + glib-networking # for image loading + udev + webkitgtk_4_1 + ]; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + makeWrapper "$out/Application/ZMK Studio.app/Contents/MacOS/zmk-studio" "$out/bin/zmk-studio" + ''; + + meta = { + description = "Tool for runtime keymap updates on ZMK-powered devices without reflashing firmware"; + homepage = "https://github.com/zmkfirmware/zmk-studio"; + changelog = "https://github.com/zmkfirmware/zmk-studio/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + mainProgram = "zmk-studio"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +}) diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 46b8fc44a01b..e8d86ae5898c 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -1,8 +1,11 @@ { lib, stdenv, - fetchurl, - fetchpatch, + fetchFromGitHub, + autoconf-archive, + autoreconfHook, + gtk-doc, + mate-common, pkg-config, gettext, itstool, @@ -18,31 +21,31 @@ mate-desktop, hicolor-icon-theme, wrapGAppsHook3, + yelp-tools, gitUpdater, }: stdenv.mkDerivation (finalAttrs: { pname = "eom"; - version = "1.28.0"; + version = "1.28.1"; - src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/eom-${finalAttrs.version}.tar.xz"; - sha256 = "mgHKsplaGoxyWMhl6uXxgu1HMMRGcq/cOgfkI+3VOrw="; + src = fetchFromGitHub { + owner = "mate-desktop"; + repo = "eom"; + tag = "v${finalAttrs.version}"; + hash = "sha256-2MO8z30Styv5vAnNVFpETAZtZ+LMbgBSDq1mUQZ9X1c="; }; - patches = [ - # Switch to girepository-2.0 - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/eom/raw/84b45dc6302f378926be390d39a7cca3ec4f26ea/f/libpeas1_pygobject352.patch"; - hash = "sha256-HcwWXAnVzz5uuAz8Mljci2FA72TZJTD28qLvczXVtZU="; - }) - ]; - nativeBuildInputs = [ + autoconf-archive + autoreconfHook + gtk-doc + mate-common # mate-common.m4 macros pkg-config gettext itstool wrapGAppsHook3 + yelp-tools ]; buildInputs = [ @@ -62,7 +65,6 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; passthru.updateScript = gitUpdater { - url = "https://git.mate-desktop.org/eom"; odd-unstable = true; rev-prefix = "v"; }; diff --git a/pkgs/development/python-modules/essent-dynamic-pricing/default.nix b/pkgs/development/python-modules/essent-dynamic-pricing/default.nix index 73e8eb909fbf..b30e6a2dccce 100644 --- a/pkgs/development/python-modules/essent-dynamic-pricing/default.nix +++ b/pkgs/development/python-modules/essent-dynamic-pricing/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "essent-dynamic-pricing"; - version = "0.2.7"; + version = "0.3.1"; pyproject = true; src = fetchFromGitHub { owner = "jaapp"; repo = "py-essent-dynamic-pricing"; - tag = version; - hash = "sha256-jYSyFZ4b6zyfIvT9KkvffH2CteHgy844O76UjUcaTq0="; + tag = "v${version}"; + hash = "sha256-98dh9XNXIVDI0w0/RqEGnDbDpQQoaZz/TvMIl6t3c3o="; }; build-system = [ hatchling ]; @@ -36,6 +36,7 @@ buildPythonPackage rec { ]; meta = { + changelog = "https://github.com/jaapp/py-essent-dynamic-pricing/releases/tag/${src.tag}"; description = "Async client for Essent dynamic energy prices"; homepage = "https://github.com/jaapp/py-essent-dynamic-pricing"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/iometer/default.nix b/pkgs/development/python-modules/iometer/default.nix index beba41d64809..a8572074f6f1 100644 --- a/pkgs/development/python-modules/iometer/default.nix +++ b/pkgs/development/python-modules/iometer/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "iometer"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "iometer-gmbh"; repo = "iometer.py"; tag = "v${version}"; - hash = "sha256-rr+t8VPiPX9/r7mHo9DjLRjoZ7x/4IadhmDtIi2T0C4="; + hash = "sha256-FO9IwBXGIBh522JaaATjxo93zbGwnB+Y9dy7724d1Rw="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/py-libzfs/default.nix b/pkgs/development/python-modules/py-libzfs/default.nix index 3b6395232ec4..de4d805addf9 100644 --- a/pkgs/development/python-modules/py-libzfs/default.nix +++ b/pkgs/development/python-modules/py-libzfs/default.nix @@ -10,21 +10,17 @@ buildPythonPackage rec { pname = "py-libzfs"; - version = "24.04.0"; + version = "25.10.1"; format = "setuptools"; src = fetchFromGitHub { owner = "truenas"; repo = "py-libzfs"; rev = "TS-${version}"; - hash = "sha256-Uiu0RNE06++iNWUNcKpbZvreT2D7/EqHlFZJXKe3F4A="; + hash = "sha256-kme5qUG0Nsya8HxU/oMHP1AidoMMOob/EON8sZMzKKI="; }; patches = [ - (fetchpatch2 { - url = "https://github.com/truenas/py-libzfs/commit/b5ffe1f1d6097df6e2f5cc6dd3c968872ec60804.patch"; - hash = "sha256-6r5hQ/o7c4vq4Tfh0l1WbeK3AuPvi+1wzkwkIn1qEes="; - }) # Upstream has open PR. Debian uses the patch. # https://github.com/truenas/py-libzfs/pull/277 (fetchpatch2 { diff --git a/pkgs/development/python-modules/togrill-bluetooth/default.nix b/pkgs/development/python-modules/togrill-bluetooth/default.nix index abf75f3bb427..7b1ba9314c9b 100644 --- a/pkgs/development/python-modules/togrill-bluetooth/default.nix +++ b/pkgs/development/python-modules/togrill-bluetooth/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "togrill-bluetooth"; - version = "0.8.0"; + version = "0.8.1"; pyproject = true; src = fetchFromGitHub { owner = "elupus"; repo = "togrill-bluetooth"; tag = version; - hash = "sha256-aBuWy8tG722yLzUS62yGdXcETGuH+dX9XVi/qMwEiVg="; + hash = "sha256-UZul5JEGv0zRcnUsEH2dkIiFt7jNYAc+9RvmDJMxkk0="; }; build-system = [ diff --git a/pkgs/development/python-modules/unstructured-client/default.nix b/pkgs/development/python-modules/unstructured-client/default.nix index afec345dacc8..1b2d0a98b7cb 100644 --- a/pkgs/development/python-modules/unstructured-client/default.nix +++ b/pkgs/development/python-modules/unstructured-client/default.nix @@ -21,14 +21,14 @@ buildPythonPackage (finalAttrs: { pname = "unstructured-client"; - version = "0.42.8"; + version = "0.42.9"; pyproject = true; src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-python-client"; tag = "v${finalAttrs.version}"; - hash = "sha256-BXHJOkTZdAnpf38WdHugcwYyWuURylbYTjaKoPt7O5A="; + hash = "sha256-+neZK7I5qjidLlM298TrVl5mGFBdGZdxAdFaJIf0tNk="; }; preBuild = ''