diff --git a/.github/labeler.yml b/.github/labeler.yml index d4f43e31b084..adfc49ef6ee2 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -58,6 +58,8 @@ - nixos/modules/services/display-managers/cosmic-greeter.nix - nixos/tests/cosmic.nix - pkgs/by-name/co/cosmic-*/**/* + - pkgs/by-name/li/libcosmicAppHook/* + - pkgs/by-name/po/pop-launcher/* - pkgs/by-name/xd/xdg-desktop-portal-cosmic/* "6.topic: crystal": diff --git a/doc/languages-frameworks/bower.section.md b/doc/languages-frameworks/bower.section.md deleted file mode 100644 index 45728044e769..000000000000 --- a/doc/languages-frameworks/bower.section.md +++ /dev/null @@ -1,147 +0,0 @@ -# Bower {#sec-bower} - -[Bower](https://bower.io) is a package manager for web site front-end components. Bower packages (comprising of build artifacts and sometimes sources) are stored in `git` repositories, typically on Github. The package registry is run by the Bower team with package metadata coming from the `bower.json` file within each package. - -The end result of running Bower is a `bower_components` directory which can be included in the web app's build process. - -Bower can be run interactively, by installing `nodePackages.bower`. More interestingly, the Bower components can be declared in a Nix derivation, with the help of `bower2nix`. - -## bower2nix usage {#ssec-bower2nix-usage} - -Suppose you have a `bower.json` with the following contents: - -### Example bower.json {#ex-bowerJson} - -```json - "name": "my-web-app", - "dependencies": { - "angular": "~1.5.0", - "bootstrap": "~3.3.6" - } -``` - -Running `bower2nix` will produce something like the following output: - -```nix -{ fetchbower, buildEnv }: -buildEnv { - name = "bower-env"; - ignoreCollisions = true; - paths = [ - (fetchbower "angular" "1.5.3" "~1.5.0" "1749xb0firxdra4rzadm4q9x90v6pzkbd7xmcyjk6qfza09ykk9y") - (fetchbower "bootstrap" "3.3.6" "~3.3.6" "1vvqlpbfcy0k5pncfjaiskj3y6scwifxygfqnw393sjfxiviwmbv") - (fetchbower "jquery" "2.2.2" "1.9.1 - 2" "10sp5h98sqwk90y4k6hbdviwqzvzwqf47r3r51pakch5ii2y7js1") - ]; -} -``` - -Using the `bower2nix` command line arguments, the output can be redirected to a file. A name like `bower-packages.nix` would be fine. - -The resulting derivation is a union of all the downloaded Bower packages (and their dependencies). To use it, they still need to be linked together by Bower, which is where `buildBowerComponents` is useful. - -## buildBowerComponents function {#ssec-build-bower-components} - -The function is implemented in [pkgs/development/bower-modules/generic/default.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/bower-modules/generic/default.nix). - -### Example buildBowerComponents {#ex-buildBowerComponents} - -```nix -{ - bowerComponents = buildBowerComponents { - name = "my-web-app"; - generated = ./bower-packages.nix; # note 1 - src = myWebApp; # note 2 - }; -} -``` - -In ["buildBowerComponents" example](#ex-buildBowerComponents) the following arguments are of special significance to the function: - -1. `generated` specifies the file which was created by {command}`bower2nix`. -2. `src` is your project's sources. It needs to contain a {file}`bower.json` file. - -`buildBowerComponents` will run Bower to link together the output of `bower2nix`, resulting in a `bower_components` directory which can be used. - -Here is an example of a web frontend build process using `gulp`. You might use `grunt`, or anything else. - -### Example build script (gulpfile.js) {#ex-bowerGulpFile} - -```javascript -var gulp = require('gulp'); - -gulp.task('default', [], function () { - gulp.start('build'); -}); - -gulp.task('build', [], function () { - console.log("Just a dummy gulp build"); - gulp - .src(["./bower_components/**/*"]) - .pipe(gulp.dest("./gulpdist/")); -}); -``` - -### Example Full example — default.nix {#ex-buildBowerComponentsDefaultNix} - -```nix -{ - myWebApp ? { - outPath = ./.; - name = "myWebApp"; - }, - pkgs ? import { }, -}: - -pkgs.stdenv.mkDerivation { - name = "my-web-app-frontend"; - src = myWebApp; - - buildInputs = [ pkgs.nodePackages.gulp ]; - - bowerComponents = pkgs.buildBowerComponents { - # note 1 - name = "my-web-app"; - generated = ./bower-packages.nix; - src = myWebApp; - }; - - nativeBuildInputs = [ - writableTmpDirAsHomeHook # note 3 - ]; - - buildPhase = '' - runHook preBuild - - cp --reflink=auto --no-preserve=mode -R $bowerComponents/bower_components . # note 2 - ${pkgs.nodePackages.gulp}/bin/gulp build # note 4 - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mv gulpdist $out - - runHook postInstall - ''; -} -``` - -A few notes about [Full example — `default.nix`](#ex-buildBowerComponentsDefaultNix): - -1. The result of `buildBowerComponents` is an input to the frontend build. -2. Whether to symlink or copy the {file}`bower_components` directory depends on the build tool in use. - In this case, a copy is used to avoid {command}`gulp` silliness with permissions. -3. {command}`gulp` requires `HOME` to refer to a writeable directory. -4. The actual build command in this example is {command}`gulp`. Other tools could be used instead. - -## Troubleshooting {#ssec-bower2nix-troubleshooting} - -### ENOCACHE errors from buildBowerComponents {#enocache-errors-from-buildbowercomponents} - -This means that Bower was looking for a package version which doesn't exist in the generated `bower-packages.nix`. - -If `bower.json` has been updated, then run `bower2nix` again. - -It could also be a bug in `bower2nix` or `fetchbower`. If possible, try reformulating the version specification in `bower.json`. diff --git a/doc/languages-frameworks/index.md b/doc/languages-frameworks/index.md index 2624b9afc5e4..71269aa6c030 100644 --- a/doc/languages-frameworks/index.md +++ b/doc/languages-frameworks/index.md @@ -55,7 +55,6 @@ agda.section.md android.section.md astal.section.md beam.section.md -bower.section.md chicken.section.md coq.section.md cosmic.section.md diff --git a/doc/redirects.json b/doc/redirects.json index 4b5484f5b5c3..375ab08e9384 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -265,7 +265,16 @@ "release-notes.html#sec-nixpkgs-release-25.11-highlights" ], "sec-nixpkgs-release-25.11-incompatibilities": [ - "release-notes.html#sec-nixpkgs-release-25.11-incompatibilities" + "release-notes.html#sec-nixpkgs-release-25.11-incompatibilities", + "index.html#enocache-errors-from-buildbowercomponents", + "index.html#ex-bowerGulpFile", + "index.html#ex-bowerJson", + "index.html#ex-buildBowerComponents", + "index.html#ex-buildBowerComponentsDefaultNix", + "index.html#sec-bower", + "index.html#ssec-bower2nix-troubleshooting", + "index.html#ssec-bower2nix-usage", + "index.html#ssec-build-bower-components" ], "sec-nixpkgs-release-25.11-lib": [ "release-notes.html#sec-nixpkgs-release-25.11-lib" @@ -2807,33 +2816,6 @@ "elixir---phoenix-project": [ "index.html#elixir---phoenix-project" ], - "sec-bower": [ - "index.html#sec-bower" - ], - "ssec-bower2nix-usage": [ - "index.html#ssec-bower2nix-usage" - ], - "ex-bowerJson": [ - "index.html#ex-bowerJson" - ], - "ssec-build-bower-components": [ - "index.html#ssec-build-bower-components" - ], - "ex-buildBowerComponents": [ - "index.html#ex-buildBowerComponents" - ], - "ex-bowerGulpFile": [ - "index.html#ex-bowerGulpFile" - ], - "ex-buildBowerComponentsDefaultNix": [ - "index.html#ex-buildBowerComponentsDefaultNix" - ], - "ssec-bower2nix-troubleshooting": [ - "index.html#ssec-bower2nix-troubleshooting" - ], - "enocache-errors-from-buildbowercomponents": [ - "index.html#enocache-errors-from-buildbowercomponents" - ], "sec-chicken": [ "index.html#sec-chicken" ], diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index dbd3d5929b2a..1cf2a615ebd6 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -28,6 +28,8 @@ - `mono4` and `mono5` have been removed. Use `mono6` or `mono` instead. +- Everything related to `bower` was removed, as it is deprecated and not used by anything in nixpkgs. + - The `offrss` package was removed due to lack of upstream maintenance since 2012. It's recommended for users to migrate to another RSS reader - `installShellFiles`: Allow installManPage to take a piped input, add the `--name` flag for renaming the file when installed. Can also append `--` to opt-out of all subsequent parsing. diff --git a/nixos/modules/hardware/sensor/hddtemp.nix b/nixos/modules/hardware/sensor/hddtemp.nix index 4c89eac56ddf..2d7ef17f7ae9 100644 --- a/nixos/modules/hardware/sensor/hddtemp.nix +++ b/nixos/modules/hardware/sensor/hddtemp.nix @@ -9,21 +9,26 @@ let cfg = config.hardware.sensor.hddtemp; - wrapper = pkgs.writeShellScript "hddtemp-wrapper" '' + script = '' set -eEuo pipefail file=/var/lib/hddtemp/hddtemp.db - drives=(${toString (map (e: ''$(realpath ${lib.escapeShellArg e}) '') cfg.drives)}) + raw_drives="" + ${lib.concatStringsSep "\n" (map (drives: "raw_drives+=\"${drives} \"") cfg.drives)} + drives="" + for i in $raw_drives; do + drives+=" $(realpath $i)" + done cp ${pkgs.hddtemp}/share/hddtemp/hddtemp.db $file ${lib.concatMapStringsSep "\n" (e: "echo ${lib.escapeShellArg e} >> $file") cfg.dbEntries} - exec ${pkgs.hddtemp}/bin/hddtemp ${lib.escapeShellArgs cfg.extraArgs} \ + ${pkgs.hddtemp}/bin/hddtemp ${lib.escapeShellArgs cfg.extraArgs} \ --daemon \ --unit=${cfg.unit} \ --file=$file \ - ''${drives[@]} + $drives ''; in @@ -77,9 +82,9 @@ in description = "HDD/SSD temperature"; documentation = [ "man:hddtemp(8)" ]; wantedBy = [ "multi-user.target" ]; + inherit script; serviceConfig = { Type = "forking"; - ExecStart = wrapper; StateDirectory = "hddtemp"; PrivateTmp = true; ProtectHome = "tmpfs"; diff --git a/nixos/modules/services/hardware/hddfancontrol.nix b/nixos/modules/services/hardware/hddfancontrol.nix index a1e36012893d..999fb3cc5317 100644 --- a/nixos/modules/services/hardware/hddfancontrol.nix +++ b/nixos/modules/services/hardware/hddfancontrol.nix @@ -52,21 +52,30 @@ in { options = { disks = lib.mkOption { - type = lib.types.listOf lib.types.path; + type = lib.types.listOf lib.types.str; default = [ ]; description = '' Drive(s) to get temperature from + + Can also use command substitution to automatically grab all matching drives; such as all scsi (sas) drives ''; - example = [ "/dev/sda" ]; + example = [ + "/dev/sda" + "`find /dev/disk/by-id -name \"scsi*\" -and -not -name \"*-part*\" -printf \"%p \"`" + ]; }; pwmPaths = lib.mkOption { - type = lib.types.listOf lib.types.path; + type = lib.types.listOf lib.types.str; default = [ ]; description = '' PWM filepath(s) to control fan speed (under /sys), followed by initial and fan-stop PWM values + Can also use command substitution to ensure the correct hwmonX is selected on every boot ''; - example = [ "/sys/class/hwmon/hwmon2/pwm1:30:10" ]; + example = [ + "/sys/class/hwmon/hwmon2/pwm1:30:10" + "`echo /sys/devices/platform/nct6775.656/hwmon/hwmon[[:print:]]`/pwm4:80:20" + ]; }; logVerbosity = lib.mkOption { @@ -151,9 +160,12 @@ in documentation = [ "man:hddfancontrol(1)" ]; after = [ "hddtemp.service" ]; wants = [ "hddtemp.service" ]; + script = + let + argString = lib.strings.concatStringsSep " " (args cnf); + in + "${lib.getExe pkgs.hddfancontrol} -v ${cnf.logVerbosity} daemon ${argString}"; serviceConfig = { - ExecStart = "${lib.getExe pkgs.hddfancontrol} -v ${cnf.logVerbosity} daemon ${lib.escapeShellArgs (args cnf)}"; - CPUSchedulingPolicy = "rr"; CPUSchedulingPriority = 49; diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 5771c766d285..30d0278f45e7 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -357,7 +357,6 @@ in "d '${cfg.stateDir}/themes' 0750 ${cfg.user} ${cfg.group} - -" "d '${cfg.stateDir}/tmp' 0750 ${cfg.user} ${cfg.group} - -" - "d /run/redmine - - - - -" "d /run/redmine/public - - - - -" "L+ /run/redmine/config - - - - ${cfg.stateDir}/config" "L+ /run/redmine/files - - - - ${cfg.stateDir}/files" @@ -456,6 +455,8 @@ in TimeoutSec = "300"; WorkingDirectory = "${cfg.package}/share/redmine"; ExecStart = "${bundle} exec rails server -u webrick -e production -b ${toString cfg.address} -p ${toString cfg.port} -P '${cfg.stateDir}/redmine.pid'"; + RuntimeDirectory = "redmine"; + RuntimeDirectoryMode = "0750"; AmbientCapabilities = ""; CapabilityBoundingSet = ""; LockPersonality = true; @@ -473,7 +474,10 @@ in ProtectKernelModules = true; ProtectKernelTunables = true; ProtectProc = "noaccess"; - ProtectSystem = "full"; + ProtectSystem = "strict"; + ReadWritePaths = [ + cfg.stateDir + ]; RemoveIPC = true; RestrictAddressFamilies = [ "AF_UNIX" diff --git a/nixos/tests/redmine.nix b/nixos/tests/redmine.nix index 1a002abfbfff..dd1af128b386 100644 --- a/nixos/tests/redmine.nix +++ b/nixos/tests/redmine.nix @@ -19,18 +19,6 @@ let enable = true; package = pkgs.redmine; database.type = type; - plugins = { - redmine_env_auth = pkgs.fetchurl { - url = "https://github.com/Intera/redmine_env_auth/archive/0.7.zip"; - sha256 = "1xb8lyarc7mpi86yflnlgyllh9hfwb9z304f19dx409gqpia99sc"; - }; - }; - themes = { - dkuk-redmine_alex_skin = pkgs.fetchurl { - url = "https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip"; - sha256 = "0hrin9lzyi50k4w2bd2b30vrf1i4fi1c0gyas5801wn8i7kpm9yl"; - }; - }; }; }; diff --git a/pkgs/build-support/fetchbower/default.nix b/pkgs/build-support/fetchbower/default.nix deleted file mode 100644 index 258a09189d99..000000000000 --- a/pkgs/build-support/fetchbower/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - stdenvNoCC, - lib, - bower2nix, - cacert, -}: -let - bowerVersion = - version: - let - components = lib.splitString "#" version; - hash = lib.last components; - ver = if builtins.length components == 1 then (cleanName version) else hash; - in - ver; - - cleanName = name: lib.replaceStrings [ "/" ":" ] [ "-" "-" ] name; - - fetchbower = - name: version: target: outputHash: - stdenvNoCC.mkDerivation { - name = "${cleanName name}-${bowerVersion version}"; - buildCommand = '' - fetch-bower --quiet --out=$PWD/out "${name}" "${target}" "${version}" - # In some cases, the result of fetchBower is different depending - # on the output directory (e.g. if the bower package contains - # symlinks). So use a local output directory before copying to - # $out. - cp -R out $out - ''; - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - inherit outputHash; - nativeBuildInputs = [ - bower2nix - cacert - ]; - }; - -in -fetchbower diff --git a/pkgs/by-name/an/ansible-doctor/package.nix b/pkgs/by-name/an/ansible-doctor/package.nix index 570e1a04b0ba..aacfad5371b2 100644 --- a/pkgs/by-name/an/ansible-doctor/package.nix +++ b/pkgs/by-name/an/ansible-doctor/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "ansible-doctor"; - version = "7.2.0"; + version = "7.2.1"; pyproject = true; src = fetchFromGitHub { owner = "thegeeklab"; repo = "ansible-doctor"; tag = "v${version}"; - hash = "sha256-7SGnbcaufKWBDq5Na+s+X8RGRskl1Q1bh0xelT/IQXU="; + hash = "sha256-2cJ1wV3hqoqSvLq3c7/J5nh1GTTcj9sexRhX3hfPoTc="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/be/benthos/package.nix b/pkgs/by-name/be/benthos/package.nix index d8fe088eff66..3ad7b9e939d0 100644 --- a/pkgs/by-name/be/benthos/package.nix +++ b/pkgs/by-name/be/benthos/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "benthos"; - version = "4.55.0"; + version = "4.56.0"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "benthos"; tag = "v${version}"; - hash = "sha256-i6PDTgiDEZJAobNvDxRwggIfBMsZ7gZsn6ruthVn37w="; + hash = "sha256-TayHN6Vsp1mkDNqa6mc5HWGPIfyeJQdzOGBnE6SioZ0="; }; proxyVendor = true; diff --git a/pkgs/by-name/bo/bower2nix/package.nix b/pkgs/by-name/bo/bower2nix/package.nix deleted file mode 100644 index c0db35461b57..000000000000 --- a/pkgs/by-name/bo/bower2nix/package.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - buildNpmPackage, - fetchFromGitHub, - git, - lib, - nix, - unstableGitUpdater, -}: - -buildNpmPackage rec { - pname = "bower2nix"; - version = "3.2.0-unstable-2024-06-25"; - - src = fetchFromGitHub { - owner = "rvl"; - repo = "bower2nix"; - rev = "b5da44f055c7561ed7a46226b3be0070e07d80e6"; - hash = "sha256-da+m2UWQ83tW1o0P1qvw35KpsXL/BDTeShg4KxL+7Ck="; - }; - - npmDepsHash = "sha256-TK1sqF2J/hQuP3bgGA4MolLA7LWWuYNnqf4gDyU154k="; - - npmBuildScript = "prepare"; - - makeWrapperArgs = [ - "--prefix PATH : ${ - lib.makeBinPath [ - git - nix - ] - }" - ]; - - passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; }; - - meta = { - changelog = "https://github.com/rvl/bower2nix/releases/tag/v${version}"; - description = "Generate nix expressions to fetch bower dependencies"; - homepage = "https://github.com/rvl/bower2nix"; - license = lib.licenses.gpl3Only; - mainProgram = "bower2nix"; - maintainers = [ ]; - }; -} diff --git a/pkgs/by-name/ca/catppuccin-sddm/package.nix b/pkgs/by-name/ca/catppuccin-sddm/package.nix index 132dd25c84bf..88a7152552ea 100644 --- a/pkgs/by-name/ca/catppuccin-sddm/package.nix +++ b/pkgs/by-name/ca/catppuccin-sddm/package.nix @@ -11,6 +11,7 @@ font ? "Noto Sans", fontSize ? "9", background ? null, + disableBackground ? false, loginBackground ? false, userIcon ? false, clockEnabled ? true, @@ -64,8 +65,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { ${lib.optionalString (background != null) '' substituteInPlace $configFile \ - --replace-fail 'Background="backgrounds/wall.png"' 'Background="${background}"' \ - --replace-fail 'CustomBackground="false"' 'CustomBackground="true"' + --replace-fail 'Background="backgrounds/wall.png"' 'Background="${background}"' + ''} + + ${lib.optionalString disableBackground '' + substituteInPlace $configFile \ + --replace-fail 'CustomBackground="true"' 'CustomBackground="false"' ''} ${lib.optionalString loginBackground '' diff --git a/pkgs/by-name/cl/cljfmt/package.nix b/pkgs/by-name/cl/cljfmt/package.nix index ccc7cac8f6b8..a1cbf19d55bc 100644 --- a/pkgs/by-name/cl/cljfmt/package.nix +++ b/pkgs/by-name/cl/cljfmt/package.nix @@ -8,11 +8,11 @@ buildGraalvmNativeImage (finalAttrs: { pname = "cljfmt"; - version = "0.13.1"; + version = "0.13.4"; src = fetchurl { url = "https://github.com/weavejester/cljfmt/releases/download/${finalAttrs.version}/cljfmt-${finalAttrs.version}-standalone.jar"; - hash = "sha256-Dj1g6hMzRhqm0pJggODVFgEkayB2Wdh3d0z6RglHbgY="; + hash = "sha256-i6ZUhN7gwADw0tZFPOjiGpC/po8us5QSAJAW7n3LgIU="; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/by-name/da/davinci-resolve/package.nix b/pkgs/by-name/da/davinci-resolve/package.nix index 2f0f8029c161..1929c022a5f9 100644 --- a/pkgs/by-name/da/davinci-resolve/package.nix +++ b/pkgs/by-name/da/davinci-resolve/package.nix @@ -150,7 +150,7 @@ let test -e ${lib.escapeShellArg appimageName} appimage-run ${lib.escapeShellArg appimageName} -i -y -n -C $out - mkdir -p $out/{configs,DolbyVision,easyDCP,Fairlight,GPUCache,logs,Media,"Resolve Disk Database",.crashreport,.license,.LUT} + mkdir -p $out/{configs,DolbyVision,easyDCP,Fairlight,GPUCache,logs,Media,"Resolve Disk Database",.crashreport,.license,.LUT,Extras} runHook postInstall ''; @@ -186,6 +186,7 @@ let "Video" "Graphics" ]; + startupWMClass = "resolve"; }) ]; } @@ -248,10 +249,12 @@ buildFHSEnv { extraPreBwrapCmds = lib.optionalString studioVariant '' mkdir -p ~/.local/share/DaVinciResolve/license || exit 1 + mkdir -p ~/.local/share/DaVinciResolve/Extras || exit 1 ''; extraBwrapArgs = lib.optionals studioVariant [ - "--bind \"$HOME\"/.local/share/DaVinciResolve/license ${davinci}/.license" + ''--bind "$HOME"/.local/share/DaVinciResolve/license ${davinci}/.license'' + ''--bind "$HOME"/.local/share/DaVinciResolve/Extras ${davinci}/Extras'' ]; runScript = "${bash}/bin/bash ${writeText "davinci-wrapper" '' diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix index 10b3970ee94d..164b69372ccc 100644 --- a/pkgs/by-name/di/diesel-cli/package.nix +++ b/pkgs/by-name/di/diesel-cli/package.nix @@ -27,15 +27,15 @@ assert lib.assertMsg (lib.elem true [ rustPlatform.buildRustPackage rec { pname = "diesel-cli"; - version = "2.3.0"; + version = "2.3.2"; src = fetchCrate { inherit version; crateName = "diesel_cli"; - hash = "sha256-s/RJ83TuW42MIYgKXq5tlqJ73u0aucuXrR8bFArqT5A="; + hash = "sha256-JNDFXBNmwCWpk+Lub453wS+7lVMZcdiJBmPoVAedpug="; }; - cargoHash = "sha256-XmWrXLOYm7y7+0mqT0WSmT6LhHAPA9UbGODlluBKyZw="; + cargoHash = "sha256-qfXa6DuuhKbXCdOvhuPNx6xlDIouoDVJUMob9Fc5XgI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/fi/fig2dev/package.nix b/pkgs/by-name/fi/fig2dev/package.nix index d3ae31a4b04b..8ba60bd67ff9 100644 --- a/pkgs/by-name/fi/fig2dev/package.nix +++ b/pkgs/by-name/fi/fig2dev/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchurl, ghostscript, libpng, @@ -24,6 +25,14 @@ stdenv.mkDerivation rec { patches = [ ./CVE-2025-31162.patch ./CVE-2025-31163.patch + + # Fix build with gcc15 + # https://sourceforge.net/p/mcj/fig2dev/ci/ab4eee3cf0d0c1d861d64b9569a5d1497800cae2 + (fetchpatch { + name = "fig2dev-prototypes.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/fig2dev/files/fig2dev-3.2.9a-prototypes.patch?id=93644497325b6df7a17f8bd05ad0495607aa5c34"; + hash = "sha256-F6z0m3Ez9JpgZg+TjVjuIZhAyTMHodB7O/l8lDTOL54="; + }) ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/fl/flint/checkPhase.patch b/pkgs/by-name/fl/flint/checkPhase.patch new file mode 100644 index 000000000000..19de1b1f1e20 --- /dev/null +++ b/pkgs/by-name/fl/flint/checkPhase.patch @@ -0,0 +1,26 @@ +https://github.com/flintlib/flint/pull/2411 + +From 9957b17e6b08bd57790f7da1344b4d92eefc0b38 Mon Sep 17 00:00:00 2001 +From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> +Date: Sun, 21 Sep 2025 15:58:57 -0400 +Subject: [PATCH] Fix duplicate symbols linker error + +When I run `make check` I get linker errors without +this patch +--- + src/double_interval.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/double_interval.h b/src/double_interval.h +index a423257db2..5f685c283f 100644 +--- a/src/double_interval.h ++++ b/src/double_interval.h +@@ -13,7 +13,7 @@ + #define DOUBLE_INTERVAL_H + + #ifdef DOUBLE_INTERVAL_INLINES_C +-#define DOUBLE_INTERVAL_INLINE ++#define DOUBLE_INTERVAL_INLINE static + #else + #define DOUBLE_INTERVAL_INLINE static inline + #endif diff --git a/pkgs/development/libraries/flint/3.nix b/pkgs/by-name/fl/flint/package.nix similarity index 64% rename from pkgs/development/libraries/flint/3.nix rename to pkgs/by-name/fl/flint/package.nix index 3546022dc4f5..a49d3165cf54 100644 --- a/pkgs/development/libraries/flint/3.nix +++ b/pkgs/by-name/fl/flint/package.nix @@ -2,34 +2,45 @@ lib, stdenv, fetchurl, - gmp, - mpfr, - ntl, + fetchpatch, windows, autoconf, automake, gettext, libtool, - openblas ? null, + gmp, + mpfr, + ntl, blas, lapack, + boehmgc, + openblas ? null, withBlas ? true, withNtl ? !ntl.meta.broken, + withGc ? false, }: assert withBlas -> openblas != null && blas.implementation == "openblas" && lapack.implementation == "openblas"; -stdenv.mkDerivation rec { - pname = "flint3"; +stdenv.mkDerivation (finalAttrs: { + pname = "flint"; version = "3.3.1"; src = fetchurl { - url = "https://flintlib.org/download/flint-${version}.tar.gz"; + url = "https://flintlib.org/download/flint-${finalAttrs.version}.tar.gz"; hash = "sha256-ZNcOUTB2z6lx4EELWMHaXTURKRPppWtE4saBtFnT6vs="; }; + patches = [ + # Remove once/if https://github.com/flintlib/flint/pull/2411 is merged + # Required or else during the check phase the build fails while + # linking a test due to duplicate symbol errors + ./checkPhase.patch + ]; + + strictDeps = true; nativeBuildInputs = [ autoconf automake @@ -50,6 +61,9 @@ stdenv.mkDerivation rec { ++ lib.optionals withNtl [ ntl ] + ++ lib.optionals withGc [ + boehmgc + ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ windows.pthreads ]; @@ -70,19 +84,22 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withNtl [ "--with-ntl=${ntl}" + ] + ++ lib.optionals withGc [ + "--with-gc=${boehmgc}" ]; enableParallelBuilding = true; - + enableParallelChecking = true; doCheck = true; - meta = with lib; { + meta = { description = "Fast Library for Number Theory"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ smasher164 ]; - teams = [ teams.sage ]; - platforms = platforms.all; + license = lib.licenses.lgpl3Plus; + maintainers = [ lib.maintainers.smasher164 ]; + teams = [ lib.teams.sage ]; + platforms = lib.platforms.all; homepage = "https://www.flintlib.org/"; downloadPage = "https://www.flintlib.org/downloads.html"; }; -} +}) diff --git a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix index 55374be39f3c..d6383e9ef221 100644 --- a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix +++ b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix @@ -9,16 +9,16 @@ }: buildGoModule (finalAttrs: { pname = "fluxcd-operator-mcp"; - version = "0.27.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "controlplaneio-fluxcd"; repo = "fluxcd-operator"; tag = "v${finalAttrs.version}"; - hash = "sha256-haqRBK3ctQvx2VaG2PSSFnhodO5UsBv/iv4SYmO6ijQ="; + hash = "sha256-yV8aGmY2mUAu0urIi7d1pIjhJasRX17hpmvFEQm4YpY="; }; - vendorHash = "sha256-w7WEckmoajsR4sKCrheq34T0XC2ubnZhz6cVQmzHzN0="; + vendorHash = "sha256-zCzMNlpBBUS2P2aywFDUp/RSl+HlfQe+L8a1+vVYbgY="; ldflags = [ "-s" diff --git a/pkgs/by-name/gc/gcs/package.nix b/pkgs/by-name/gc/gcs/package.nix index 105ccf4bd061..b08444957347 100644 --- a/pkgs/by-name/gc/gcs/package.nix +++ b/pkgs/by-name/gc/gcs/package.nix @@ -19,13 +19,13 @@ buildGoModule rec { pname = "gcs"; - version = "5.37.1"; + version = "5.39.0"; src = fetchFromGitHub { owner = "richardwilkes"; repo = "gcs"; tag = "v${version}"; - hash = "sha256-VHysS1/LxtVIJvnlw1joFPc+8uS525VK+FpmKoSikp0="; + hash = "sha256-R0IFIGDSpKxNmcDUMVdtKV+M3I8tglBhyHj5XXe2rjg="; }; modPostBuild = '' @@ -33,7 +33,7 @@ buildGoModule rec { sed -i 's|-lmupdf[^ ]* |-lmupdf |g' vendor/github.com/richardwilkes/pdf/pdf.go ''; - vendorHash = "sha256-T6Omz/jsk0raGM8p+G2wlMWRHzpo2qcTOtCddQoa83w="; + vendorHash = "sha256-llbBYO1dNPm+k8WEfao6qyDtQZbcmueNwFBuIpaMvFQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ge/gemini-cli-bin/package.nix b/pkgs/by-name/ge/gemini-cli-bin/package.nix index 4e4a86d68623..0925a0a919b0 100644 --- a/pkgs/by-name/ge/gemini-cli-bin/package.nix +++ b/pkgs/by-name/ge/gemini-cli-bin/package.nix @@ -3,25 +3,22 @@ stdenvNoCC, fetchurl, nodejs, - gitUpdater, + writableTmpDirAsHomeHook, + nix-update-script, }: -let - owner = "google-gemini"; - repo = "gemini-cli"; - asset = "gemini.js"; -in stdenvNoCC.mkDerivation (finalAttrs: { pname = "gemini-cli-bin"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { - url = "https://github.com/${owner}/${repo}/releases/download/v${finalAttrs.version}/${asset}"; - hash = "sha256-jmZvL4Rst3238H2BdZ/bQuddFkFcFLRABJ1wTHm8qPM="; + url = "https://github.com/google-gemini/gemini-cli/releases/download/v${finalAttrs.version}/gemini.js"; + hash = "sha256-gTd+uw5geR7W87BOiE6YmDDJ4AiFlYxbuLE2GWgg0kw="; }; phases = [ "installPhase" "fixupPhase" + "installCheckPhase" ]; strictDeps = true; @@ -36,11 +33,23 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.updateScript = [ - ./update-asset.sh - "${owner}/${repo}" - "${asset}" + doInstallCheck = true; + nativeInstallCheckInputs = [ + writableTmpDirAsHomeHook ]; + # versionCheckHook cannot be used because the reported version might be incorrect (e.g., 0.6.1 returns 0.6.0). + installCheckPhase = '' + runHook preInstallCheck + + "$out/bin/gemini" -v + + runHook postInstallCheck + ''; + + passthru.updateScript = nix-update-script { + # Ignore `preview` and `nightly` tags + extraArgs = [ "--version-regex=^v([0-9.]+)$" ]; + }; meta = { description = "AI agent that brings the power of Gemini directly into your terminal"; diff --git a/pkgs/by-name/ge/gemini-cli-bin/update-asset.sh b/pkgs/by-name/ge/gemini-cli-bin/update-asset.sh deleted file mode 100755 index 1fce69948530..000000000000 --- a/pkgs/by-name/ge/gemini-cli-bin/update-asset.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p gnugrep curl jq gnused - -set -euo pipefail - -cd "$(dirname "${BASH_SOURCE[0]}")" - -NIX_FILE="package.nix" - -GITHUB_REPO="$1" -ASSET_NAME="$2" -REV_PREFIX="${3:-v}" - -CURRENT_VER="$(grep -oP 'version = "\K[^"]+' "${NIX_FILE}")" -CURRENT_HASH="$(grep -oP 'hash = "\K[^"]+' "${NIX_FILE}")" - -JQ_FILTER='[.[] | select((.tag_name | test("preview|nightly")) | not)] | - first | .tag_name, (.assets[] | select(.name == $asset_name) | .digest)' - -{ - read -r LATEST_VER - read -r ASSET_DIGEST -} < <( - curl --fail -s ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} \ - "https://api.github.com/repos/${GITHUB_REPO}/releases" | - jq -r --arg asset_name "${ASSET_NAME}" "${JQ_FILTER}" -) - -LATEST_VER="${LATEST_VER#"${REV_PREFIX}"}" - -if [[ "${LATEST_VER}" == "${CURRENT_VER}" ]]; then - echo "Up to date." - exit 0 -fi - -LATEST_HASH="$(nix-hash --to-sri "${ASSET_DIGEST}")" - -sed -i "s#hash = \"${CURRENT_HASH}\";#hash = \"${LATEST_HASH}\";#g" "${NIX_FILE}" -sed -i "s#version = \"${CURRENT_VER}\";#version = \"${LATEST_VER}\";#g" "${NIX_FILE}" - -echo "Successfully updated from ${CURRENT_VER} to version ${LATEST_VER}." diff --git a/pkgs/by-name/gi/gixy/package.nix b/pkgs/by-name/gi/gixy/package.nix index 8ae3ab0d7c29..aa5daa25a642 100644 --- a/pkgs/by-name/gi/gixy/package.nix +++ b/pkgs/by-name/gi/gixy/package.nix @@ -25,7 +25,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "gixy"; - version = "0.1.20"; + version = "0.1.21"; pyproject = true; # fetching from GitHub because the PyPi source is missing the tests @@ -33,7 +33,7 @@ python.pkgs.buildPythonApplication rec { owner = "yandex"; repo = "gixy"; rev = "v${version}"; - sha256 = "14arz3fjidb8z37m08xcpih1391varj8s0v3gri79z3qb4zq5k6b"; + sha256 = "sha256-Ak2UTP0gDKoac/rR2h1XCUKld1b41O466ogZNQ1yQN0="; }; patches = [ diff --git a/pkgs/by-name/go/gotenberg/package.nix b/pkgs/by-name/go/gotenberg/package.nix index 68e4a0c812e1..93aa5d94a471 100644 --- a/pkgs/by-name/go/gotenberg/package.nix +++ b/pkgs/by-name/go/gotenberg/package.nix @@ -24,7 +24,7 @@ let in buildGo125Module rec { pname = "gotenberg"; - version = "8.23.0"; + version = "8.23.1"; outputs = [ "out" @@ -35,10 +35,10 @@ buildGo125Module rec { owner = "gotenberg"; repo = "gotenberg"; tag = "v${version}"; - hash = "sha256-sZALMMnOmewhhukPoW6sIw80uPHu+rAZmgYdlZdVH7A="; + hash = "sha256-rhpeQf1c/XzVEzWuRHryLWSRyL3Ruc3xaYOd5n/hRKc="; }; - vendorHash = "sha256-fAAaX8E4di6ppU8osLPs6wnAe+e6ogOwp6dQAr42Mes="; + vendorHash = "sha256-ZCRA4P4z/fb8zXGIFfLtGwo9ff9tdgdMeYbBnMvYgEU="; postPatch = '' find ./pkg -name '*_test.go' -exec sed -i -e 's#/tests#${src}#g' {} \; diff --git a/pkgs/by-name/gp/gpxsee/package.nix b/pkgs/by-name/gp/gpxsee/package.nix index 3e414f88eadb..65a1dfac6bf4 100644 --- a/pkgs/by-name/gp/gpxsee/package.nix +++ b/pkgs/by-name/gp/gpxsee/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.47"; + version = "13.48"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; tag = finalAttrs.version; - hash = "sha256-1waE0A70MsUaGttaxHcOO2aaeRdZ9ihc7ZeqJ+azH/0="; + hash = "sha256-3MkZpTrm8WVgv9k59XqwfhR1SDxNGDaD0TFBWeH4wQY="; }; buildInputs = [ diff --git a/pkgs/by-name/js/jsonwatch/package.nix b/pkgs/by-name/js/jsonwatch/package.nix index ad145abefba0..bfdf357ecab8 100644 --- a/pkgs/by-name/js/jsonwatch/package.nix +++ b/pkgs/by-name/js/jsonwatch/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "jsonwatch"; - version = "0.9.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "dbohdan"; repo = "jsonwatch"; tag = "v${version}"; - hash = "sha256-HSyavdH3zhzEvk5qW5fiv8wqmgYsLUyx6Q6oEIOk5to="; + hash = "sha256-qhVqAhUAbLb5wHnLNHr6BxffyH1G5B09eOJQoqSzWEk="; }; - cargoHash = "sha256-2CtB8TEn0bieT0S2w3cm4nLZWdFcIymvWSOnWDTXEJc="; + cargoHash = "sha256-D29pmt97DYfpYa9EwK+IlggR3zQFGzOy/Ky01UGI3tg="; meta = with lib; { description = "Like watch -d but for JSON"; diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix index f1fede42a821..6bcd1f2badba 100644 --- a/pkgs/by-name/ju/just/package.nix +++ b/pkgs/by-name/ju/just/package.nix @@ -16,10 +16,12 @@ # run the compiled `generate-book` utility to prepare the files for mdbook withDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, }: - -rustPlatform.buildRustPackage rec { +let + version = "1.43.0"; +in +rustPlatform.buildRustPackage { + inherit version; pname = "just"; - version = "1.42.4"; outputs = [ "out" ] @@ -32,10 +34,10 @@ rustPlatform.buildRustPackage rec { owner = "casey"; repo = "just"; tag = version; - hash = "sha256-MLGtHMNCyhYq9OTquCc9zKmear1ts5vNAvlLxNQaOqk="; + hash = "sha256-148bubjJYbmqugOd8crWXLqxigWfd3VVnsL0/WB2FYM="; }; - cargoHash = "sha256-udNHlPEwTb5S1ZypIqng7JLZ6Yl1vbYwASn+DT2SOLY="; + cargoHash = "sha256-3DIpEPStOh/PcjoJ5dWpfSgRNMTCmN+wO2VzeNtikFU="; nativeBuildInputs = lib.optionals (installShellCompletions || installManPages) [ installShellFiles ] diff --git a/pkgs/by-name/la/lazyjournal/package.nix b/pkgs/by-name/la/lazyjournal/package.nix index 9ca1d946919e..93389946a374 100644 --- a/pkgs/by-name/la/lazyjournal/package.nix +++ b/pkgs/by-name/la/lazyjournal/package.nix @@ -5,7 +5,7 @@ nix-update-script, }: let - version = "0.8.0"; + version = "0.8.1"; in buildGoModule { pname = "lazyjournal"; @@ -15,7 +15,7 @@ buildGoModule { owner = "Lifailon"; repo = "lazyjournal"; tag = version; - hash = "sha256-dQKd7u4IGQWw8ExoHLd5qRenE07UQz69GNqGIAWN7ok="; + hash = "sha256-QHVwEesJZiySwEPeDZaU56uY+PJEJXCybvAezhwa59g="; }; vendorHash = "sha256-Wl8DmEBt1YtTk9QEvWybSWRQm0Lnfd5q3C/wg+gP33g="; diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 6fdf642fbdf3..b1a82164129d 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -177,7 +177,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { doCheck = false; passthru = { - tests = { + tests = lib.optionalAttrs stdenv.hostPlatform.isDarwin { metal = llama-cpp.override { metalSupport = true; }; }; updateScript = nix-update-script { diff --git a/pkgs/by-name/me/mediagoblin/bower-packages.nix b/pkgs/by-name/me/mediagoblin/bower-packages.nix deleted file mode 100644 index 279a437a10ab..000000000000 --- a/pkgs/by-name/me/mediagoblin/bower-packages.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ fetchbower, buildEnv }: -buildEnv { - name = "bower-env"; - ignoreCollisions = true; - paths = [ - (fetchbower "jquery" "2.1.4" "~2.1.3" "1ywrpk2xsr6ghkm3j9gfnl9r3jn6xarfamp99b0bcm57kq9fm2k0") - (fetchbower "video.js" "5.20.5" "~5.20.1" "1agvvid2valba7xxypknbb3k578jz8sa4rsmq5z2yc5010k3nkqp") - (fetchbower "videojs-resolution-switcher" "0.4.2" "~0.4.2" - "1bz2q1wwdglaxbb20fin9djgs1c71jywxhlrm16hm4bzg708ycaf" - ) - (fetchbower "leaflet" "0.7.7" "~0.7.3" "0jim285bljmxxngpm3yx6bnnd10n2whwkgmmhzpcd1rdksnr5nca") - ]; -} diff --git a/pkgs/by-name/me/mediagoblin/package.nix b/pkgs/by-name/me/mediagoblin/package.nix index 439a73563959..2add18b3d539 100644 --- a/pkgs/by-name/me/mediagoblin/package.nix +++ b/pkgs/by-name/me/mediagoblin/package.nix @@ -1,7 +1,8 @@ { lib, - buildBowerComponents, + buildNpmPackage, fetchFromSourcehut, + fetchpatch, gobject-introspection, gst_all_1, poppler-utils, @@ -34,16 +35,32 @@ let hash = "sha256-Y1VnXLHEl6TR8nt+vKSfoCwleQ+oA2WPMN9q4fW9R3s="; }; - extlib = buildBowerComponents { + patches = [ + (fetchpatch { + url = "https://git.sr.ht/~mediagoblin/mediagoblin/commit/95a591bb2ffdeed059b926059155fd0802e6b1e6.patch"; + excludes = [ "docs/source/siteadmin/relnotes.rst" ]; + hash = "sha256-Coff02bewl6E9bHeMy/6tA2dngKcw/c33xk9nmMl/Bk="; + }) + ]; + + extlib = buildNpmPackage { name = "mediagoblin-extlib"; - generated = ./bower-packages.nix; - inherit src; + inherit src patches; + + npmDepsHash = "sha256-wtk5MgsWEpuz3V/EcozEAMOa8UeCgdjhR5wxaiaMugY="; + + dontNpmBuild = true; + + installPhase = '' + mkdir -p $out/node_modules/ + cp -r node_modules/{jquery,video.js,videojs-resolution-switcher,leaflet} $out/node_modules/ + ''; }; in python.pkgs.buildPythonApplication rec { format = "setuptools"; pname = "mediagoblin"; - inherit version src; + inherit version src patches; postPatch = '' # https://git.sr.ht/~mediagoblin/mediagoblin/tree/bf61d38df21748aadb480c53fdd928647285e35f/item/.guix/modules/mediagoblin-package.scm#L60-62 @@ -128,7 +145,7 @@ python.pkgs.buildPythonApplication rec { ''; postInstall = '' - lndir -silent ${extlib}/bower_components/ $out/${python.sitePackages}/mediagoblin/static/extlib/ + lndir -silent ${extlib}/node_modules $out/${python.sitePackages}/mediagoblin/static/extlib/ ln -rs $out/${python.sitePackages}/mediagoblin/static/extlib/jquery/dist/jquery.js $out/${python.sitePackages}/mediagoblin/static/js/extlib/jquery.js ln -rs $out/${python.sitePackages}/mediagoblin/static/extlib/leaflet/dist/leaflet.css $out/${python.sitePackages}/mediagoblin/static/extlib/leaflet/leaflet.css @@ -151,7 +168,7 @@ python.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "mediagoblin" ]; passthru = { - inherit python; + inherit extlib python; }; meta = { diff --git a/pkgs/by-name/ms/msolve/package.nix b/pkgs/by-name/ms/msolve/package.nix index 652d1c152409..e8d9d2f52ce4 100644 --- a/pkgs/by-name/ms/msolve/package.nix +++ b/pkgs/by-name/ms/msolve/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, autoreconfHook, - flint3, + flint, gmp, mpfr, llvmPackages, @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - flint3 + flint gmp mpfr ] diff --git a/pkgs/by-name/no/normaliz/package.nix b/pkgs/by-name/no/normaliz/package.nix index 5d0d2e6db329..66e5671f83c5 100644 --- a/pkgs/by-name/no/normaliz/package.nix +++ b/pkgs/by-name/no/normaliz/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, autoreconfHook, gmpxx, - flint3, + flint, nauty, }: @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gmpxx - flint3 + flint nauty ]; diff --git a/pkgs/by-name/nt/ntl/package.nix b/pkgs/by-name/nt/ntl/package.nix index 41a6191654d9..f52ac96c7fba 100644 --- a/pkgs/by-name/nt/ntl/package.nix +++ b/pkgs/by-name/nt/ntl/package.nix @@ -13,24 +13,24 @@ assert withGf2x -> gf2x != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ntl"; version = "11.5.1"; src = fetchurl { - url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz"; - sha256 = "sha256-IQ0GwxMGy8bq9oFEU8Vsd22djo3zbXTrMG9qUj0caoo="; + url = "http://www.shoup.net/ntl/ntl-${finalAttrs.version}.tar.gz"; + hash = "sha256-IQ0GwxMGy8bq9oFEU8Vsd22djo3zbXTrMG9qUj0caoo="; }; + strictDeps = true; + depsBuildBuild = [ + perl # needed for ./configure + ]; buildInputs = [ gmp ]; - nativeBuildInputs = [ - perl # needed for ./configure - ]; - - sourceRoot = "${pname}-${version}/src"; + sourceRoot = "ntl-${finalAttrs.version}/src"; enableParallelBuilding = true; @@ -42,9 +42,9 @@ stdenv.mkDerivation rec { configurePlatforms = [ ]; # reference: http://shoup.net/ntl/doc/tour-unix.html + dontAddStaticConfigureFlags = true; # perl config doesn't understand it. configureFlags = [ "DEF_PREFIX=$(out)" - "SHARED=on" # genereate a shared library (as well as static) "NATIVE=off" # don't target code to current hardware (reproducibility, portability) "TUNE=${ if tune then @@ -55,15 +55,20 @@ stdenv.mkDerivation rec { "generic" # "chooses options that should be OK for most platforms" }" "CXX=${stdenv.cc.targetPrefix}c++" + "AR=${stdenv.cc.targetPrefix}ar" + ] + ++ lib.optionals (!stdenv.hostPlatform.isStatic) [ + "SHARED=on" # genereate a shared library ] ++ lib.optionals withGf2x [ "NTL_GF2X_LIB=on" "GF2X_PREFIX=${gf2x}" ]; + enableParallelChecking = true; doCheck = true; # takes some time - meta = with lib; { + meta = { description = "Library for doing Number Theory"; longDescription = '' NTL is a high-performance, portable C++ library providing data @@ -76,11 +81,11 @@ stdenv.mkDerivation rec { homepage = "http://www.shoup.net/ntl/"; # also locally at "${src}/doc/tour-changes.html"; changelog = "https://www.shoup.net/ntl/doc/tour-changes.html"; - teams = [ teams.sage ]; - license = licenses.gpl2Plus; - platforms = platforms.all; + teams = [ lib.teams.sage ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; # Does not cross compile # https://github.com/libntl/ntl/issues/8 broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); }; -} +}) diff --git a/pkgs/by-name/od/odin/package.nix b/pkgs/by-name/od/odin/package.nix index e5ea311510e7..f2963ed2954e 100644 --- a/pkgs/by-name/od/odin/package.nix +++ b/pkgs/by-name/od/odin/package.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "odin"; - version = "dev-2025-08"; + version = "dev-2025-09"; src = fetchFromGitHub { owner = "odin-lang"; repo = "Odin"; tag = finalAttrs.version; - hash = "sha256-08a5MFnHiG/HsetF7V913Hozev2rm1PaXdA/QJcDXTk="; + hash = "sha256-PxegNMEzxytZtmhmzDgb1Umzx/9aUIlc9SDojRlZfsE="; }; patches = [ diff --git a/pkgs/by-name/po/podman-tui/package.nix b/pkgs/by-name/po/podman-tui/package.nix index 3e1aaee4f350..73ddb2e0a951 100644 --- a/pkgs/by-name/po/podman-tui/package.nix +++ b/pkgs/by-name/po/podman-tui/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "podman-tui"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-lTgILCaisnCXMnNL6DSGIszJBC3GiPStZzol3dCm/7s="; + hash = "sha256-lvqitz4H10ILg2b6Mlw1DoWoByFKJaDiCo5zTlzTBQ4="; }; vendorHash = null; diff --git a/pkgs/by-name/pp/pplite/package.nix b/pkgs/by-name/pp/pplite/package.nix index c128142921ca..991ad0e03cdd 100644 --- a/pkgs/by-name/pp/pplite/package.nix +++ b/pkgs/by-name/pp/pplite/package.nix @@ -3,7 +3,7 @@ lib, fetchurl, fetchpatch, - flint3, + flint, gmp, }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { }; buildInputs = [ - flint3 + flint gmp ]; diff --git a/pkgs/by-name/ra/radicale/package.nix b/pkgs/by-name/ra/radicale/package.nix index e3b5c0ac5735..b820ceef3743 100644 --- a/pkgs/by-name/ra/radicale/package.nix +++ b/pkgs/by-name/ra/radicale/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "radicale"; - version = "3.5.6"; + version = "3.5.7"; pyproject = true; src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; tag = "v${version}"; - hash = "sha256-jMqy6vFT2DwF8NsANBm2Z+ApIBDUXqNaBbk+8zObQOI="; + hash = "sha256-+vYLBd4psPxL2NkH8zriRpLUGK6cWrrkJyV230LePVE="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix index 381d719f85da..1d778d7f9c1a 100644 --- a/pkgs/by-name/re/redpanda-client/package.nix +++ b/pkgs/by-name/re/redpanda-client/package.nix @@ -7,12 +7,12 @@ stdenv, }: let - version = "25.2.4"; + version = "25.2.5"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-atT2e5vzOKYBD3IHmgpq12ew4mxXWEmKQiwgIwW0+j4="; + sha256 = "sha256-hSL2IsequX/gsBnk7C0JkDDPjreoPhmsNgpR+x6hFUE="; }; in buildGoModule rec { diff --git a/pkgs/by-name/rq/rqlite/package.nix b/pkgs/by-name/rq/rqlite/package.nix index 688cc84558c4..b3263710efbb 100644 --- a/pkgs/by-name/rq/rqlite/package.nix +++ b/pkgs/by-name/rq/rqlite/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "rqlite"; - version = "9.0.1"; + version = "9.1.0"; src = fetchFromGitHub { owner = "rqlite"; repo = "rqlite"; tag = "v${finalAttrs.version}"; - hash = "sha256-ll8F5doXHG3Nq3LisSpy5iuh9JhA6/HsBwrSPDGs57c="; + hash = "sha256-q2T5Ze+rR2KfBvrtIiVa9W8DICxErdeRLA3aNKbyMCo="; }; vendorHash = "sha256-Mq469sUYgS19SVJ7noTUl7hml9xUAGDsr64MJM8Xq9g="; diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix index a8dbaa69e057..553c4afb5461 100644 --- a/pkgs/by-name/s7/s7/package.nix +++ b/pkgs/by-name/s7/s7/package.nix @@ -3,7 +3,7 @@ fetchFromGitLab, stdenv, - flint3, + flint, gmp, libmpc, mpfr, @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { }; buildInputs = - lib.optional withArb flint3 + lib.optional withArb flint ++ lib.optionals withGMP [ gmp mpfr diff --git a/pkgs/by-name/sa/sage/package.nix b/pkgs/by-name/sa/sage/package.nix index 0244119055cd..a594c707256b 100644 --- a/pkgs/by-name/sa/sage/package.nix +++ b/pkgs/by-name/sa/sage/package.nix @@ -17,7 +17,7 @@ let self: super: { # `sagelib`, i.e. all of sage except some wrappers and runtime dependencies sagelib = self.callPackage ./sagelib.nix { - inherit flint3; + inherit flint; inherit sage-src env-locations singular; inherit (maxima) lisp-compiler; linbox = pkgs.linbox; @@ -79,7 +79,7 @@ let python3 singular palp - flint3 + flint pythonEnv maxima ; @@ -142,7 +142,7 @@ let extraLibs = pythonRuntimeDeps; }; # make the libs accessible - singular = pkgs.singular.override { inherit flint3; }; + singular = pkgs.singular.override { inherit flint; }; maxima = pkgs.maxima-ecl.override { lisp-compiler = pkgs.ecl.override { @@ -164,7 +164,7 @@ let # openblas instead of openblasCompat. Apparently other packages somehow use flints # blas when it is available. Alternative would be to override flint to use # openblasCompat. - flint3 = pkgs.flint3.override { withBlas = false; }; + flint = pkgs.flint.override { withBlas = false; }; # Multiple palp dimensions need to be available and sage expects them all to be # in the same folder. diff --git a/pkgs/by-name/sa/sage/sage-env.nix b/pkgs/by-name/sa/sage/sage-env.nix index 47028995d330..d1f0c104e183 100644 --- a/pkgs/by-name/sa/sage/sage-env.nix +++ b/pkgs/by-name/sa/sage/sage-env.nix @@ -43,7 +43,7 @@ rubiks, blas, lapack, - flint3, + flint, gmp, mpfr, zlib, @@ -167,7 +167,7 @@ writeTextFile rec { export LDFLAGS='${ lib.concatStringsSep " " ( map (pkg: "-L${pkg}/lib") [ - flint3 + flint gap glpk gmp @@ -187,7 +187,7 @@ writeTextFile rec { singular gmp.dev glpk - flint3 + flint gap mpfr.dev ] diff --git a/pkgs/by-name/sa/sage/sagelib.nix b/pkgs/by-name/sa/sage/sagelib.nix index 408a015a2a9a..7964c4b8fa25 100644 --- a/pkgs/by-name/sa/sage/sagelib.nix +++ b/pkgs/by-name/sa/sage/sagelib.nix @@ -21,7 +21,7 @@ eclib, ecm, fflas-ffpack, - flint3, + flint, gap, giac, givaro, @@ -136,7 +136,7 @@ buildPythonPackage rec { eclib ecm fflas-ffpack - flint3 + flint gap giac givaro diff --git a/pkgs/by-name/sc/sc-controller/package.nix b/pkgs/by-name/sc/sc-controller/package.nix index b46df67c167b..66d6c38984f8 100644 --- a/pkgs/by-name/sc/sc-controller/package.nix +++ b/pkgs/by-name/sc/sc-controller/package.nix @@ -20,14 +20,14 @@ python3Packages.buildPythonApplication rec { pname = "sc-controller"; - version = "0.5.2"; + version = "0.5.3"; format = "setuptools"; src = fetchFromGitHub { owner = "C0rn3j"; repo = "sc-controller"; tag = "v${version}"; - hash = "sha256-w7jVh0d8u6csXOQ6pjUCSD3R/qFVqTa2gcGa47pqn/0="; + hash = "sha256-iieSKUTZwb1cInh/hz2cDvUFHf3p9Y5E4kR+YyZoNxI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sc/scryer-prolog/package.nix b/pkgs/by-name/sc/scryer-prolog/package.nix index 58f8801d85c8..19c26ecc0674 100644 --- a/pkgs/by-name/sc/scryer-prolog/package.nix +++ b/pkgs/by-name/sc/scryer-prolog/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "scryer-prolog"; - version = "0.9.4"; + version = "0.10.0"; src = fetchFromGitHub { owner = "mthom"; repo = "scryer-prolog"; rev = "v${version}"; - hash = "sha256-0c0MsjrHRitg+5VEHB9/iSuiqcPztF+2inDZa9fQpwU="; + hash = "sha256-RCz4zLbmWgSRR6Y5YbhidIZ1+LNR6FHyk/G0ifSDOx4="; }; - cargoHash = "sha256-CuCVofzKd/VPBTZY+ubk5wP9akt9kQLyi221fg7yt3M="; + cargoHash = "sha256-8uFxCLKa8hnGPpilxtV5SxHUG4Nf704A0qG2zpoIK4s="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/si/simdjson/package.nix b/pkgs/by-name/si/simdjson/package.nix index 29c1859ce63e..e1b62c5ae255 100644 --- a/pkgs/by-name/si/simdjson/package.nix +++ b/pkgs/by-name/si/simdjson/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.13.0"; + version = "4.0.6"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-Vzw1FpFjg3Tun1Sfk7H4h4tY7lfnjE1Wk+W82K7dcW0="; + sha256 = "sha256-e3W5p4MUv0sE7JazWFJ3mCqo2D/A3jVHhNedSOURMv8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/si/singular/package.nix b/pkgs/by-name/si/singular/package.nix index 608e4d3a4797..4278033373f2 100644 --- a/pkgs/by-name/si/singular/package.nix +++ b/pkgs/by-name/si/singular/package.nix @@ -15,7 +15,7 @@ sharutils, file, getconf, - flint3, + flint, ntl, mpfr, cddlib, @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-gfanlib" "--with-ntl=${ntl}" - "--with-flint=${flint3}" + "--with-flint=${flint}" ] ++ lib.optionals enableDocs [ "--enable-doc-build" @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { buildInputs = [ # necessary gmp - flint3 + flint # by upstream recommended but optional ncurses readline diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix index 92eca43bc0e1..ccd231a3a3c3 100644 --- a/pkgs/by-name/sl/slumber/package.nix +++ b/pkgs/by-name/sl/slumber/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "slumber"; - version = "3.4.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "LucasPickering"; repo = "slumber"; tag = "v${version}"; - hash = "sha256-RI5+SbVPtIEaudNV+S/HiKDATRy93CIQX/RvNJmBoos="; + hash = "sha256-Xr4jAQ3G5El9FU6qOJJARjkZmTZly8pb//ElQizOHSg="; }; - cargoHash = "sha256-i6ovc8aWgB9mABuSetdFNPKjOIRKFig2mbowY2djxWA="; + cargoHash = "sha256-Di3Kqwa63AWwZE1VOal+mqmYe/nzPFqis1MnawW9uZo="; meta = { description = "Terminal-based HTTP/REST client"; diff --git a/pkgs/by-name/so/solaar/package.nix b/pkgs/by-name/so/solaar/package.nix index f48f559fd9ee..444b039d00ee 100644 --- a/pkgs/by-name/so/solaar/package.nix +++ b/pkgs/by-name/so/solaar/package.nix @@ -9,6 +9,7 @@ libappindicator, librsvg, udevCheckHook, + acl, }: # Although we copy in the udev rules here, you probably just want to use @@ -62,6 +63,11 @@ python3Packages.buildPythonApplication rec { pytest-cov-stub ]; + preConfigure = '' + substituteInPlace lib/solaar/listener.py \ + --replace-fail /usr/bin/getfacl "${lib.getExe' acl "getfacl"}" + ''; + # the -cli symlink is just to maintain compabilility with older versions where # there was a difference between the GUI and CLI versions. postInstall = '' diff --git a/pkgs/development/tools/purescript/spago/default.nix b/pkgs/by-name/sp/spago-legacy/package.nix similarity index 77% rename from pkgs/development/tools/purescript/spago/default.nix rename to pkgs/by-name/sp/spago-legacy/package.nix index c06b588c56ba..ed5ffa355098 100644 --- a/pkgs/development/tools/purescript/spago/default.nix +++ b/pkgs/by-name/sp/spago-legacy/package.nix @@ -4,7 +4,7 @@ lib, # The following are only needed for the passthru.tests: - spago, + spago-legacy, cacert, git, nodejs, @@ -12,11 +12,11 @@ runCommand, }: -lib.pipe haskellPackages.spago [ +lib.pipe haskellPackages.spago-legacy [ haskell.lib.compose.justStaticExecutables (haskell.lib.compose.overrideCabal (oldAttrs: { - changelog = "https://github.com/purescript/spago/releases/tag/${oldAttrs.version}"; + changelog = "https://github.com/purescript/spago-legacy/releases/tag/${oldAttrs.version}"; passthru = (oldAttrs.passthru or { }) // { updateScript = ./update.sh; @@ -25,10 +25,10 @@ lib.pipe haskellPackages.spago [ # network, so they cannot be run in the nix sandbox. sudo is needed in # order to change the sandbox option. # - # $ sudo nix-build -A spago.passthru.tests --option sandbox relaxed + # $ sudo nix-build -A spago-legacy.passthru.tests --option sandbox relaxed # tests = - runCommand "spago-tests" + runCommand "spago-legacy-tests" { __noChroot = true; nativeBuildInputs = [ @@ -36,7 +36,7 @@ lib.pipe haskellPackages.spago [ git nodejs purescript - spago + spago-legacy ]; } '' diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/by-name/sp/spago-legacy/spago-legacy.nix similarity index 87% rename from pkgs/development/tools/purescript/spago/spago.nix rename to pkgs/by-name/sp/spago-legacy/spago-legacy.nix index 905d6b63720e..75ea67ae64a0 100644 --- a/pkgs/development/tools/purescript/spago/spago.nix +++ b/pkgs/by-name/sp/spago-legacy/spago-legacy.nix @@ -62,12 +62,12 @@ zlib, }: mkDerivation { - pname = "spago"; - version = "0.21.0"; + pname = "spago-legacy"; + version = "0.21.1"; src = fetchgit { - url = "https://github.com/purescript/spago.git"; - sha256 = "1v5y15nhw6smnir0y7y854pa70iv8asxsqph2y8rz1c9lkz5d41g"; - rev = "c354f4a461f65fcb83aaa843830ea1589f6c7179"; + url = "https://github.com/purescript/spago-legacy.git"; + sha256 = "18p9cic1y9b2v12np4b5sd82rz5njxh8f1vgqs4gwm6xjccmszmr"; + rev = "2790261c28f59940f192c56f3b8245b3ae8b798d"; fetchSubmodules = true; }; isLibrary = true; @@ -148,7 +148,7 @@ mkDerivation { versions ]; testToolDepends = [ hspec-discover ]; - homepage = "https://github.com/purescript/spago#readme"; + homepage = "https://github.com/purescript/spago-legacy#readme"; license = lib.licenses.bsd3; mainProgram = "spago"; } diff --git a/pkgs/development/tools/purescript/spago/update.sh b/pkgs/by-name/sp/spago-legacy/update.sh similarity index 61% rename from pkgs/development/tools/purescript/spago/update.sh rename to pkgs/by-name/sp/spago-legacy/update.sh index e25b1b8670b2..5ac99bdb0be0 100755 --- a/pkgs/development/tools/purescript/spago/update.sh +++ b/pkgs/by-name/sp/spago-legacy/update.sh @@ -1,10 +1,10 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq haskellPackages.cabal2nix-unstable.bin nix-prefetch-scripts -I nixpkgs=. # -# This script will update the spago derivation to the latest version using +# This script will update the spago-legacy derivation to the latest version using # cabal2nix. # -# Note that you should always try building spago after updating it here, since +# Note that you should always try building spago-legacy after updating it here, since # some of the overrides in pkgs/development/haskell/configuration-nix.nix may # need to be updated/changed. @@ -14,26 +14,28 @@ set -eo pipefail script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" # Spago derivation created with cabal2nix. -spago_derivation_file="${script_dir}/spago.nix" +spago_derivation_file="${script_dir}/spago-legacy.nix" -# This is the current revision of spago in Nixpkgs. +# This is the current revision of spago-legacy in Nixpkgs. old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$spago_derivation_file")" -# This is the latest release version of spago on GitHub. -new_version=$(curl --silent "https://api.github.com/repos/purescript/spago/releases" | jq '.[0].tag_name' --raw-output) +# This is the latest release version of spago-legacy on GitHub. +new_version=$(curl --silent "https://api.github.com/repos/purescript/spago-legacy/releases" | jq '.[0].tag_name' --raw-output) -echo "Updating spago from old version $old_version to new version $new_version." +echo "Updating spago-legacy from old version $old_version to new version $new_version." echo "Running cabal2nix and outputting to ${spago_derivation_file}..." echo "# This has been automatically generated by the script" > "$spago_derivation_file" echo "# ./update.sh. This should not be changed by hand." >> "$spago_derivation_file" -cabal2nix --revision "$new_version" "https://github.com/purescript/spago.git" >> "$spago_derivation_file" +cabal2nix --revision "$new_version" "https://github.com/purescript/spago-legacy.git" >> "$spago_derivation_file" + +nixfmt "$spago_derivation_file" # TODO: This should ideally also automatically update the docsSearchVersion # from pkgs/development/haskell/configuration-nix.nix. echo echo "Finished. Make sure you run the following commands to confirm Spago builds correctly:" -echo ' - `nix build -L -f ./. spago`' -echo ' - `sudo nix build -L -f ./. spago.passthru.tests --option sandbox relaxed`' +echo ' - `nix build -L -f ./. spago-legacy`' +echo ' - `sudo nix build -L -f ./. spago-legacy.passthru.tests --option sandbox relaxed`' diff --git a/pkgs/by-name/sy/symengine/package.nix b/pkgs/by-name/sy/symengine/package.nix index 9aaf8cde4269..5c71dfc1d5cb 100644 --- a/pkgs/by-name/sy/symengine/package.nix +++ b/pkgs/by-name/sy/symengine/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, cmake, gmp, - flint3, + flint, mpfr, libmpc, withShared ? true, @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp - flint3 + flint mpfr libmpc ]; diff --git a/pkgs/by-name/ta/taze/package.nix b/pkgs/by-name/ta/taze/package.nix index 7bf292ce1f21..7230003001fe 100644 --- a/pkgs/by-name/ta/taze/package.nix +++ b/pkgs/by-name/ta/taze/package.nix @@ -13,19 +13,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "taze"; - version = "19.5.0"; + version = "19.7.0"; src = fetchFromGitHub { owner = "antfu-collective"; repo = "taze"; tag = "v${finalAttrs.version}"; - hash = "sha256-TJ/gyqGTaaRYgx9EMFhFmzWAFrNRnESk6AvBZtQ+24k="; + hash = "sha256-O+xeAM6sh6YK+yAtxQCTI59Dle/6Z4/ePbgqRGmZxlU="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-kTXW/KYI1ao7zIyIphMPxjfuo7RrEnmXXEK7yTRWO+U="; + hash = "sha256-vXw5LPNcuF9wyI23rZhsvvMYTsPNOvSY3LoLntFdm3g="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/te/termius/package.nix b/pkgs/by-name/te/termius/package.nix index 66c858c97602..8ed3f8939cab 100644 --- a/pkgs/by-name/te/termius/package.nix +++ b/pkgs/by-name/te/termius/package.nix @@ -12,6 +12,7 @@ udev, wrapGAppsHook3, writeScript, + sqlite, }: stdenv.mkDerivation rec { @@ -57,6 +58,7 @@ stdenv.mkDerivation rec { alsa-lib libsecret libgbm + sqlite ]; unpackPhase = '' diff --git a/pkgs/by-name/ul/ulauncher/package.nix b/pkgs/by-name/ul/ulauncher/package.nix index 6af6aaf5dd44..55af94f2b4b4 100644 --- a/pkgs/by-name/ul/ulauncher/package.nix +++ b/pkgs/by-name/ul/ulauncher/package.nix @@ -1,6 +1,7 @@ { lib, fetchurl, + fetchpatch, nix-update-script, python3Packages, gdk-pixbuf, @@ -9,7 +10,7 @@ gobject-introspection, gtk3, wrapGAppsHook3, - webkitgtk_4_0, + webkitgtk_4_1, libnotify, keybinder3, libappindicator, @@ -48,7 +49,7 @@ python3Packages.buildPythonApplication rec { libappindicator libnotify librsvg - webkitgtk_4_0 + webkitgtk_4_1 wmctrl ]; @@ -80,6 +81,11 @@ python3Packages.buildPythonApplication rec { patches = [ ./fix-path.patch ./fix-extensions.patch + (fetchpatch { + name = "support-gir1.2-webkit2-4.1.patch"; + url = "https://src.fedoraproject.org/rpms/ulauncher/raw/rawhide/f/support-gir1.2-webkit2-4.1.patch"; + hash = "sha256-w1c+Yf6SA3fyMrMn1LXzCXf5yuynRYpofkkUqZUKLS8="; + }) ]; postPatch = '' diff --git a/pkgs/by-name/ut/ut1999/package.nix b/pkgs/by-name/ut/ut1999/package.nix index 7e5896fe15f1..dc2ae509e546 100644 --- a/pkgs/by-name/ut/ut1999/package.nix +++ b/pkgs/by-name/ut/ut1999/package.nix @@ -198,7 +198,10 @@ stdenv.mkDerivation (finalAttrs: { description = "Unreal Tournament GOTY (1999) with the OldUnreal patch"; license = licenses.unfree; platforms = attrNames srcs; - maintainers = with maintainers; [ eliandoran ]; + maintainers = with maintainers; [ + eliandoran + dwt + ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; mainProgram = "ut1999"; }; diff --git a/pkgs/by-name/ve/veloren/package.nix b/pkgs/by-name/ve/veloren/package.nix index cd68a5dc95cc..074f0d772e97 100644 --- a/pkgs/by-name/ve/veloren/package.nix +++ b/pkgs/by-name/ve/veloren/package.nix @@ -7,8 +7,15 @@ alsa-lib, udev, shaderc, - xorg, + libxcb, libxkbcommon, + autoPatchelfHook, + libX11, + libXi, + libXcursor, + libXrandr, + wayland, + stdenv, }: let @@ -47,12 +54,18 @@ rustPlatform.buildRustPackage { EOF ''; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + autoPatchelfHook + pkg-config + ]; + buildInputs = [ alsa-lib udev - xorg.libxcb + libxcb libxkbcommon + shaderc + stdenv.cc.cc # libgcc_s.so.1 ]; buildNoDefaultFeatures = true; @@ -77,18 +90,20 @@ rustPlatform.buildRustPackage { # Some tests require internet access doCheck = false; - postFixup = '' - # Add required but not explicitly requested libraries - patchelf --add-rpath '${ - lib.makeLibraryPath [ - xorg.libX11 - xorg.libXi - xorg.libXcursor - xorg.libXrandr + appendRunpaths = [ + (lib.makeLibraryPath ( + [ + libX11 + libXi + libXcursor + libXrandr vulkan-loader ] - }' "$out/bin/veloren-voxygen" - ''; + ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform wayland) [ + wayland + ] + )) + ]; postInstall = '' # Icons @@ -99,13 +114,13 @@ rustPlatform.buildRustPackage { mkdir -p "$out/share/veloren"; cp -ar assets "$out/share/veloren/" ''; - meta = with lib; { + meta = { description = "Open world, open source voxel RPG"; homepage = "https://www.veloren.net"; - license = licenses.gpl3; + license = lib.licenses.gpl3Only; mainProgram = "veloren-voxygen"; - platforms = platforms.linux; - maintainers = with maintainers; [ + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ rnhmjoj tomodachi94 ]; diff --git a/pkgs/by-name/wi/widevine-cdm/update-x86_64.py b/pkgs/by-name/wi/widevine-cdm/update-x86_64.py index 4b18c1dd0b78..c255557f62a8 100755 --- a/pkgs/by-name/wi/widevine-cdm/update-x86_64.py +++ b/pkgs/by-name/wi/widevine-cdm/update-x86_64.py @@ -6,7 +6,7 @@ import sys, os, json, base64, re, argparse, urllib.request, time from typing import Dict, Optional, Tuple from pathlib import Path -DEFAULT_JSON = "https://raw.githubusercontent.com/mozilla/gecko-dev/master/toolkit/content/gmp-sources/widevinecdm.json" +DEFAULT_JSON = "https://raw.githubusercontent.com/mozilla-firefox/firefox/refs/heads/main/toolkit/content/gmp-sources/widevinecdm.json" ARCH_PATTERNS = { "linux_x86_64": ["Linux_x86_64-gcc3"], "linux_aarch64": ["Linux_aarch64-gcc3"] diff --git a/pkgs/development/bower-modules/generic/default.nix b/pkgs/development/bower-modules/generic/default.nix deleted file mode 100644 index 65d3dd4d6e39..000000000000 --- a/pkgs/development/bower-modules/generic/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ pkgs }: - -{ - buildInputs ? [ ], - generated, - ... -}@attrs: - -let - # Fetches the bower packages. `generated` should be the result of a - # `bower2nix` command. - bowerPackages = import generated { - inherit (pkgs) buildEnv fetchbower; - }; - -in -pkgs.stdenv.mkDerivation ( - attrs - // { - name = "bower_components-" + attrs.name; - - inherit bowerPackages; - - builder = builtins.toFile "builder.sh" '' - # The project's bower.json is required - cp $src/bower.json . - - # Dereference symlinks -- bower doesn't like them - cp --recursive --reflink=auto \ - --dereference --no-preserve=mode \ - $bowerPackages bc - - # Bower install in offline mode -- links together the fetched - # bower packages. - HOME=$PWD bower \ - --config.storage.packages=bc/packages \ - --config.storage.registry=bc/registry \ - --offline install - - # Sets up a single bower_components directory within - # the output derivation. - mkdir -p $out - mv bower_components $out - ''; - - buildInputs = buildInputs ++ [ - pkgs.git - pkgs.nodePackages.bower - ]; - } -) diff --git a/pkgs/development/compilers/purescript/purescript/update.sh b/pkgs/development/compilers/purescript/purescript/update.sh index 186a51a2bca3..0834fbf5d1dc 100755 --- a/pkgs/development/compilers/purescript/purescript/update.sh +++ b/pkgs/development/compilers/purescript/purescript/update.sh @@ -50,4 +50,4 @@ echo echo "Finished. Make sure you run the following commands to confirm PureScript builds correctly:" echo ' - `nix build -L -f ./. purescript`' echo ' - `nix build -L -f ./. purescript.passthru.tests.minimal-module`' -echo ' - `sudo nix build -L -f ./. spago.passthru.tests --option sandbox relaxed`' +echo ' - `sudo nix build -L -f ./. spago-legacy.passthru.tests --option sandbox relaxed`' diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 57be451c56cb..3bdae5481620 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2769,7 +2769,6 @@ with haskellLib; let # We need to build purescript with these dependencies and thus also its reverse # dependencies to avoid version mismatches in their dependency closure. - # TODO: maybe unify with the spago overlay in configuration-nix.nix? purescriptOverlay = self: super: { # As of 2021-11-08, the latest release of `language-javascript` is 0.7.1.0, # but it has a problem with parsing the `async` keyword. It doesn't allow diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 6fc683b1c72a..7e96e5adc67d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -61,7 +61,6 @@ extra-packages: - extensions == 0.1.0.1 # 2025-09-21: needed for Cabal 3.10 (fourmolo/ormolu with ghc 9.8) - fourmolu == 0.14.0.0 # 2023-11-13: for ghc-lib-parser 9.6 compat - fourmolu == 0.15.0.0 # 2025-09-21: for ghc-lib-parser 9.8 compat - - fsnotify < 0.4 # 2024-04-22: required by spago-0.21 - fuzzyset == 0.2.4 # 2023-12-20: Needed for building postgrest > 10 - ghc-exactprint == 0.6.* # 2022-12-12: needed for GHC < 9.2 - ghc-exactprint == 1.5.* # 2023-03-30: needed for GHC == 9.2 @@ -116,7 +115,6 @@ extra-packages: - text-builder < 1 # 2025-08-27: Needed for building postgrest - text-builder-dev < 0.4 # 2025-08-27: Needed for building postgrest - text-metrics < 0.3.3 # 2025-02-08: >= 0.3.3 uses GHC2021 - - versions < 6 # 2024-04-22: required by spago-0.21 - weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2 - weeder == 2.4.* # 2023-02-02: preserve for GHC 9.2.* # keep-sorted end diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 297a7a64a5d1..509d06224598 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1081,7 +1081,7 @@ builtins.intersectAttrs super { addBuildTool self.buildHaskellPackages.gtk2hs-buildtools super.pango ); - spago = + spago-legacy = let docsSearchApp_0_0_10 = pkgs.fetchurl { url = "https://github.com/purescript/purescript-docs-search/releases/download/v0.0.10/docs-search-app.js"; @@ -1103,49 +1103,43 @@ builtins.intersectAttrs super { sha256 = "1hjdprm990vyxz86fgq14ajn0lkams7i00h8k2i2g1a0hjdwppq6"; }; in - lib.pipe - (super.spago.override { - # base <4.19, text <2.1 - versions = doJailbreak self.versions_5_0_5; - fsnotify = self.fsnotify_0_3_0_1; - }) - [ - (overrideCabal (drv: { - postUnpack = (drv.postUnpack or "") + '' - # Spago includes the following two files directly into the binary - # with Template Haskell. They are fetched at build-time from the - # `purescript-docs-search` repo above. If they cannot be fetched at - # build-time, they are pulled in from the `templates/` directory in - # the spago source. - # - # However, they are not actually available in the spago source, so they - # need to fetched with nix and put in the correct place. - # https://github.com/spacchetti/spago/issues/510 - cp ${docsSearchApp_0_0_10} "$sourceRoot/templates/docs-search-app-0.0.10.js" - cp ${docsSearchApp_0_0_11} "$sourceRoot/templates/docs-search-app-0.0.11.js" - cp ${purescriptDocsSearch_0_0_10} "$sourceRoot/templates/purescript-docs-search-0.0.10" - cp ${purescriptDocsSearch_0_0_11} "$sourceRoot/templates/purescript-docs-search-0.0.11" + lib.pipe super.spago-legacy [ + (overrideCabal (drv: { + postUnpack = (drv.postUnpack or "") + '' + # Spago includes the following two files directly into the binary + # with Template Haskell. They are fetched at build-time from the + # `purescript-docs-search` repo above. If they cannot be fetched at + # build-time, they are pulled in from the `templates/` directory in + # the spago source. + # + # However, they are not actually available in the spago source, so they + # need to fetched with nix and put in the correct place. + # https://github.com/spacchetti/spago/issues/510 + cp ${docsSearchApp_0_0_10} "$sourceRoot/templates/docs-search-app-0.0.10.js" + cp ${docsSearchApp_0_0_11} "$sourceRoot/templates/docs-search-app-0.0.11.js" + cp ${purescriptDocsSearch_0_0_10} "$sourceRoot/templates/purescript-docs-search-0.0.10" + cp ${purescriptDocsSearch_0_0_11} "$sourceRoot/templates/purescript-docs-search-0.0.11" - # For some weird reason, on Darwin, the open(2) call to embed these files - # requires write permissions. The easiest resolution is just to permit that - # (doesn't cause any harm on other systems). - chmod u+w \ - "$sourceRoot/templates/docs-search-app-0.0.10.js" \ - "$sourceRoot/templates/purescript-docs-search-0.0.10" \ - "$sourceRoot/templates/docs-search-app-0.0.11.js" \ - "$sourceRoot/templates/purescript-docs-search-0.0.11" - ''; - })) + # For some weird reason, on Darwin, the open(2) call to embed these files + # requires write permissions. The easiest resolution is just to permit that + # (doesn't cause any harm on other systems). + chmod u+w \ + "$sourceRoot/templates/docs-search-app-0.0.10.js" \ + "$sourceRoot/templates/purescript-docs-search-0.0.10" \ + "$sourceRoot/templates/docs-search-app-0.0.11.js" \ + "$sourceRoot/templates/purescript-docs-search-0.0.11" + ''; + })) - # Tests require network access. - dontCheck + # Tests require network access. + dontCheck - # Overly strict upper bound on text - doJailbreak + # Overly strict upper bound on text (<1.3) + doJailbreak - # Generate shell completion for spago - (self.generateOptparseApplicativeCompletions [ "spago" ]) - ]; + # Generate shell completion for spago + (self.generateOptparseApplicativeCompletions [ "spago" ]) + ]; # checks SQL statements at compile time, and so requires a running PostgreSQL # database to run it's test suite diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 55da66914a57..3591ef13a2b1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -245191,63 +245191,6 @@ self: { } ) { }; - fsnotify_0_3_0_1 = callPackage ( - { - mkDerivation, - async, - base, - bytestring, - containers, - directory, - filepath, - hinotify, - random, - shelly, - tasty, - tasty-hunit, - temporary, - text, - time, - unix, - unix-compat, - }: - mkDerivation { - pname = "fsnotify"; - version = "0.3.0.1"; - sha256 = "19bdbz9wb9jvln6yg6qm0hz0w84bypvkxf0wjhgrgd52f9gidlny"; - revision = "3"; - editedCabalFile = "0n5p6ljx8i5mmalkw05izjgzbqg08y7rxxn2gk8ghxlqldgqgix9"; - libraryHaskellDepends = [ - async - base - bytestring - containers - directory - filepath - hinotify - shelly - text - time - unix - unix-compat - ]; - testHaskellDepends = [ - async - base - directory - filepath - random - tasty - tasty-hunit - temporary - unix-compat - ]; - description = "Cross platform library for file change notification"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - } - ) { }; - fsnotify = callPackage ( { mkDerivation, @@ -706659,49 +706602,6 @@ self: { } ) { }; - versions_5_0_5 = callPackage ( - { - mkDerivation, - base, - deepseq, - hashable, - megaparsec, - microlens, - parser-combinators, - QuickCheck, - tasty, - tasty-hunit, - tasty-quickcheck, - text, - }: - mkDerivation { - pname = "versions"; - version = "5.0.5"; - sha256 = "01kn3ilizzm5n05nz0qry1vjb6bj8dzinyqn3mbshds298acn70c"; - libraryHaskellDepends = [ - base - deepseq - hashable - megaparsec - parser-combinators - text - ]; - testHaskellDepends = [ - base - megaparsec - microlens - QuickCheck - tasty - tasty-hunit - tasty-quickcheck - text - ]; - description = "Types and parsers for software version numbers"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - } - ) { }; - versions = callPackage ( { mkDerivation, diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index 87e656243589..e5ec0f1d053e 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -44,9 +44,9 @@ self: super: # https://github.com/channable/vaultenv/issues/1 vaultenv = self.callPackage ../tools/haskell/vaultenv { }; - # spago is not released to Hackage. + # spago-legacy is not released to Hackage. # https://github.com/spacchetti/spago/issues/512 - spago = self.callPackage ../tools/purescript/spago/spago.nix { }; + spago-legacy = self.callPackage ../../by-name/sp/spago-legacy/spago-legacy.nix { }; # Unofficial fork until PRs are merged https://github.com/pcapriotti/optparse-applicative/pulls/roberth # cabal2nix --maintainer roberth https://github.com/hercules-ci/optparse-applicative.git > pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 32251b117507..532f0c42502e 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -121,6 +121,7 @@ stdenv.mkDerivation (finalAttrs: { bsd3 asl20 ]; + maintainers = with lib.maintainers; [ bcdarwin ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 523735e7c897..d53f97ed814b 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -63,6 +63,7 @@ mapAliases { inherit (pkgs) bash-language-server; # added 2024-06-07 bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30 bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25 + bower = throw "bower was removed because it was deprecated"; # added 2025-09-17 inherit (pkgs) bower2nix; # added 2024-08-23 inherit (pkgs) btc-rpc-explorer; # added 2023-08-17 inherit (pkgs) carbon-now-cli; # added 2023-08-17 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 9ace13598dd7..1f473a018c11 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -18,7 +18,6 @@ , "audiosprite" , "aws-cdk" , "awesome-lint" -, "bower" , "browserify" , "browser-sync" , "cdk8s-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index fdb5911a3af1..af270592afa0 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -46557,24 +46557,6 @@ in bypassCache = true; reconstructLock = true; }; - bower = nodeEnv.buildNodePackage { - name = "bower"; - packageName = "bower"; - version = "1.8.14"; - src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.14.tgz"; - sha512 = "8Rq058FD91q9Nwthyhw0la9fzpBz0iwZTrt51LWl+w+PnJgZk9J+5wp3nibsJcIUPglMYXr4NRBaR+TUj0OkBQ=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "The browser package manager"; - homepage = "http://bower.io"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix index 308803b75ced..f1206bab6ffb 100644 --- a/pkgs/development/ocaml-modules/apron/default.nix +++ b/pkgs/development/ocaml-modules/apron/default.nix @@ -10,7 +10,7 @@ findlib, camlidl, mlgmpidl, - flint3, + flint, pplite, }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { mpfr ppl camlidl - flint3 + flint pplite ]; propagatedBuildInputs = [ mlgmpidl ]; diff --git a/pkgs/development/ocaml-modules/mopsa/default.nix b/pkgs/development/ocaml-modules/mopsa/default.nix index 4e60eaff2f47..bccc33e7085a 100644 --- a/pkgs/development/ocaml-modules/mopsa/default.nix +++ b/pkgs/development/ocaml-modules/mopsa/default.nix @@ -5,7 +5,7 @@ clang, libclang, libllvm, - flint3, + flint, mpfr, pplite, ocaml, @@ -39,7 +39,7 @@ buildDunePackage rec { buildInputs = [ arg-complete camlidl - flint3 + flint libclang mpfr pplite diff --git a/pkgs/development/python-modules/ucsmsdk/default.nix b/pkgs/development/python-modules/ucsmsdk/default.nix index ffeb58170e1a..a0ec0df2277b 100644 --- a/pkgs/development/python-modules/ucsmsdk/default.nix +++ b/pkgs/development/python-modules/ucsmsdk/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ucsmsdk"; - version = "0.9.22"; + version = "0.9.23"; pyproject = true; src = fetchFromGitHub { owner = "CiscoUcs"; repo = "ucsmsdk"; tag = "v${version}"; - hash = "sha256-zpb43Id6uHBKpEORDGKNW8lXP10fQJm9lGOztxaTZSI="; + hash = "sha256-UVOEJl+oSjf6gaVaa6QWBfEViUPmhgUiSm6rerkZ+EM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index b20f8bcefeb0..c1bd7fb54744 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -503,7 +503,7 @@ let pkg-config gmp.dev mpfr.dev - flint3 + flint ]; fingerPro = [ pkgs.gsl ]; Formula = [ pkgs.gmp ]; diff --git a/pkgs/kde/third-party/karousel/default.nix b/pkgs/kde/third-party/karousel/default.nix index be4179438951..9e0f2fee23ee 100644 --- a/pkgs/kde/third-party/karousel/default.nix +++ b/pkgs/kde/third-party/karousel/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "karousel"; - version = "0.13"; + version = "0.14"; src = fetchFromGitHub { owner = "peterfajdiga"; repo = "karousel"; rev = "v${finalAttrs.version}"; - hash = "sha256-kwj0G4px9Mmv2TdGJsRuj+29Qvg4ZfSYnxCDgf+54bg="; + hash = "sha256-bJv3fQ8w4bAtthlrDjj3cWA8lSpcJCEtJFk5C+94K5M="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index ce4385962ed5..e6e292087f22 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -23,9 +23,9 @@ let }; # ./update-zen.py lqx lqx = { - version = "6.16.7"; # lqx + version = "6.16.9"; # lqx suffix = "lqx1"; # lqx - sha256 = "1rw5iz9d2zz39hzg9p0nxbprz25hgiaycax5iq2yg87mqsxdajad"; # lqx + sha256 = "01slgcp07s59yc9w2pghcvi15vrki55fn19jqks21phb09k2fkl6"; # lqx isLqx = true; }; }; diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix index 2f481f5eddd5..72989c472b1d 100644 --- a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix +++ b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix @@ -9,13 +9,13 @@ buildHomeAssistantComponent rec { owner = "AlexxIT"; domain = "xiaomi_gateway3"; - version = "4.1.2"; + version = "4.1.3"; src = fetchFromGitHub { owner = "AlexxIT"; repo = "XiaomiGateway3"; rev = "v${version}"; - hash = "sha256-20OA2H1HOwQKLL6Cjhp4xfTv1/BSc/XaMHX+wO+EM5s="; + hash = "sha256-CcJoXD60z91Gahv5pVrWaIpUNhetW0BN1Nd4DAVRPJs="; }; dependencies = [ zigpy ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bc6db98e6bf5..702c31d128a5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -542,6 +542,7 @@ mapAliases { boost184 = throw "Boost 1.84 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2024-11-24 boost185 = throw "Boost 1.85 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2024-11-24 boost_process = throw "boost_process has been removed as it is included in regular boost"; # Added 2024-05-01 + bower2nix = throw "bower2nix has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17 bpb = throw "bpb has been removed as it is unmaintained and not compatible with recent Rust versions"; # Added 2024-04-30 bpftool = throw "'bpftool' has been renamed to/replaced by 'bpftools'"; # Converted to throw 2024-10-17 brasero-original = lib.warnOnInstantiate "Use 'brasero-unwrapped' instead of 'brasero-original'" brasero-unwrapped; # Added 2024-09-29 @@ -553,6 +554,7 @@ mapAliases { budgie = throw "The `budgie` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14 budgiePlugins = throw "The `budgiePlugins` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14 buildBarebox = throw "buildBarebox has been removed due to lack of interest in maintaining it in nixpkgs"; # Added 2025-04-19 + buildBowerComponents = throw "buildBowerComponents has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17 buildGo122Module = throw "Go 1.22 is end-of-life, and 'buildGo122Module' has been removed. Please use a newer builder version."; # Added 2025-03-28 buildGo123Module = throw "Go 1.23 is end-of-life, and 'buildGo123Module' has been removed. Please use a newer builder version."; # Added 2025-08-13 buildGoPackage = throw "`buildGoPackage` has been deprecated and removed, see the Go section in the nixpkgs manual for details"; # Added 2024-11-18 @@ -884,6 +886,7 @@ mapAliases { fdr = throw "fdr has been removed, as it cannot be built from source and depends on Python 2.x"; # Added 2025-03-19 inherit (luaPackages) fennel; # Added 2022-09-24 ferdi = throw "'ferdi' has been removed, upstream does not exist anymore and the package is insecure"; # Added 2024-08-22 + fetchbower = throw "fetchbower has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve, reason: common typo ffmpeg_5 = throw "ffmpeg_5 has been removed, please use another version"; # Added 2024-07-12 ffmpeg_5-headless = throw "ffmpeg_5-headless has been removed, please use another version"; # Added 2024-07-12 @@ -908,6 +911,7 @@ mapAliases { flashrom-stable = flashprog; # Added 2024-03-01 flatbuffers_2_0 = flatbuffers; # Added 2022-05-12 flatcam = throw "flatcam has been removed because it is unmaintained since 2022 and doesn't support Python > 3.10"; # Added 2025-01-25 + flint3 = flint; # Added 2025-09-21 floorp = throw "floorp has been replaced with floorp-bin, as building from upstream sources has become unfeasible starting with version 12.x"; # Added 2025-09-06 floorp-unwrapped = throw "floorp-unwrapped has been replaced with floorp-bin-unwrapped, as building from upstream sources has become unfeasible starting with version 12.x"; # Added 2025-09-06 flow-editor = flow-control; # Added 2025-03-05 @@ -2343,6 +2347,7 @@ mapAliases { soundOfSorting = sound-of-sorting; # Added 2023-07-07 SP800-90B_EntropyAssessment = sp800-90b-entropyassessment; # Added on 2024-06-12 SPAdes = spades; # Added 2024-06-12 + spago = spago-legacy; # Added 2025-09-23, pkgs.spago should become spago@next which hasn't been packaged yet spark2014 = gnatprove; # Added 2024-02-25 space-orbit = throw "'space-orbit' has been removed because it is unmaintained; Debian upstream stopped tracking it in 2011."; # Added 2025-06-08 spatialite_gui = throw "spatialite_gui has been renamed to spatialite-gui"; # Added 2025-01-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bfe0a89bdf41..8fec6c5e846d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -458,8 +458,6 @@ with pkgs; python3Packages = python311Packages; }; - fetchbower = callPackage ../build-support/fetchbower { }; - fetchbzr = callPackage ../build-support/fetchbzr { }; fetchcvs = @@ -5101,8 +5099,6 @@ with pkgs; purenix = haskell.lib.compose.justStaticExecutables haskellPackages.purenix; - spago = callPackage ../development/tools/purescript/spago { }; - pulp = nodePackages.pulp; pscid = nodePackages.pscid; @@ -7339,10 +7335,6 @@ with pkgs; }; fftwMpi = fftw.override { enableMpi = true; }; - flint = flint3; - - flint3 = callPackage ../development/libraries/flint/3.nix { }; - fltk13 = callPackage ../development/libraries/fltk { }; fltk14 = callPackage ../development/libraries/fltk/1.4.nix { }; fltk13-minimal = fltk13.override { @@ -9078,12 +9070,6 @@ with pkgs; saxon_12-he ; - ### DEVELOPMENT / LIBRARIES / JAVASCRIPT - - ### DEVELOPMENT / BOWER MODULES (JAVASCRIPT) - - buildBowerComponents = callPackage ../development/bower-modules/generic { }; - ### DEVELOPMENT / GO # the unversioned attributes should always point to the same go version diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index cf213d36cb0e..eed48f452460 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -334,7 +334,7 @@ let shellcheck-minimal sourceAndTags spacecookie - spago + spago-legacy specup splot stack