diff --git a/doc/languages-frameworks/ruby.section.md b/doc/languages-frameworks/ruby.section.md index 25c31de17e71..62ab8b309635 100644 --- a/doc/languages-frameworks/ruby.section.md +++ b/doc/languages-frameworks/ruby.section.md @@ -8,7 +8,7 @@ In the Nixpkgs tree, Ruby packages can be found throughout, depending on what th There are two main approaches for using Ruby with gems. One is to use a specifically locked `Gemfile` for an application that has very strict dependencies. The other is to depend on the common gems, which we'll explain further down, and rely on them being updated regularly. -The interpreters have common attributes, namely `gems`, and `withPackages`. So you can refer to `ruby.gems.nokogiri`, or `ruby_3_2.gems.nokogiri` to get the Nokogiri gem already compiled and ready to use. +The interpreters have common attributes, namely `gems`, and `withPackages`. So you can refer to `ruby.gems.nokogiri`, or `ruby_3_4.gems.nokogiri` to get the Nokogiri gem already compiled and ready to use. Since not all gems have executables like `nokogiri`, it's usually more convenient to use the `withPackages` function like this: `ruby.withPackages (p: with p; [ nokogiri ])`. This will also make sure that the Ruby in your environment will be able to find the gem and it can be used in your Ruby code (for example via `ruby` or `irb` executables) via `require "nokogiri"` as usual. diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index f0c12da002c3..cbdcb530d984 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -146,6 +146,8 @@ and backwards incompatible database migrations. Ensure backups are valid and run a Full Scan after starting the new version. +- `deabbeef` no longer support `gtk2`. + - `tooling-language-server` has been renamed to `deputy` (both the package and binary), following the rename of the upstream project. - `fetchFromBitBucket` has gained a `fetchgit` backend when passing in git-related arguments similar to `fetchFromGitHub`. diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 1253bae48a6d..983ba57e57d6 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -80,7 +80,7 @@ in enable = lib.mkEnableOption "Redmine, a project management web application"; package = lib.mkPackageOption pkgs "redmine" { - example = "redmine.override { ruby = pkgs.ruby_3_2; }"; + example = "redmine.override { ruby = pkgs.ruby_3_4; }"; }; user = lib.mkOption { diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index 545cbe25f167..c01dbc90ec7a 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -91,6 +91,14 @@ in virtualisation.fileSystems."/".device = lib.mkForce "auto"; }; + automount.configuration = { + virtualisation.fileSystems."/testauto" = { + device = "tmpfs"; + fsType = "tmpfs"; + options = [ "x-systemd.automount" ]; + }; + }; + swap.configuration.swapDevices = lib.mkVMOverride [ { device = "/swapfile"; @@ -627,6 +635,17 @@ in (pkgs.writeText "dbus-reload-dummy" "dbus reload dummy") ]; }; + + generators.configuration = + { lib, pkgs, ... }: + { + systemd.generators.simple-generator = pkgs.writeShellScript "simple-generator" '' + ${lib.getExe' pkgs.coreutils "cat"} >$1/simple-generated.service </dev/null || date -u -r "$SOURCE_DATE_EPOCH")' + patchShebangs build/os_version ''; installPhase = '' diff --git a/pkgs/by-name/ai/airspyhf/package.nix b/pkgs/by-name/ai/airspyhf/package.nix index 972a80ebe038..344c5da3be54 100644 --- a/pkgs/by-name/ai/airspyhf/package.nix +++ b/pkgs/by-name/ai/airspyhf/package.nix @@ -7,15 +7,15 @@ libusb1, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "airspyhf"; - version = "1.6.8"; + version = "1.6.8-unstable-2025-07-12"; src = fetchFromGitHub { owner = "airspy"; repo = "airspyhf"; - tag = version; - hash = "sha256-RKTMEDPeKcerJZtXTn8eAShxDcZUMgeQg/+7pEpMyVg="; + rev = "87cf12a30f3a0f10f313aab8e54999ca69b753af"; + hash = "sha256-7bXBv4YTOaWRFI6Svb9/lSBEAssUgJMqxKM5zHk1swM="; }; nativeBuildInputs = [ @@ -29,7 +29,10 @@ stdenv.mkDerivation rec { description = "User mode driver for Airspy HF+"; homepage = "https://github.com/airspy/airspyhf"; license = licenses.bsd3; - maintainers = with maintainers; [ sikmir ]; + maintainers = with maintainers; [ + aciceri + sikmir + ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/ap/aptdec/package.nix b/pkgs/by-name/ap/aptdec/package.nix index ef2ce7375ac8..213c7762809d 100644 --- a/pkgs/by-name/ap/aptdec/package.nix +++ b/pkgs/by-name/ap/aptdec/package.nix @@ -24,17 +24,23 @@ stdenv.mkDerivation rec { cmake pkg-config ]; + buildInputs = [ libpng libsndfile ]; + cmakeFlags = [ (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10") ]; + meta = with lib; { description = "NOAA APT satellite imagery decoding library"; mainProgram = "aptdec"; homepage = "https://github.com/Xerbo/aptdec"; license = licenses.gpl2; - maintainers = with maintainers; [ alexwinter ]; + maintainers = with maintainers; [ + aciceri + alexwinter + ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/ar/armagetronad-dedicated/package.nix b/pkgs/by-name/ar/armagetronad-dedicated/package.nix new file mode 100644 index 000000000000..67aa20cb7210 --- /dev/null +++ b/pkgs/by-name/ar/armagetronad-dedicated/package.nix @@ -0,0 +1,7 @@ +{ + armagetronad, +}: + +armagetronad.override { + dedicatedServer = true; +} diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/by-name/ar/armagetronad/package.nix similarity index 98% rename from pkgs/games/armagetronad/default.nix rename to pkgs/by-name/ar/armagetronad/package.nix index c42be9aed44c..f814aad03c33 100644 --- a/pkgs/games/armagetronad/default.nix +++ b/pkgs/by-name/ar/armagetronad/package.nix @@ -248,13 +248,13 @@ let tests.armagetronad = nixosTests.armagetronad; }; - meta = with lib; { + meta = { inherit mainProgram; homepage = "https://www.armagetronad.org"; description = "Multiplayer networked arcade racing game in 3D similar to Tron"; - maintainers = with maintainers; [ numinit ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ numinit ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; }; in diff --git a/pkgs/by-name/ca/caido/package.nix b/pkgs/by-name/ca/caido/package.nix index 0b72008251e7..94a6ac5e1865 100644 --- a/pkgs/by-name/ca/caido/package.nix +++ b/pkgs/by-name/ca/caido/package.nix @@ -5,10 +5,11 @@ appimageTools, makeWrapper, autoPatchelfHook, + _7zz, + unzip, libgcc, appVariants ? [ ], }: - let pname = "caido"; appVariantList = [ @@ -16,52 +17,161 @@ let "desktop" ]; version = "0.52.0"; + + system = stdenv.hostPlatform.system; + isLinux = stdenv.isLinux; + isDarwin = stdenv.isDarwin; + + # CLI sources + cliSources = { + x86_64-linux = { + url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz"; + hash = "sha256-gxB5GeJXTrPDGRXxKV3kdYQ0VgmmIeO8rggRPQlTDqw="; + }; + aarch64-linux = { + url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-aarch64.tar.gz"; + hash = "sha256-VaYy3OkAeuxZ0+UFENOvFYowa9jExQd3WO7VFJ6kPMg="; + }; + x86_64-darwin = { + url = "https://caido.download/releases/v${version}/caido-cli-v${version}-mac-x86_64.zip"; + hash = "sha256-GhPKxkCJjhwafmXOgaCePCn3g1Mls+ZFu4xWBzVXaQo="; + }; + aarch64-darwin = { + url = "https://caido.download/releases/v${version}/caido-cli-v${version}-mac-aarch64.zip"; + hash = "sha256-R394RFaYHm8zi4gKuaP0Ljhybq/80MGYlTlld3tACdQ="; + }; + }; + + # Desktop sources + desktopSources = { + x86_64-linux = { + url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage"; + hash = "sha256-ANCMHJTeH0UyJvCpslbxc0I3BbfPfR7kr4UISWeo2ec="; + }; + aarch64-linux = { + url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-aarch64.AppImage"; + hash = "sha256-tlNcxc+eh/Y0HrkMXWJ2SP+Lr5xfXJUAhZAgk7s/WRE="; + }; + x86_64-darwin = { + url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-mac-x86_64.dmg"; + hash = "sha256-c2Hc6KCwgebAa3rHAvV9FgVeiexSuwqYbe85PwNxV08="; + }; + aarch64-darwin = { + url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-mac-aarch64.dmg"; + hash = "sha256-fbhQ4Q0TyRySd3k9h7CutnreVJj29+XvX/RM1cDTRSg="; + }; + }; + + cliSource = cliSources.${system} or (throw "Unsupported system for caido-cli: ${system}"); + desktopSource = + desktopSources.${system} or (throw "Unsupported system for caido-desktop: ${system}"); + cli = fetchurl { - url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz"; - hash = "sha256-gxB5GeJXTrPDGRXxKV3kdYQ0VgmmIeO8rggRPQlTDqw="; + url = cliSource.url; + hash = cliSource.hash; }; + desktop = fetchurl { - url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage"; - hash = "sha256-ANCMHJTeH0UyJvCpslbxc0I3BbfPfR7kr4UISWeo2ec="; + url = desktopSource.url; + hash = desktopSource.hash; }; + appimageContents = appimageTools.extractType2 { inherit pname version; src = desktop; }; - wrappedDesktop = appimageTools.wrapType2 { - src = desktop; - inherit pname version; + wrappedDesktop = + if isLinux then + appimageTools.wrapType2 { + src = desktop; + inherit pname version; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; - extraPkgs = pkgs: [ pkgs.libthai ]; + extraPkgs = pkgs: [ pkgs.libthai ]; - extraInstallCommands = '' - install -m 444 -D ${appimageContents}/caido.desktop -t $out/share/applications - install -m 444 -D ${appimageContents}/caido.png \ - $out/share/icons/hicolor/512x512/apps/caido.png - wrapProgram $out/bin/caido \ - --set WEBKIT_DISABLE_COMPOSITING_MODE 1 \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" - ''; - }; + extraInstallCommands = '' + install -m 444 -D ${appimageContents}/caido.desktop -t $out/share/applications + install -m 444 -D ${appimageContents}/caido.png \ + $out/share/icons/hicolor/512x512/apps/caido.png + wrapProgram $out/bin/caido \ + --set WEBKIT_DISABLE_COMPOSITING_MODE 1 \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" + ''; + } + else if isDarwin then + stdenv.mkDerivation { + src = desktop; + inherit pname version; - wrappedCli = stdenv.mkDerivation { - src = cli; - inherit pname version; + nativeBuildInputs = [ _7zz ]; + sourceRoot = "."; - nativeBuildInputs = [ autoPatchelfHook ]; + unpackPhase = '' + runHook preUnpack + ${_7zz}/bin/7zz x $src + runHook postUnpack + ''; - buildInputs = [ libgcc ]; + installPhase = '' + runHook preInstall + mkdir -p $out/Applications + cp -r Caido.app $out/Applications/ + mkdir -p $out/bin + ln -s $out/Applications/Caido.app/Contents/MacOS/Caido $out/bin/caido + runHook postInstall + ''; - sourceRoot = "."; + meta = { + platforms = [ + "x86_64-darwin" + "aarch64-darwin" + ]; + }; + } + else + throw "Desktop variant is not supported on ${stdenv.hostPlatform.system}"; - installPhase = '' - runHook preInstall - install -m755 -D caido-cli $out/bin/caido-cli - ''; - }; + wrappedCli = + if isLinux then + stdenv.mkDerivation { + src = cli; + inherit pname version; + + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ libgcc ]; + sourceRoot = "."; + + installPhase = '' + runHook preInstall + install -m755 -D caido-cli $out/bin/caido-cli + runHook postInstall + ''; + } + else if isDarwin then + stdenv.mkDerivation { + src = cli; + inherit pname version; + + nativeBuildInputs = [ unzip ]; + sourceRoot = "."; + + installPhase = '' + runHook preInstall + install -m755 -D caido-cli $out/bin/caido-cli + runHook postInstall + ''; + + meta = { + platforms = [ + "x86_64-darwin" + "aarch64-darwin" + ]; + }; + } + else + throw "CLI variant is not supported on ${stdenv.hostPlatform.system}"; meta = { description = "Lightweight web security auditing toolkit"; @@ -73,9 +183,13 @@ let d3vil0p3r blackzeshi ]; - platforms = [ "x86_64-linux" ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; }; - in lib.checkListOfEnum "${pname}: appVariants" appVariantList appVariants ( if appVariants == [ "desktop" ] then diff --git a/pkgs/by-name/cl/clipper/package.nix b/pkgs/by-name/cl/clipper/package.nix index e9297156cf12..e0eeab13630d 100644 --- a/pkgs/by-name/cl/clipper/package.nix +++ b/pkgs/by-name/cl/clipper/package.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { sourceRoot = "cpp"; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)" "CMAKE_MINIMUM_REQUIRED(VERSION 3.10.0)" + ''; + nativeBuildInputs = [ cmake ninja diff --git a/pkgs/by-name/cm/cm256cc/package.nix b/pkgs/by-name/cm/cm256cc/package.nix index a608a421eda1..1484cff696f6 100644 --- a/pkgs/by-name/cm/cm256cc/package.nix +++ b/pkgs/by-name/cm/cm256cc/package.nix @@ -2,32 +2,21 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, boost, }: stdenv.mkDerivation rec { pname = "cm256cc"; - version = "1.1.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "f4exb"; repo = "cm256cc"; rev = "v${version}"; - sha256 = "sha256-T7ZUVVYGdzAialse//MoqWCVNBpbZvzWMAKc0cw7O9k="; + hash = "sha256-sAbc8yieGolV8lowiwFBVsd1HNYl1oxJwIw1kc3iI3U="; }; - patches = [ - # Pull fix pending upstream inclusion for gcc-13 support: - # https://github.com/f4exb/cm256cc/pull/18 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/f4exb/cm256cc/commit/a7f142bcdae8be1c646d67176ba0ba0f7e8dcd68.patch"; - hash = "sha256-J7bm44sqnGsdPhJxQrE8LDxZ6tkTzLslHQnnKmtgrtM="; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ boost ]; @@ -41,7 +30,10 @@ stdenv.mkDerivation rec { description = "Fast GF(256) Cauchy MDS Block Erasure Codec in C++"; homepage = "https://github.com/f4exb/cm256cc"; platforms = platforms.unix; - maintainers = with maintainers; [ alkeryn ]; + maintainers = with maintainers; [ + aciceri + alkeryn + ]; license = licenses.gpl3; }; } diff --git a/pkgs/by-name/da/dab_lib/package.nix b/pkgs/by-name/da/dab_lib/package.nix index fd3cb016e54e..ae23999d78e4 100644 --- a/pkgs/by-name/da/dab_lib/package.nix +++ b/pkgs/by-name/da/dab_lib/package.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/library"; + cmakeFlags = [ (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10") ]; + nativeBuildInputs = [ cmake pkg-config @@ -36,7 +38,10 @@ stdenv.mkDerivation (finalAttrs: { description = "DAB/DAB+ decoding library"; homepage = "https://github.com/JvanKatwijk/dab-cmdline"; license = licenses.gpl2; - maintainers = with maintainers; [ alexwinter ]; + maintainers = with maintainers; [ + aciceri + alexwinter + ]; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/fl/fleet/package.nix b/pkgs/by-name/fl/fleet/package.nix index 8a3920099727..2ef8fca196cb 100644 --- a/pkgs/by-name/fl/fleet/package.nix +++ b/pkgs/by-name/fl/fleet/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "fleet"; - version = "4.73.2"; + version = "4.73.5"; src = fetchFromGitHub { owner = "fleetdm"; repo = "fleet"; tag = "fleet-v${finalAttrs.version}"; - hash = "sha256-Td0ud/7BVDAN7Y74GQFyPnkLmaGS578zRu/8KmjQk5c="; + hash = "sha256-66ABReCDIxL+uwwK3IWnKR+UPJd5DBSE+bNUk+2LbQA="; }; vendorHash = "sha256-T4UrUUHAWqInLRH7ZxQlfV1W1rvmhUFsfEeXQdNmRD4="; diff --git a/pkgs/by-name/fz/fzf/package.nix b/pkgs/by-name/fz/fzf/package.nix index c99a382e5e0e..69a42f183d84 100644 --- a/pkgs/by-name/fz/fzf/package.nix +++ b/pkgs/by-name/fz/fzf/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "fzf"; - version = "0.65.2"; + version = "0.66.0"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf"; rev = "v${version}"; - hash = "sha256-vIAkbZ3jx5B5+zdjT+4jMxhGPmiYUBIz5UjSP5HhQ9k="; + hash = "sha256-4cspznuGPhTFSUM9yYvPoytX27CKenp/oAMqWpT5JrE="; }; - vendorHash = "sha256-1wxi+wfTSSgJQLNbCdoFTz9G4XLgEX7PpzqpuVjEYL8="; + vendorHash = "sha256-uFXHoseFOxGIGPiWxWfDl339vUv855VHYgSs9rnDyuI="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/gp/gpu-viewer/package.nix b/pkgs/by-name/gp/gpu-viewer/package.nix index 928660bdbe43..de6af4b37c84 100644 --- a/pkgs/by-name/gp/gpu-viewer/package.nix +++ b/pkgs/by-name/gp/gpu-viewer/package.nix @@ -29,14 +29,14 @@ python3Packages.buildPythonApplication rec { pname = "gpu-viewer"; - version = "3.15"; + version = "3.20"; pyproject = false; src = fetchFromGitHub { owner = "arunsivaramanneo"; repo = "gpu-viewer"; tag = "v${version}"; - hash = "sha256-fZsieETJqLbqq3UWtxRtOk5DpxHaTZfYeOLsBTlUtuo="; + hash = "sha256-d7gAf3ZXCVZ0O63QV1khq6kaRuPxdAVnRO2+C8B4SUA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/is/isd/package.nix b/pkgs/by-name/is/isd/package.nix index 4ff00480569a..ab243748e7f4 100644 --- a/pkgs/by-name/is/isd/package.nix +++ b/pkgs/by-name/is/isd/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "isd"; - version = "0.6.0"; + version = "0.6.1"; pyproject = true; src = fetchFromGitHub { owner = "kainctl"; repo = "isd"; tag = "v${version}"; - hash = "sha256-0RBalvqa2EM7FsgR4CamqkbKrD5QCrz9stk4ijqZi1Q="; + hash = "sha256-MEfjE0zRxSuBwBkjAz9cKhodS+I4CjjtuvbO+WwL9SM="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/ki/kine/package.nix b/pkgs/by-name/ki/kine/package.nix index 686f11b19a82..9245a65a6f5b 100644 --- a/pkgs/by-name/ki/kine/package.nix +++ b/pkgs/by-name/ki/kine/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kine"; - version = "0.14.3"; + version = "0.14.5"; src = fetchFromGitHub { owner = "k3s-io"; repo = "kine"; rev = "v${version}"; - hash = "sha256-Mmtqyc5LTGQ/Ldp/g7nLXi4dX7bWKiVpeWRzYoTsmm0="; + hash = "sha256-2I/igT7AjiPhLpK1pM5V2FvOF4Oc897HbsBMiwCnx/o="; }; - vendorHash = "sha256-NG4hzMXsZmzde/EjQARKE00D13UuIQxm+cpIbHPEpB0="; + vendorHash = "sha256-Qx4yId072JhuXjF0Xd1/DnsnbsMlfuiwFqDKKw4rDLM="; ldflags = [ "-s" diff --git a/pkgs/by-name/mb/mbelib/package.nix b/pkgs/by-name/mb/mbelib/package.nix index ec79289e1d33..9672719b2682 100644 --- a/pkgs/by-name/mb/mbelib/package.nix +++ b/pkgs/by-name/mb/mbelib/package.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + cmakeFlags = [ (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10") ]; + doCheck = true; meta = with lib; { @@ -25,6 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/szechyjs/mbelib"; license = licenses.isc; platforms = platforms.unix; - maintainers = [ ]; + maintainers = [ lib.maintainers.aciceri ]; }; } diff --git a/pkgs/by-name/me/mediawiki/package.nix b/pkgs/by-name/me/mediawiki/package.nix index 45ae748c9bf8..199ffa40cc4c 100644 --- a/pkgs/by-name/me/mediawiki/package.nix +++ b/pkgs/by-name/me/mediawiki/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "mediawiki"; - version = "1.44.1"; + version = "1.44.2"; src = fetchurl { url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz"; - hash = "sha256-cMsjrJtGDsGZH6M4J6TbWPoIDmc36kIdQoHEkGWy3VA="; + hash = "sha256-59cCZpeWcfr9A3BeF6IfGFvRsoP/hD7XL+KQ6G+sQzE="; }; postPatch = '' diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 554aede0ad7b..15fc88bb6bfa 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -22,12 +22,12 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "0.14.7"; + version = "0.15.0"; src = fetchFromGitHub { owner = "sst"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-7Sf74H2ptZoKkOyqy3JU71B2r2DBdosChiWA0dNpiV0="; + hash = "sha256-WTWLh50atZ0P+S0BIgInRoaQV94wIO7NJXrpnsiXTAU="; }; tui = buildGoModule { @@ -75,18 +75,24 @@ stdenvNoCC.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - export BUN_INSTALL_CACHE_DIR=$(mktemp -d) + export BUN_INSTALL_CACHE_DIR=$(mktemp -d) - # Disable post-install scripts to avoid shebang issues - bun install \ - --filter=opencode \ - --force \ - --ignore-scripts \ - --no-progress - # Remove `--frozen-lockfile` and `--production` — they erroneously report the lockfile needs updating even though `bun install` does not change it. - # Related to https://github.com/oven-sh/bun/issues/19088 - # --frozen-lockfile \ - # --production + # NOTE: Disabling post-install scripts with `--ignore-scripts` to avoid + # shebang issues + # NOTE: `--linker=hoisted` temporarily disables Bun's isolated installs, + # which became the default in Bun 1.3.0. + # See: https://bun.com/blog/bun-v1.3#isolated-installs-are-now-the-default-for-workspaces + # This workaround is required because the 'yargs' dependency is currently + # missing when building opencode. Remove this flag once upstream is + # compatible with Bun 1.3.0. + bun install \ + --filter=opencode \ + --force \ + --frozen-lockfile \ + --ignore-scripts \ + --linker=hoisted \ + --no-progress \ + --production runHook postBuild ''; @@ -105,10 +111,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { outputHash = { - x86_64-linux = "sha256-j6p52NXqKsOiySJO83r3qUvxLs1yt8dPG8q5ClOPLA8="; - aarch64-linux = "sha256-gxAwc34PIN1ErVchyoX7Fv/VhPHzxVOC/F6P8hSeO/w="; - x86_64-darwin = "sha256-0I6nTjc7gChk2Djv4hFfKMp0wM3ZX57/pCsPVHSDPqk="; - aarch64-darwin = "sha256-a/WWhsOP4pZfj5+Vlsyt/adaTTgMt2SlH3UOA+sXNgA="; + x86_64-linux = "sha256-kXsLJ/Ck9epH9md6goCj3IYpWog/pOkfxJDYAxI14Fg="; + aarch64-linux = "sha256-DHzDyk7BWYgBNhYDlK3dLZglUN7bMiB3acdoU7djbxU="; + x86_64-darwin = "sha256-OTEK9SV9IxBHrJlf+F4lI7gF0Gtvik3c7d1mp+4a3Zk="; + aarch64-darwin = "sha256-qlLfus/cyrI0HtwVLTjPTdL7OeIYjmH9yoNKa6YNBkg="; } .${stdenv.hostPlatform.system}; outputHashAlgo = "sha256"; diff --git a/pkgs/by-name/sd/sdrangel/package.nix b/pkgs/by-name/sd/sdrangel/package.nix index 08538523beb2..8f91a991b024 100644 --- a/pkgs/by-name/sd/sdrangel/package.nix +++ b/pkgs/by-name/sd/sdrangel/package.nix @@ -122,6 +122,7 @@ stdenv.mkDerivation (finalAttrs: { SDRangel is an Open Source Qt6 / OpenGL 3.0+ SDR and signal analyzer frontend to various hardware. ''; maintainers = with lib.maintainers; [ + aciceri alkeryn Tungsten842 ]; diff --git a/pkgs/by-name/so/sonic-pi/package.nix b/pkgs/by-name/so/sonic-pi/package.nix index ecaf08b0c11e..caade728fd53 100644 --- a/pkgs/by-name/so/sonic-pi/package.nix +++ b/pkgs/by-name/so/sonic-pi/package.nix @@ -8,12 +8,13 @@ cmake, pkg-config, catch2_3, + ncurses, kdePackages, kissfftFloat, crossguid, reproc, platform-folders, - ruby_3_2, + ruby, beamPackages, alsa-lib, rtmidi, @@ -31,11 +32,15 @@ gl3w, SDL2, fmt, -}: +}@args: -# Sonic Pi fails to build with Ruby 3.3. let - ruby = ruby_3_2; + ruby = args.ruby.withPackages (ps: [ + ps.prime + ps.racc + ps.rake + ps.rexml + ]); in stdenv.mkDerivation (finalAttrs: { @@ -72,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + ncurses kdePackages.qtbase kdePackages.qtsvg kdePackages.qttools diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs index 705b9284f6a1..a33b391a524a 100644 --- a/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs +++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs @@ -197,17 +197,17 @@ fn required_env(var: &str) -> anyhow::Result { std::env::var(var).with_context(|| format!("missing required environment variable ${var}")) } -#[derive(Debug)] -struct UnitState { +struct UnitState<'a, 'b> { state: String, substate: String, + proxy: Proxy<'a, &'b LocalConnection>, } // Asks the currently running systemd instance via dbus which units are active. Returns a hash // where the key is the name of each unit and the value a hash of load, state, substate. -fn get_active_units( - systemd_manager: &Proxy<'_, &LocalConnection>, -) -> Result> { +fn get_active_units<'a, 'b>( + systemd_manager: &Proxy<'a, &'b LocalConnection>, +) -> Result>> { let units = systemd_manager .list_units_by_patterns(Vec::new(), Vec::new()) .context("Failed to list systemd units")?; @@ -219,29 +219,36 @@ fn get_active_units( id, _description, _load_state, - active_state, - sub_state, + state, + substate, following, - _unit_path, + unit_path, _job_id, _job_type, _job_path, )| { - if following.is_empty() && active_state != "inactive" { - Some((id, active_state, sub_state)) + let proxy = systemd_manager.connection.with_proxy( + "org.freedesktop.systemd1", + unit_path, + Duration::from_millis(5000), + ); + + if following.is_empty() && state != "inactive" { + Some(( + id, + UnitState { + state, + substate, + proxy, + }, + )) } else { None } }, ) - .fold(HashMap::new(), |mut acc, (id, active_state, sub_state)| { - acc.insert( - id, - UnitState { - state: active_state, - substate: sub_state, - }, - ); + .fold(HashMap::new(), |mut acc, (id, unit_state)| { + acc.insert(id, unit_state); acc })) @@ -811,9 +818,12 @@ fn parse_fstab(fstab: impl BufRead) -> (HashMap, HashMap String { +fn path_to_unit_name(bin_path: &Path, path: &str, is_automount: bool) -> String { let Ok(output) = std::process::Command::new(bin_path.join("systemd-escape")) - .arg("--suffix=mount") + .arg(format!( + "--suffix={}", + if is_automount { "automount" } else { "mount" } + )) .arg("-p") .arg(path) .output() @@ -823,7 +833,7 @@ fn path_to_unit_name(bin_path: &Path, path: &str) -> String { }; let Ok(unit) = String::from_utf8(output.stdout) else { - eprintln!("Unable to convert systemd-espape output to valid UTF-8"); + eprintln!("Unable to convert systemd-escape output to valid UTF-8"); die(); }; @@ -1189,6 +1199,17 @@ won't take effect until you reboot the system. .context("Invalid regex for matching systemd unit names")?; for (unit, unit_state) in ¤t_active_units { + // Don't touch units not explicitly written by NixOS (e.g. units created by generators in + // /run/systemd/generator*) + if !unit_state + .proxy + .get("org.freedesktop.systemd1.Unit", "FragmentPath") + .map(|fragment_path: String| fragment_path.starts_with("/etc/systemd/system")) + .unwrap_or_default() + { + continue; + } + let current_unit_file = Path::new("/etc/systemd/system").join(unit); let new_unit_file = toplevel.join("etc/systemd/system").join(unit); @@ -1319,8 +1340,10 @@ won't take effect until you reboot the system. .unwrap_or_default(); for (mountpoint, current_filesystem) in current_filesystems { + let is_automount = current_filesystem.options.contains("x-systemd.automount"); + // Use current version of systemctl binary before daemon is reexeced. - let unit = path_to_unit_name(¤t_system_bin, &mountpoint); + let unit = path_to_unit_name(¤t_system_bin, &mountpoint, is_automount); if let Some(new_filesystem) = new_filesystems.get(&mountpoint) { if current_filesystem.fs_type != new_filesystem.fs_type || current_filesystem.device != new_filesystem.device diff --git a/pkgs/by-name/tr/tree-from-tags/Gemfile.lock b/pkgs/by-name/tr/tree-from-tags/Gemfile.lock index 0ae90c1aebbe..e69de29bb2d1 100644 --- a/pkgs/by-name/tr/tree-from-tags/Gemfile.lock +++ b/pkgs/by-name/tr/tree-from-tags/Gemfile.lock @@ -1,13 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - taglib-ruby (0.7.1) - -PLATFORMS - ruby - -DEPENDENCIES - taglib-ruby - -BUNDLED WITH - 2.1.4 diff --git a/pkgs/by-name/tr/tree-from-tags/gemset.nix b/pkgs/by-name/tr/tree-from-tags/gemset.nix index 67fd0af05823..092bcece7fbb 100644 --- a/pkgs/by-name/tr/tree-from-tags/gemset.nix +++ b/pkgs/by-name/tr/tree-from-tags/gemset.nix @@ -1,10 +1,12 @@ { taglib-ruby = { + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0r8g7zdncc6243d000jn0grc1n70rn9mx16vggy3q7c4wgsa37xi"; + sha256 = "1bmirkz9lfhbykj3x48z1gv0jl1bfz60yscpl0hmjxrdmcihzfai"; type = "gem"; }; - version = "0.7.1"; + version = "2.0.0"; }; } diff --git a/pkgs/by-name/tt/tt-burnin/package.nix b/pkgs/by-name/tt/tt-burnin/package.nix new file mode 100644 index 000000000000..fff3cb24c36e --- /dev/null +++ b/pkgs/by-name/tt/tt-burnin/package.nix @@ -0,0 +1,49 @@ +{ + lib, + fetchFromGitHub, + python3Packages, + versionCheckHook, +}: +python3Packages.buildPythonApplication rec { + pname = "tt-burnin"; + version = "0.2.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tenstorrent"; + repo = "tt-burnin"; + tag = "v${version}"; + hash = "sha256-/tnCLhA6zeUkVYhDtdohrZODwHxNTZbnsWgY2Gt16DQ="; + }; + + # Remove when https://github.com/NixOS/nixpkgs/pull/444714 is merged + pythonRelaxDeps = [ + "pyluwen" + ]; + + build-system = with python3Packages; [ + setuptools + setuptools-scm + ]; + + dependencies = with python3Packages; [ + pyluwen + tt-tools-common + jsons + ]; + + nativeCheckInputs = [ + versionCheckHook + ]; + + versionCheckProgramArg = "--version"; + + meta = { + mainProgram = "tt-burnin"; + description = "Command line utility to run a high power consumption workload on TT devices"; + homepage = "https://github.com/tenstorrent/tt-burnin"; + changelog = "https://github.com/tenstorrent/tt-burnin/blob/${src.tag}/CHANGELOG.md"; + maintainers = with lib.maintainers; [ RossComputerGuy ]; + license = with lib.licenses; [ asl20 ]; + }; +} diff --git a/pkgs/by-name/tt/tt-topology/package.nix b/pkgs/by-name/tt/tt-topology/package.nix new file mode 100644 index 000000000000..0ae7af8deccb --- /dev/null +++ b/pkgs/by-name/tt/tt-topology/package.nix @@ -0,0 +1,67 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + fetchpatch, + versionCheckHook, +}: +python3Packages.buildPythonApplication rec { + pname = "tt-topology"; + version = "1.2.13"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tenstorrent"; + repo = "tt-topology"; + tag = "v${version}"; + hash = "sha256-hjUQMBTShdbl/tRlFF55P3kQDHi5gsGQVcGZSDgA0as="; + }; + + build-system = with python3Packages; [ + setuptools + setuptools-scm + ]; + + dependencies = with python3Packages; [ + elasticsearch + pydantic + pyluwen + tt-tools-common + networkx + matplotlib + + # Needed for "pkg_resources" + setuptools + ]; + + nativeCheckInputs = [ + versionCheckHook + ]; + + pythonRemoveDeps = [ + "black" + "pre-commit" + ]; + + # Remove when https://github.com/tenstorrent/tt-topology/pull/51 is merged + pythonRelaxDeps = [ + "elasticsearch" + "networkx" + "matplotlib" + "setuptools" + ]; + + # Tests are broken + dontUsePytestCheck = true; + + versionCheckProgramArg = "--version"; + + meta = { + mainProgram = "tt-topology"; + description = "Command line utility used to flash multiple NB cards on a system to use specific eth routing configurations"; + homepage = "https://github.com/tenstorrent/tt-topology"; + changelog = "https://github.com/tenstorrent/tt-topology/blob/${src.tag}/CHANGELOG.md"; + maintainers = with lib.maintainers; [ RossComputerGuy ]; + license = with lib.licenses; [ asl20 ]; + }; +} diff --git a/pkgs/by-name/un/unit/package.nix b/pkgs/by-name/un/unit/package.nix index 5ac7dbc9ab7e..eb3841fbac71 100644 --- a/pkgs/by-name/un/unit/package.nix +++ b/pkgs/by-name/un/unit/package.nix @@ -12,10 +12,6 @@ php82, withPerl ? true, perl, - withRuby_3_1 ? true, - ruby_3_1, - withRuby_3_2 ? false, - ruby_3_2, withSSL ? true, openssl ? null, withIPv6 ? true, @@ -58,8 +54,6 @@ stdenv.mkDerivation rec { ] ++ optional withPHP82 php82-unit ++ optional withPerl perl - ++ optional withRuby_3_1 ruby_3_1 - ++ optional withRuby_3_2 ruby_3_2 ++ optional withSSL openssl; configureFlags = [ @@ -79,8 +73,6 @@ stdenv.mkDerivation rec { ${optionalString withPython3 "./configure python --module=python3 --config=python3-config --lib-path=${python3}/lib"} ${optionalString withPHP82 "./configure php --module=php82 --config=${php82-unit.unwrapped.dev}/bin/php-config --lib-path=${php82-unit}/lib"} ${optionalString withPerl "./configure perl --module=perl --perl=${perl}/bin/perl"} - ${optionalString withRuby_3_1 "./configure ruby --module=ruby31 --ruby=${ruby_3_1}/bin/ruby"} - ${optionalString withRuby_3_2 "./configure ruby --module=ruby32 --ruby=${ruby_3_2}/bin/ruby"} ''; passthru.tests = { diff --git a/pkgs/by-name/ze/zed-editor/0002-fix-duplicate-reqwest.patch b/pkgs/by-name/ze/zed-editor/0001-fix-duplicate-reqwest.patch similarity index 100% rename from pkgs/by-name/ze/zed-editor/0002-fix-duplicate-reqwest.patch rename to pkgs/by-name/ze/zed-editor/0001-fix-duplicate-reqwest.patch diff --git a/pkgs/by-name/ze/zed-editor/0001-linux-linker.patch b/pkgs/by-name/ze/zed-editor/0001-linux-linker.patch deleted file mode 100644 index 5deef7339a72..000000000000 --- a/pkgs/by-name/ze/zed-editor/0001-linux-linker.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/.cargo/config.toml b/.cargo/config.toml -index 717c5e1..0bb7b6c 100644 ---- a/.cargo/config.toml -+++ b/.cargo/config.toml -@@ -5,14 +5,6 @@ rustflags = ["-C", "symbol-mangling-version=v0", "--cfg", "tokio_unstable"] - [alias] - xtask = "run --package xtask --" - --[target.x86_64-unknown-linux-gnu] --linker = "clang" --rustflags = ["-C", "link-arg=-fuse-ld=mold"] -- --[target.aarch64-unknown-linux-gnu] --linker = "clang" --rustflags = ["-C", "link-arg=-fuse-ld=mold"] -- - [target.'cfg(target_os = "windows")'] - rustflags = [ - "--cfg", diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 29dc13b403bc..0811b18ce66d 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -99,7 +99,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.204.5"; + version = "0.207.4"; outputs = [ "out" @@ -112,38 +112,36 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-P3mD4jaoQA4zWHjWtrvRBG25lgmudbkuFLP+Cy6xaDg="; + hash = "sha256-IKACHMKHIyq8UuqWlA6U/cdCi+wrevZwl2CINSWmmRc="; }; - patches = [ - # Upstream delegates linking on Linux to clang to make use of mold, - # but builds fine with our standard linker. - # This patch removes their linker override from the cargo config. - ./0001-linux-linker.patch - ]; - cargoPatches = [ - ./0002-fix-duplicate-reqwest.patch + ./0001-fix-duplicate-reqwest.patch ]; - postPatch = + postPatch = '' # Dynamically link WebRTC instead of static - '' - substituteInPlace $cargoDepsCopy/webrtc-sys-*/build.rs \ - --replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc" + substituteInPlace $cargoDepsCopy/webrtc-sys-*/build.rs \ + --replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc" - # Zed team renamed the function but forgot to update its usage in this file - # We rename it ourselves for now, until upstream fixes the issue - substituteInPlace $cargoDepsCopy/reqwest-0.12*/src/blocking/client.rs \ - --replace-fail "inner.redirect(policy)" "inner.redirect_policy(policy)" + # Zed team renamed the function but forgot to update its usage in this file + # We rename it ourselves for now, until upstream fixes the issue + substituteInPlace $cargoDepsCopy/reqwest-0.12*/src/blocking/client.rs \ + --replace-fail "inner.redirect(policy)" "inner.redirect_policy(policy)" - # The generate-licenses script wants a specific version of cargo-about eventhough - # newer versions work just as well. - substituteInPlace script/generate-licenses \ - --replace-fail '$CARGO_ABOUT_VERSION' '${cargo-about.version}' - ''; + # The generate-licenses script wants a specific version of cargo-about eventhough + # newer versions work just as well. + substituteInPlace script/generate-licenses \ + --replace-fail '$CARGO_ABOUT_VERSION' '${cargo-about.version}' + ''; - cargoHash = "sha256-Mlcpcp9/+ZoUdQUYpYX33uxNoAE4gAFh0twGFxi4tNw="; + # remove package that has a broken Cargo.toml + # see: https://github.com/NixOS/nixpkgs/pull/445924#issuecomment-3334648753 + depsExtraArgs.postBuild = '' + rm -r $out/git/*/candle-book/ + ''; + + cargoHash = "sha256-jv8ytsttXFG5VlFWI885zLJsZn8rFkiFdPhUvNKOwpY="; nativeBuildInputs = [ cmake diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 7bb5ee799c5f..d01980ee3a91 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -57,14 +57,9 @@ let }: let ver = version; - atLeast31 = lib.versionAtLeast ver.majMin "3.1"; - atLeast32 = lib.versionAtLeast ver.majMin "3.2"; # https://github.com/ruby/ruby/blob/v3_2_2/yjit.h#L21 yjitSupported = - atLeast32 - && ( - stdenv.hostPlatform.isx86_64 || (!stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isAarch64) - ); + stdenv.hostPlatform.isx86_64 || (!stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isAarch64); rubyDrv = lib.makeOverridable ( { stdenv, @@ -188,25 +183,13 @@ let # make: *** [uncommon.mk:373: do-install-all] Error 1 enableParallelInstalling = false; - patches = - op (lib.versionOlder ver.majMin "3.1") ./do-not-regenerate-revision.h.patch - ++ op useBaseRuby ( - if atLeast32 then ./do-not-update-gems-baseruby-3.2.patch else ./do-not-update-gems-baseruby.patch - ) - ++ ops (ver.majMin == "3.0") [ - # Ruby 3.0 adds `-fdeclspec` to $CC instead of $CFLAGS. Fixed in later versions. - (fetchpatch { - url = "https://github.com/ruby/ruby/commit/0acc05caf7518cd0d63ab02bfa036455add02346.patch"; - hash = "sha256-43hI9L6bXfeujgmgKFVmiWhg7OXvshPCCtQ4TxqK1zk="; - }) - ] - ++ ops atLeast31 [ - # When using a baseruby, ruby always sets "libdir" to the build - # directory, which nix rejects due to a reference in to /build/ in - # the final product. Removing this reference doesn't seem to break - # anything and fixes cross compilation. - ./dont-refer-to-build-dir.patch - ]; + patches = op useBaseRuby ./do-not-update-gems-baseruby-3.2.patch ++ [ + # When using a baseruby, ruby always sets "libdir" to the build + # directory, which nix rejects due to a reference in to /build/ in + # the final product. Removing this reference doesn't seem to break + # anything and fixes cross compilation. + ./dont-refer-to-build-dir.patch + ]; cargoRoot = opString yjitSupport "yjit"; @@ -410,17 +393,6 @@ in mkRubyVersion = rubyVersion; mkRuby = generic; - ruby_3_1 = generic { - version = rubyVersion "3" "1" "7" ""; - hash = "sha256-BVas1p8UHdrOA/pd2NdufqDY9SMu3wEkKVebzaqzDns="; - }; - - ruby_3_2 = generic { - version = rubyVersion "3" "2" "9" ""; - hash = "sha256-q7rZjbmusVJ3Ow01ho5QADuMRn89BhUld8Tf7Z2I7So="; - cargoHash = "sha256-CMVx5/+ugDNEuLAvyPN0nGHwQw6RXyfRsMO9I+kyZpk="; - }; - ruby_3_3 = generic { version = rubyVersion "3" "3" "9" ""; hash = "sha256-0ZkWkKThcjPsazx4RMHhJFwK3OPgDXE1UdBFhGe3J7E="; diff --git a/pkgs/development/interpreters/ruby/do-not-regenerate-revision.h.patch b/pkgs/development/interpreters/ruby/do-not-regenerate-revision.h.patch deleted file mode 100644 index ddeb368ee8ae..000000000000 --- a/pkgs/development/interpreters/ruby/do-not-regenerate-revision.h.patch +++ /dev/null @@ -1,23 +0,0 @@ -Do not regenerate revision.h - -Ruby's makefile compares the shipped version with the git revision to regenerate -revision.h [1], but since we don't include git in buildInputs, this comparison -fails and it can't find $(REVISION_H). - -[1] https://github.com/ruby/ruby/commit/97a5af62a318fcd93a4e5e4428d576c0280ddbae - -diff -Naur ruby.old/defs/gmake.mk ruby.new/defs/gmake.mk ---- ruby.old/defs/gmake.mk -+++ ruby.new/defs/gmake.mk -@@ -325,11 +325,9 @@ - - REVISION_IN_HEADER := $(shell sed -n 's/^\#define RUBY_FULL_REVISION "\(.*\)"/\1/p' $(srcdir)/revision.h 2>/dev/null) - REVISION_LATEST := $(shell $(CHDIR) $(srcdir) && git log -1 --format=%H 2>/dev/null) --ifneq ($(REVISION_IN_HEADER),$(REVISION_LATEST)) - # GNU make treat the target as unmodified when its dependents get - # updated but it is not updated, while others may not. - $(srcdir)/revision.h: $(REVISION_H) --endif - - # Query on the generated rdoc - # diff --git a/pkgs/development/interpreters/ruby/do-not-update-gems-baseruby.patch b/pkgs/development/interpreters/ruby/do-not-update-gems-baseruby.patch deleted file mode 100644 index 2de1977630cb..000000000000 --- a/pkgs/development/interpreters/ruby/do-not-update-gems-baseruby.patch +++ /dev/null @@ -1,14 +0,0 @@ -Do not update gems when building with base ruby - -diff -Naur ruby.old/defs/gmake.mk ruby.new/defs/gmake.mk ---- ruby.old/common.mk -+++ ruby.new/common.mk -@@ -1298,7 +1298,7 @@ update-config_files: PHONY - config.guess config.sub - - refresh-gems: update-bundled_gems prepare-gems --prepare-gems: $(HAVE_BASERUBY:yes=update-gems) $(HAVE_BASERUBY:yes=extract-gems) -+prepare-gems: - - update-gems$(gnumake:yes=-nongnumake): PHONY - $(ECHO) Downloading bundled gem files... diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index f3731730fe0f..c25332464f07 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -14,7 +14,7 @@ let pname = "discord.py"; - version = "2.6.3"; + version = "2.6.4"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "Rapptz"; repo = "discord.py"; tag = "v${version}"; - hash = "sha256-OEU09pdV2H/RxhvxWNIrg8mPh7yiv6ItKNwvhMKKhco="; + hash = "sha256-glFXgTNdOQ3cG/jlvi/1ASon2HpcoKli45IhLhjpIvA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/gftools/default.nix b/pkgs/development/python-modules/gftools/default.nix index 9e70c648250d..e4f4ff83e342 100644 --- a/pkgs/development/python-modules/gftools/default.nix +++ b/pkgs/development/python-modules/gftools/default.nix @@ -62,14 +62,14 @@ let in buildPythonPackage rec { pname = "gftools"; - version = "0.9.91"; + version = "0.9.92"; pyproject = true; src = fetchFromGitHub { owner = "googlefonts"; repo = "gftools"; tag = "v${version}"; - hash = "sha256-tIvOHBA7MiNYrl9ZmfieSF+QwhM30pwle1mHVZamDo0="; + hash = "sha256-Fm2+OidrGeuWVMg3rn2zBa6hHFBQcxVqXw+cM/tU/QQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/llm-gemini/default.nix b/pkgs/development/python-modules/llm-gemini/default.nix index a0a26213c5b6..ababb314c714 100644 --- a/pkgs/development/python-modules/llm-gemini/default.nix +++ b/pkgs/development/python-modules/llm-gemini/default.nix @@ -15,14 +15,14 @@ }: buildPythonPackage rec { pname = "llm-gemini"; - version = "0.26"; + version = "0.26.1"; pyproject = true; src = fetchFromGitHub { owner = "simonw"; repo = "llm-gemini"; tag = version; - hash = "sha256-Blkes0d7pVpltP2Vj8ngFRpNYnb9Z/m6O6UByAjrdfw="; + hash = "sha256-HZUbO1R8qVc4iuRNs9ezR9dnjjAy+s8g0TTlfOCyeVc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/ruby-modules/with-packages/test.nix b/pkgs/development/ruby-modules/with-packages/test.nix index b22e2931cf12..57b3e394813d 100644 --- a/pkgs/development/ruby-modules/with-packages/test.nix +++ b/pkgs/development/ruby-modules/with-packages/test.nix @@ -5,8 +5,10 @@ let lib = pkgs.lib; stdenv = pkgs.stdenv; - rubyVersions = with pkgs; [ - ruby_3_2 + rubyVersions = [ + # TODO FIXME: All versions listed here were dropped from Nixpkgs. + # Add current versions here or remove this file if it’s no longer + # being used. ]; gemTests = (lib.mapAttrs (name: gem: [ name ]) pkgs.ruby.gems) // (import ./require_exceptions.nix); diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index 46c66031a3e4..2be1c31df515 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -16,7 +16,7 @@ }: let - version = "25.06"; + version = "25.09"; commonMeta = { description = "Various coreboot-related tools"; @@ -46,7 +46,7 @@ let src = fetchgit { url = "https://review.coreboot.org/coreboot"; rev = finalAttrs.version; - hash = "sha256-D7W8LtL6eeaKiRYoxVkcjeZ2aMIEXCvNakVtexe0mG8="; + hash = "sha256-ItQVCDC/MiF5rgecmxeR000lqTQy1VCSSILl1z4bJmM="; }; enableParallelBuilding = true; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bead703c539d..9ba7cf1ac206 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2354,6 +2354,10 @@ mapAliases { rquickshare-legacy = throw "The legacy version depends on insecure package libsoup2, please use the main version"; # Added 2025-10-09 rr-unstable = rr; # Added 2022-09-17 rtx = mise; # Added 2024-01-05 + ruby_3_1 = throw "ruby_3_1 has been removed, as it is has reached end‐of‐life upstream"; # Added 2025-10-12 + ruby_3_2 = throw "ruby_3_2 has been removed, as it will reach end‐of‐life upstream during Nixpkgs 25.11’s support cycle"; # Added 2025-10-12 + rubyPackages_3_1 = throw "rubyPackages_3_1 has been removed, as it is has reached end‐of‐life upstream"; # Added 2025-10-12 + rubyPackages_3_2 = throw "rubyPackages_3_2 has been removed, as it will reach end‐of‐life upstream during Nixpkgs 25.11’s support cycle"; # Added 2025-10-12 ruby-zoom = throw "'ruby-zoom' has been removed due to lack of maintaince and had not been updated since 2020"; # Added 2025-08-24 runCommandNoCC = runCommand; # Added 2021-08-15 runCommandNoCCLocal = runCommandLocal; # Added 2021-08-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae851d058345..72caf6f37b91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6038,8 +6038,6 @@ with pkgs; }) mkRubyVersion mkRuby - ruby_3_1 - ruby_3_2 ruby_3_3 ruby_3_4 ruby_3_5 @@ -6048,8 +6046,6 @@ with pkgs; ruby = ruby_3_3; rubyPackages = rubyPackages_3_3; - rubyPackages_3_1 = recurseIntoAttrs ruby_3_1.gems; - rubyPackages_3_2 = recurseIntoAttrs ruby_3_2.gems; rubyPackages_3_3 = recurseIntoAttrs ruby_3_3.gems; rubyPackages_3_4 = recurseIntoAttrs ruby_3_4.gems; rubyPackages_3_5 = recurseIntoAttrs ruby_3_5.gems; @@ -13285,10 +13281,6 @@ with pkgs; anki-bin = callPackage ../games/anki/bin.nix { }; anki-sync-server = callPackage ../games/anki/sync-server.nix { }; - armagetronad = callPackage ../games/armagetronad { }; - - armagetronad-dedicated = callPackage ../games/armagetronad { dedicatedServer = true; }; - art = callPackage ../by-name/ar/art/package.nix { fftw = fftwSinglePrec; }; @@ -14890,10 +14882,6 @@ with pkgs; libcpr = libcpr_1_10_5; }; - tree-from-tags = callPackage ../by-name/tr/tree-from-tags/package.nix { - ruby = ruby_3_1; - }; - biblioteca = callPackage ../by-name/bi/biblioteca/package.nix { webkitgtk = webkitgtk_6_0; }; diff --git a/pkgs/top-level/pkg-config/pkg-config-data.json b/pkgs/top-level/pkg-config/pkg-config-data.json index b8db6efa5aa5..a7a118056d37 100644 --- a/pkgs/top-level/pkg-config/pkg-config-data.json +++ b/pkgs/top-level/pkg-config/pkg-config-data.json @@ -746,11 +746,6 @@ "python3" ] }, - "ruby-3.1": { - "attrPath": [ - "ruby_3_1" - ] - }, "sdl2": { "attrPath": [ "SDL2"