Merge master into staging-next

2024-08-04 06:00:57 +00:00
parent 1fdd73343a 985dbac93e
commit 9a354fe19b
211 changed files with 1210 additions and 2045 deletions
@@ -156,3 +156,6 @@ bdfde18037f8d9f9b641a4016c8ada4dc4cbf856

 # nixos/nvidia: apply nixfmt-rfc-style (#313440)
 fbdcdde04a7caa007e825a8b822c75fab9adb2d6
+
+# step-cli: format package.nix with nixfmt (#331629)
+fc7a83f8b62e90de5679e993d4d49ca014ea013d
@@ -70,7 +70,7 @@ let
        require_once(ABSPATH . 'wp-settings.php');
      ?>
    '';
-    checkPhase = "${pkgs.php81}/bin/php --syntax-check $target";
+    checkPhase = "${pkgs.php}/bin/php --syntax-check $target";
  };

  mkPhpValue = v: let
@@ -25,23 +25,21 @@

 stdenv.mkDerivation rec {
  pname = "fractal";
-  version = "7";
+  version = "8";

  src = fetchFromGitLab {
    domain = "gitlab.gnome.org";
    owner = "World";
    repo = "fractal";
    rev = "refs/tags/${version}";
-    hash = "sha256-IfcThpsGATMD3Uj9tvw/aK7IVbiVT8sdZ088gRUqnlg=";
+    hash = "sha256-a77+lPH2eqWTLFrYfcBXSvbyyYC52zSo+Rh/diqKYx4=";
  };

  cargoDeps = rustPlatform.importCargoLock {
    lockFile = ./Cargo.lock;
    outputHashes = {
-      "mas-http-0.8.0" = "sha256-IiYxF9qT/J/n8t/cVT/DRV3gl2MTA6/YfjshVIic/n4=";
-      "matrix-sdk-0.7.1" = "sha256-quwt9Dx0K6LDMwHBipc52Ek59zz5mlTAdOj+RXZBU3Q=";
-      "ruma-0.9.4" = "sha256-tp0EFS39UTXZJQPUDjeQixb8wzsMCzyFggVj6M8TRYg=";
-      "vodozemac-0.5.1" = "sha256-Hm0C696RmNX6n1Jx+hqkKMjpdbArliuzdiS4wCv3OIM=";
+      "matrix-sdk-0.7.1" = "sha256-ZlkxGXGrmZ8VQV7UY7A7BBfcqFCAB9Ep7l65irx4Dy8=";
+      "ruma-0.10.1" = "sha256-C/GJ0hDWJ9/grfjMuPSatJq2SrVkV0jxQlAAASkUWqg=";
    };
  };

@@ -27,10 +27,10 @@ stdenv.mkDerivation rec {
  };

  postPatch = ''
-    # raise neatvnc version bound to 0.8.0
+    # raise neatvnc version bound to < 0.9.0
    # https://gitlab.freedesktop.org/wayland/weston/-/issues/890
    substituteInPlace libweston/backend-vnc/meson.build \
-      --replace-fail "'neatvnc', version: ['>= 0.7.0', '< 0.8.0']" "'neatvnc', version: ['>= 0.7.0', '<= 0.8.0']"
+      --replace-fail "'neatvnc', version: ['>= 0.7.0', '< 0.8.0']" "'neatvnc', version: ['>= 0.7.0', '< 0.9.0']"
  '';

  depsBuildBuild = [ pkg-config ];
@@ -1,6 +1,13 @@
-{ lib, buildPackages, stdenvNoCC, autoreconfHook, fetchurl, fetchpatch }:
+{
+  lib,
+  stdenv,
+  buildPackages,
+  autoreconfHook,
+  fetchurl,
+  fetchpatch,
+}:

-stdenvNoCC.mkDerivation rec {
+stdenv.mkDerivation rec {
  pname = "alsa-firmware";
  version = "1.2.4";

@@ -17,12 +24,13 @@ stdenvNoCC.mkDerivation rec {
    })
  ];

-  depsBuildBuild = [ buildPackages.stdenv.cc ];
  nativeBuildInputs = [ autoreconfHook ];

-  configureFlags = [
-    "--with-hotplug-dir=$(out)/lib/firmware"
-  ];
+  configureFlags = [ "--with-hotplug-dir=$(out)/lib/firmware" ];
+
+  depsBuildBuild = lib.optional (
+    stdenv.buildPlatform != stdenv.hostPlatform || stdenv.hostPlatform.isAarch64
+  ) buildPackages.stdenv.cc;

  dontStrip = true;

@@ -1,100 +0,0 @@
-{
-  "name": "auto-changelog",
-  "version": "2.4.0",
-  "description": "Command line tool for generating a changelog from git tags and commit history",
-  "main": "./src/index.js",
-  "bin": {
-    "auto-changelog": "./src/index.js"
-  },
-  "engines": {
-    "node": ">=8.3"
-  },
-  "scripts": {
-    "lint": "standard --verbose | snazzy",
-    "lint-fix": "standard --fix",
-    "lint-markdown": "markdownlint README.md test/data/*.md",
-    "test": "cross-env NODE_ENV=test mocha -r @babel/register test",
-    "test-coverage": "cross-env NODE_ENV=test nyc mocha test",
-    "report-coverage": "nyc report --reporter=json && codecov -f coverage/coverage-final.json",
-    "preversion": "npm run lint && npm run test",
-    "version": "node src/index.js --package && git add CHANGELOG.md",
-    "generate-test-data": "cross-env NODE_ENV=test node scripts/generate-test-data.js"
-  },
-  "author": "Pete Cook <pete@cookpete.com> (https://github.com/cookpete)",
-  "homepage": "https://github.com/CookPete/auto-changelog",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/CookPete/auto-changelog.git"
-  },
-  "bugs": {
-    "url": "https://github.com/CookPete/auto-changelog/issues"
-  },
-  "keywords": [
-    "auto",
-    "automatic",
-    "changelog",
-    "change",
-    "log",
-    "generator",
-    "git",
-    "commit",
-    "commits",
-    "history"
-  ],
-  "license": "MIT",
-  "dependencies": {
-    "commander": "^7.2.0",
-    "handlebars": "^4.7.7",
-    "node-fetch": "^2.6.1",
-    "parse-github-url": "^1.0.2",
-    "semver": "^7.3.5"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.14.3",
-    "@babel/register": "^7.13.16",
-    "babel-plugin-istanbul": "^6.0.0",
-    "babel-plugin-rewire": "^1.2.0",
-    "chai": "^4.3.4",
-    "codecov": "^3.8.2",
-    "cross-env": "^7.0.3",
-    "markdownlint-cli": "^0.30.0",
-    "mocha": "^9.2.0",
-    "nyc": "^15.1.0",
-    "snazzy": "^9.0.0",
-    "standard": "^16.0.3"
-  },
-  "babel": {
-    "env": {
-      "test": {
-        "plugins": [
-          "istanbul",
-          "rewire"
-        ]
-      }
-    }
-  },
-  "standard": {
-    "ignore": [
-      "test/data/"
-    ]
-  },
-  "nyc": {
-    "all": true,
-    "include": "src",
-    "exclude": "src/index.js",
-    "sourceMap": false,
-    "instrument": false,
-    "report-dir": "./coverage",
-    "temp-dir": "./coverage/.nyc_output",
-    "require": [
-      "@babel/register"
-    ],
-    "reporter": [
-      "text",
-      "html"
-    ]
-  },
-  "auto-changelog": {
-    "breakingPattern": "Breaking change"
-  }
-}
@@ -1,25 +1,45 @@
 {
  lib,
-  mkYarnPackage,
+  stdenv,
  fetchYarnDeps,
-  fetchFromGitHub
-}: mkYarnPackage rec {
+  fetchFromGitHub,
+  yarnConfigHook,
+  npmHooks,
+  nodejs,
+  git,
+}:
+stdenv.mkDerivation (finalAttrs: {
  pname = "auto-changelog";
  version = "2.4.0";

  src = fetchFromGitHub {
    owner = "cookpete";
    repo = "auto-changelog";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
    hash = "sha256-qgJ/TVyViMhISt/EfCWV7XWQLXKTeZalGHFG905Ma5I=";
  };

-  packageJSON = ./package.json;
-  offlineCache = fetchYarnDeps {
-    yarnLock = "${src}/yarn.lock";
+  yarnOfflineCache = fetchYarnDeps {
+    yarnLock = "${finalAttrs.src}/yarn.lock";
    hash = "sha256-rP/Xt0txwfEUmGZ0CyHXSEG9zSMtv8wr5M2Na+6PbyQ=";
  };

+  nativeBuildInputs = [
+    yarnConfigHook
+    npmHooks.npmInstallHook
+    nodejs
+  ];
+
+  doCheck = true;
+
+  nativeCheckInputs = [ git ];
+
+  checkPhase = ''
+    runHook preCheck
+    yarn --offline run test -i -g 'compileTemplate'
+    runHook postCheck
+  '';
+
  meta = {
    description = "Command line tool for generating a changelog from git tags and commit history";
    homepage = "https://github.com/cookpete/auto-changelog";
@@ -28,4 +48,4 @@
    mainProgram = "auto-changelog";
    maintainers = with lib.maintainers; [ pyrox0 ];
  };
-}
+})
@@ -5,11 +5,11 @@

 let
  pname = "codux";
-  version = "15.30.0";
+  version = "15.32.0";

  src = fetchurl {
    url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage";
-    sha256 = "sha256-TMtZq58UswbhMgY3FCqVuZaSQ8b4mBYA9wEykMXF9Kc=";
+    sha256 = "sha256-Uk7QUbcYqbWgu6pKs4iiRwPJASZTDmN1Kv338ZKJQgk=";
  };

  appimageContents = appimageTools.extractType2 { inherit pname version src; };
@@ -1,33 +0,0 @@
-{
-  "name": "diagnostic-languageserver",
-  "version": "1.15.0",
-  "description": "diagnostic language server",
-  "main": "./lib/index.js",
-  "repository": "git@github.com:iamcco/diagnostic-languageserver.git",
-  "author": "iamcco <ooiss@qq.com>",
-  "license": "MIT",
-  "scripts": {
-    "build": "tsc -p ./",
-    "watch": "tsc -w -p ./"
-  },
-  "bin": {
-    "diagnostic-languageserver": "./bin/index.js"
-  },
-  "dependencies": {
-    "commander": "^5.1.0",
-    "find-up": "^4.1.0",
-    "lodash": "^4.17.15",
-    "rxjs": "^6.5.5",
-    "tempy": "^0.7.1",
-    "tslib": "^1.11.2",
-    "vscode-languageserver": "^6.1.1",
-    "vscode-languageserver-textdocument": "^1.0.1",
-    "vscode-uri": "^2.1.1"
-  },
-  "devDependencies": {
-    "@types/lodash": "^4.14.150",
-    "@types/node": "^11.11.3",
-    "ignore": "^5.1.8",
-    "typescript": "^3.8.3"
-  }
-}
@@ -1,41 +1,45 @@
 {
  lib,
-  mkYarnPackage,
+  stdenv,
  fetchYarnDeps,
  fetchFromGitHub,
-  nix-update-script
-}: mkYarnPackage rec {
+  nix-update-script,
+  yarnConfigHook,
+  yarnBuildHook,
+  npmHooks,
+  nodejs,
+}:
+stdenv.mkDerivation (finalAttrs: {
  pname = "diagnostic-languageserver";
  version = "1.15.0";

  src = fetchFromGitHub {
    owner = "iamcco";
    repo = "diagnostic-languageserver";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
    hash = "sha256-EFkvxMvtA5L6ZiDxrZxGnNAphNn/P3ra6ZrslplScZg=";
  };

-  packageJSON = ./package.json;
-  offlineCache = fetchYarnDeps {
-    yarnLock = "${src}/yarn.lock";
+  yarnOfflineCache = fetchYarnDeps {
+    yarnLock = "${finalAttrs.src}/yarn.lock";
    hash = "sha256-T8ppt8EDljtMhGp9i0VleU2Nw3tJexE2ufT6C4EtAz0=";
  };

-  buildPhase = ''
-    runHook preBuild
-    yarn --offline build
-    runHook postBuild
-  '';
-  doDist = false;
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    npmHooks.npmInstallHook
+    nodejs
+  ];

  passthru.updateScript = nix-update-script { };

  meta = {
    description = "General purpose Language Server that integrate with linter to support diagnostic features";
    homepage = "https://github.com/iamcco/diagnostic-languageserver";
-    changelog = "https://github.com/iamcco/diagnostic-languageserver/releases/tag/v${version}";
+    changelog = "https://github.com/iamcco/diagnostic-languageserver/releases/tag/v${finalAttrs.version}";
    license = lib.licenses.mit;
    mainProgram = "diagnostic-languageserver";
    maintainers = with lib.maintainers; [ pyrox0 ];
  };
-}
+})
@@ -5,10 +5,10 @@

 let
  pname = "fflogs";
-  version = "8.6.0";
+  version = "8.12.0";
  src = fetchurl {
    url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
-    hash = "sha256-fJOZHvnGOB+b67w2F8kJ+1hogc0DTmtujvNw3W8WWSU=";
+    hash = "sha256-2hpCcA/RN7fpNhaqMAyVC4d1fTRhp+lwYf/Wc0FjXxI=";
  };
  extracted = appimageTools.extractType2 { inherit pname version src; };
 in
@@ -14,13 +14,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "fluent-bit";
-  version = "3.1.3";
+  version = "3.1.4";

  src = fetchFromGitHub {
    owner = "fluent";
    repo = "fluent-bit";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-bRgRpCnMt20JEuKqW5VetW8HyMgjNuqEgoeBG7sm++Y=";
+    hash = "sha256-TXFVvnjEitEFwQAuqNCgV0xbABcDxGS9KfCUenKN448=";
  };

  # optional only to avoid linux rebuild
@@ -1,35 +0,0 @@
-{
-  "name": "get-graphql-schema",
-  "bin": "dist/index.js",
-  "files": [
-    "README.md",
-    "dist/"
-  ],
-  "version": "2.1.1",
-  "description": "Downloads the GraphQL Schema of an GraphQL endpoint URL",
-  "scripts": {
-    "build": "tsc",
-    "prepublish": "npm run build && chmod +x dist/index.js",
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/graphcool/get-graphql-schema.git"
-  },
-  "author": "Johannes Schickling <johannes@graph.cool>",
-  "license": "MIT",
-  "dependencies": {
-    "@types/chalk": "^0.4.31",
-    "@types/graphql": "^0.8.6",
-    "@types/minimist": "^1.2.0",
-    "@types/node": "^7.0.4",
-    "@types/node-fetch": "^1.6.7",
-    "chalk": "^1.1.3",
-    "graphql": "^0.9.1",
-    "minimist": "^1.2.0",
-    "node-fetch": "^1.6.3"
-  },
-  "devDependencies": {
-    "typescript": "^2.1.5"
-  }
-}
@@ -1,43 +1,41 @@
 {
  lib,
-  mkYarnPackage,
+  stdenv,
  fetchYarnDeps,
  fetchFromGitHub,
-  nodejs_22
-}: mkYarnPackage rec {
+  nodejs,
+  yarnConfigHook,
+  yarnBuildHook,
+  npmHooks,
+}:
+stdenv.mkDerivation (finalAttrs: {
  pname = "get-graphql-schema";
  version = "2.1.1";

  src = fetchFromGitHub {
    owner = "prisma-labs";
    repo = "get-graphql-schema";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
    hash = "sha256-ujc0LGAqmo4SmItm4VcbBOtmUvL6aV1ppMm4fMmuSRs=";
  };

-  packageJSON = ./package.json;
-  offlineCache = fetchYarnDeps {
-    yarnLock = "${src}/yarn.lock";
+  yarnOfflineCache = fetchYarnDeps {
+    yarnLock = "${finalAttrs.src}/yarn.lock";
    hash = "sha256-TZGNX8UHbolLyBmQNGTnFjgx3/3f2HNVQf/h9rIVJKs=";
  };

-  buildPhase = ''
-    runHook preBuild
-    yarn --offline build
-    runHook postBuild
-  '';
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    npmHooks.npmInstallHook
+    nodejs
+  ];

-  postFixup = ''
-    substituteInPlace $out/libexec/get-graphql-schema/deps/get-graphql-schema/dist/index.js \
-      --replace-fail "#!/usr/bin/env node" "#!${lib.getExe nodejs_22}"
-    chmod +x $out/bin/get-graphql-schema
-  '';
  meta = {
-    description = "Command line tool for generating a changelog from git tags and commit history";
-    homepage = "https://github.com/cookpete/auto-changelog";
-    changelog = "https://github.com/cookpete/auto-changelog/blob/master/CHANGELOG.md";
+    description = "Fetch and print the GraphQL schema from a GraphQL HTTP endpoint.";
+    homepage = "https://github.com/prisma-labs/get-graphql-schema";
    license = lib.licenses.mit;
    mainProgram = "get-graphql-schema";
    maintainers = with lib.maintainers; [ pyrox0 ];
  };
-}
+})
@@ -9,8 +9,8 @@ stdenv.mkDerivation {
  inherit meta pname version;

  src = fetchurl {
-    url = "https://releases.lmstudio.ai/mac/arm64/${version}/latest/LM-Studio-${version}-arm64.dmg";
-    hash = "sha256-zLbkb33Fmz2b+cloEINJybuj+i3ya+EVxb5CPWo/iXk=";
+    url = "https://releases.lmstudio.ai/mac/arm64/${version}/1/LM-Studio-${version}-arm64.dmg";
+    hash = "sha256-ZitdLHuGIH22Ohk7UWVz32BPFTj796HoR+5zEs5rh6E=";
  };

  nativeBuildInputs = [ undmg ];
@@ -6,8 +6,8 @@
 }:
 let
  src = fetchurl {
-    url = "https://releases.lmstudio.ai/linux/x86/${version}/beta/LM_Studio-${version}.AppImage";
-    hash = "sha256-Mui9QxK7UDnt6cWpYzsoy4hp7P46kx/53+em7Alu1BA=";
+    url = "https://files.lmstudio.ai/linux/${version}/beta/LM_Studio-${version}.AppImage";
+    hash = "sha256-zC8QQNsT1X8ICiYLy/jYMVp8w8NP7ghtVF06UMC4eOg=";
  };

  appimageContents = appimageTools.extractType2 { inherit pname version src; };
@@ -5,13 +5,13 @@
 }:
 let
  pname = "lmstudio";
-  version = "0.2.27";
+  version = "0.2.31";
  meta = {
    description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
    homepage = "https://lmstudio.ai/";
    license = lib.licenses.unfree;
    mainProgram = "lmstudio";
-    maintainers = with lib.maintainers; [ cig0 eeedean ];
+    maintainers = with lib.maintainers; [ cig0 eeedean crertel ];
    platforms = [ "x86_64-linux" "aarch64-darwin" ];
    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
  };
@@ -15,13 +15,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "maa-cli";
-  version = "0.4.8";
+  version = "0.4.9";

  src = fetchFromGitHub {
    owner = "MaaAssistantArknights";
    repo = "maa-cli";
    rev = "v${version}";
-    hash = "sha256-qsyMLYAcniYz3gHw2N0itewmEaeCfXHCNwKUq6zUwX0=";
+    hash = "sha256-klcS4SNMB5bAy4Gzk9NgbjbZL+7kh0lNXwIwJoXBbVU=";
  };

  nativeBuildInputs = [
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec {
    "core_installer"
  ];

-  cargoHash = "sha256-cmsr4XEccerQMo1ksBzJvA/xdx9sAJlyum+YCpFATOw=";
+  cargoHash = "sha256-C4NkJc7msyaUjQAsc0kbDwkr0cj3Esv+JjA24RvFsXA=";

  # maa-cli would only seach libMaaCore.so and resources in itself's path
  # https://github.com/MaaAssistantArknights/maa-cli/issues/67
@@ -31,13 +31,13 @@

 stdenv.mkDerivation rec {
  pname = "openvas-scanner";
-  version = "23.6.0";
+  version = "23.8.2";

  src = fetchFromGitHub {
    owner = "greenbone";
    repo = "openvas-scanner";
    rev = "refs/tags/v${version}";
-    hash = "sha256-VIjkrlE39eq8a7Kgj4QZSZ5R9bAnw0oodUc8m/4bSCQ=";
+    hash = "sha256-sHu6GF+T5Ce2aiGccv9uM+KdAWCLB8CCXujxgxhg4Ho=";
  };

  nativeBuildInputs = [
@@ -0,0 +1,49 @@
+{
+  lib,
+  darwin,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  openssl,
+  stdenv,
+}:
+let
+  inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;
+in
+rustPlatform.buildRustPackage rec {
+  pname = "railway";
+  version = "3.11.2";
+
+  src = fetchFromGitHub {
+    owner = "railwayapp";
+    repo = "cli";
+    rev = "v${version}";
+    hash = "sha256-uYe/8FwiMFwxpKF3wz+EOz7OUjYV37RUG7kf1ZCZX1c=";
+  };
+
+  cargoHash = "sha256-3CjKI3lIIa2H8F9Kc34NZr0D99D0aypFNwh+YPN/EZQ=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs =
+    [ openssl ]
+    ++ lib.optionals stdenv.isDarwin [
+      CoreServices
+      Security
+      SystemConfiguration
+    ];
+
+  OPENSSL_NO_VENDOR = 1;
+
+  meta = with lib; {
+    mainProgram = "railway";
+    description = "Railway.app CLI";
+    homepage = "https://github.com/railwayapp/cli";
+    changelog = "https://github.com/railwayapp/cli/releases/tag/v${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [
+      Crafter
+      techknowlogick
+    ];
+  };
+}
@@ -6,10 +6,10 @@
 }:
 let
  pname = "remnote";
-  version = "1.16.72";
+  version = "1.16.93";
  src = fetchurl {
    url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
-    hash = "sha256-BoKxQ8ngfShm7tC+ojgIR8krq82gJOdbGy8/K7yDRLM=";
+    hash = "sha256-2TyOEzB21RE/Ymz7LSyI5bnbiVXGos6vngbiphTEDSw=";
  };
  appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in
@@ -1,41 +1,53 @@
 {
  lib,
+  stdenv,
  buildGoModule,
  fetchFromGitHub,
-}: let
+  installShellFiles,
+}:
+let
  version = "0.27.2";
 in
-  buildGoModule {
-    pname = "step-cli";
-    inherit version;
+buildGoModule {
+  pname = "step-cli";
+  inherit version;

-    src = fetchFromGitHub {
-      owner = "smallstep";
-      repo = "cli";
-      rev = "refs/tags/v${version}";
-      hash = "sha256-9w7rUtlLa1kl9oVboWZWj4eoZh+pPdGsEEQDWYdEMns=";
-    };
+  src = fetchFromGitHub {
+    owner = "smallstep";
+    repo = "cli";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-9w7rUtlLa1kl9oVboWZWj4eoZh+pPdGsEEQDWYdEMns=";
+  };

-    ldflags = [
-      "-w"
-      "-s"
-      "-X=main.Version=${version}"
-    ];
+  ldflags = [
+    "-w"
+    "-s"
+    "-X=main.Version=${version}"
+  ];

-    preCheck = ''
-      # Tries to connect to smallstep.com
-      rm command/certificate/remote_test.go
-    '';
+  preCheck = ''
+    # Tries to connect to smallstep.com
+    rm command/certificate/remote_test.go
+  '';

-    vendorHash = "sha256-GD9TAvWqE3nvgVpoy/4CkkdVxliNMy+GNBXJtGSNVqo=";
+  vendorHash = "sha256-GD9TAvWqE3nvgVpoy/4CkkdVxliNMy+GNBXJtGSNVqo=";

-    meta = {
-      description = "Zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc";
-      homepage = "https://smallstep.com/cli/";
-      changelog = "https://github.com/smallstep/cli/blob/v${version}/CHANGELOG.md";
-      license = lib.licenses.asl20;
-      maintainers = with lib.maintainers; [isabelroses];
-      platforms = lib.platforms.linux ++ lib.platforms.darwin;
-      mainProgram = "step";
-    };
-  }
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd step \
+      --bash <($out/bin/step completion bash) \
+      --zsh <($out/bin/step completion zsh) \
+      --fish <($out/bin/step completion fish)
+  '';
+
+  meta = {
+    description = "Zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc";
+    homepage = "https://smallstep.com/cli/";
+    changelog = "https://github.com/smallstep/cli/blob/v${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ isabelroses ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    mainProgram = "step";
+  };
+}
@@ -9,7 +9,6 @@
 , gmp
 , libiconv
 , xz
-, gcc-unwrapped
 , readline
 , zlib
 , python3
@@ -3,7 +3,6 @@
 , gnat
 , gprbuild
 , fetchFromGitHub
-, xmlada
 , which
 }:

@@ -5,7 +5,6 @@
 , gprbuild
 , which
 , gnatcoll-core
-, xmlada
 , component
 # components built by this derivation other components depend on
 , gnatcoll-sql
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, fetchgit, fetchHex, rebar3WithPlugins, rebar3-nix, rebar3Relx
+{ fetchFromGitHub, fetchgit, fetchHex, rebar3Relx
 , buildRebar3, writeScript, lib }:

 let
@@ -1,5 +1,5 @@
 { fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper
-, stdenv, writeScript, lib, erlang }:
+, stdenv, writeScript, lib }:
 let
  version = "0.52.0";
  owner = "erlang-ls";
@@ -9,7 +9,6 @@
 , boost
 , libunwind
 , ninja
-, cacert
 }:

 let
@@ -1,5 +1,4 @@
 { stdenv
-, stdenvNoCC
 , callPackage
 , lib
 , writeShellScript
@@ -1,5 +1,4 @@
 { clangStdenv
-, stdenvNoCC
 , lib
 , fetchurl
 , dotnetCorePackages
@@ -20,7 +19,6 @@
 , swiftPackages
 , openssl
 , getconf
-, makeWrapper
 , python3
 , xmlstarlet
 , nodejs
@@ -1,6 +1,5 @@
 { gccStdenv, lib, pkgs,
-  git, openssl, autoconf, gcc, coreutils, gnused, gnugrep,
-  makeStaticLibraries,
+  git, openssl, autoconf, coreutils,
  src, version, git-version,
  stampYmd ? 0, stampHms ? 0,
  gambit-support,
@@ -1,4 +1,4 @@
-{ pkgs, gccStdenv, lib, coreutils,
+{ gccStdenv, lib, coreutils,
  openssl, zlib, sqlite,
  version, git-version, src,
  gambit-support,
@@ -1,4 +1,4 @@
-{ callPackage, fetchFromGitHub, gambit-unstable, gambit-support, pkgs, gccStdenv }:
+{ callPackage, fetchFromGitHub, gambit-support }:

 callPackage ./build.nix rec {
  version = "0.18.1";
@@ -1,4 +1,4 @@
-{ pkgs, lib, fetchFromGitHub, gerbilPackages, leveldb, ... }:
+{ pkgs, lib, fetchFromGitHub, leveldb, ... }:

 {
  pname = "gerbil-leveldb";
@@ -1,4 +1,4 @@
-{ pkgs, lib, fetchFromGitHub, gerbilPackages, libxml2, ... }:
+{ pkgs, lib, fetchFromGitHub, libxml2, ... }:

 {
  pname = "gerbil-libxml";
@@ -1,4 +1,4 @@
-{ pkgs, lib, fetchFromGitHub, gerbilPackages, libyaml, ... }:
+{ pkgs, lib, fetchFromGitHub, libyaml, ... }:

 {
  pname = "gerbil-libyaml";
@@ -1,4 +1,4 @@
-{ pkgs, lib, fetchFromGitHub, gerbilPackages, lmdb, ... }:
+{ pkgs, lib, fetchFromGitHub, lmdb, ... }:

 {
  pname = "gerbil-lmdb";
@@ -1,4 +1,4 @@
-{ pkgs, lib, fetchFromGitHub, gerbilPackages, mariadb-connector-c, ... }:
+{ pkgs, lib, fetchFromGitHub, mariadb-connector-c, ... }:

 {
  pname = "gerbil-mysql";
@@ -1,4 +1,4 @@
-{ callPackage, fetchFromGitHub, gambit-unstable, gambit-support, pkgs, gccStdenv }:
+{ callPackage, fetchFromGitHub, gambit-support }:

 callPackage ./build.nix rec {
  version = "unstable-2023-12-06";
@@ -17,7 +17,6 @@
 , gcc
 , lib
 , ghcjsDepOverrides ? (_:_:{})
-, haskell
 , linkFarm
 , buildPackages
 }:
@@ -1,5 +1,4 @@
 { lib
-, pkgs
 , stdenv
 , fetchFromGitHub
 }:
@@ -16,7 +16,6 @@
 , texinfo
 , texliveBasic
 # test
-, writeText
 }:

 stdenv.mkDerivation rec {
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, version, hashes }:
+{ stdenv, fetchurl, version, hashes }:
 let
  toGoKernel = platform:
    if platform.isDarwin then "darwin"
@@ -6,7 +6,6 @@
 , python3
 , jdk
 , git
-, libcef
 , rsync
 , lib
 , ant
@@ -2,7 +2,6 @@
 , pkgsHostTarget
 , cmake
 , makeWrapper
-, fetchpatch
 , mkDerivation
 , fetchFromGitHub
 , alex
@@ -1,4 +1,4 @@
-{ lib, pkgs, stdenv, fetchzip, jdk17_headless }:
+{ lib, stdenv, fetchzip, jdk17_headless }:

 stdenv.mkDerivation rec {
  pname = "lfc";
@@ -69,7 +69,7 @@ let
      # `clang-pseudo-gen`: https://github.com/llvm/llvm-project/commit/cd2292ef824591cc34cc299910a3098545c840c7
      "-DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${buildLlvmTools.libclang.dev}/bin/clang-tidy-confusable-chars-gen"
      "-DCLANG_PSEUDO_GEN=${buildLlvmTools.libclang.dev}/bin/clang-pseudo-gen"
-    ]);
+    ]) ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "-DCLANG_DEFAULT_CXX_STDLIB=ON";

    postPatch = ''
      # Make sure clang passes the correct location of libLTO to ld64
@@ -473,7 +473,8 @@ let
            ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
          nixSupport.cc-ldflags = lib.optionals (
            !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD
-          ) [ "-L${targetLlvmLibraries.libunwind}/lib" ];
+          ) [ "-L${targetLlvmLibraries.libunwind}/lib" ]
+            ++ lib.optional (lib.versionAtLeast metadata.release_version "17") "--undefined-version";
        }
      );

@@ -731,6 +732,7 @@ let

      compiler-rt-no-libc = callPackage ./compiler-rt {
        patches = compiler-rtPatches;
+        doFakeLibgcc = stdenv.hostPlatform.useLLVM or false;
        stdenv =
          if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform then
            stdenv
@@ -6,7 +6,6 @@
 , src ? null
 , patches ? []
 , runCommand
-, substitute
 , cmake
 , lndir
 , ninja
@@ -14,7 +14,6 @@
 , clang-unwrapped
 , perl
 , pkg-config
-, xcbuild
 , version
 }:
 let
@@ -3,7 +3,6 @@
 , mrustc
 , mrustc-minicargo
 , llvm_12
-, llvmPackages_12
 , libffi
 , cmake
 , python3
@@ -1,4 +1,4 @@
-{ lib, stdenv, pkgsBuildHost, pkgsHostHost
+{ lib, stdenv, pkgsHostHost
 , file, curl, pkg-config, python3, openssl, cmake, zlib
 , installShellFiles, makeWrapper, rustPlatform, rustc
 , CoreFoundation, Security
@@ -1,4 +1,4 @@
-{ stdenv, lib, rustPlatform, rustc, Security, patchelf }:
+{ stdenv, lib, rustPlatform, rustc, Security }:

 rustPlatform.buildRustPackage {
  pname = "clippy";
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, llvmPackages_16, ncurses, cmake, libxml2
-, symlinkJoin, breakpointHook, cudaPackages, enableCUDA ? false
+, symlinkJoin, cudaPackages, enableCUDA ? false
 , libffi, libobjc, libpfm, Cocoa, Foundation
 }:

@@ -1,6 +1,5 @@
 { stdenv
 , lib
-, buildPackages
 , buildGoModule
 , fetchFromGitHub
 , makeWrapper
@@ -1,5 +1,5 @@
 { lib, mkCoqDerivation
-, coq, flocq, compcert
+, coq, flocq
 , ocamlPackages, fetchpatch, makeWrapper, coq2html
 , stdenv, tools ? stdenv.cc
 , version ? null
@@ -1,4 +1,4 @@
-{ which, lib, mkCoqDerivation, coq, bignums, version ? null }:
+{ lib, mkCoqDerivation, coq, bignums, version ? null }:

 mkCoqDerivation {

@@ -1,5 +1,4 @@
-{ lib, bash, autoconf, automake,
-  mkCoqDerivation, coq, version ? null }:
+{ lib, bash, autoconf, mkCoqDerivation, coq, version ? null }:

 mkCoqDerivation {
  pname = "flocq";
@@ -1,4 +1,4 @@
-{ which, lib, mkCoqDerivation, autoconf, coq, flocq, version ? null }:
+{ lib, mkCoqDerivation, autoconf, coq, flocq, version ? null }:

 mkCoqDerivation {
  pname = "gappalib";
@@ -1,4 +1,4 @@
-{ lib, mkCoqDerivation, which, coq, version ? null }:
+{ lib, mkCoqDerivation, coq, version ? null }:

 mkCoqDerivation {
  pname = "ltac2";
@@ -12,7 +12,7 @@

 { lib, ncurses, graphviz, lua, fetchzip,
  mkCoqDerivation, withDoc ? false, single ? false,
-  coqPackages, coq, hierarchy-builder, version ? null }@args:
+  coq, hierarchy-builder, version ? null }@args:

 let
  repo  = "math-comp";
@@ -1,6 +1,6 @@
-{ lib, fetchzip,
+{ lib,
  mkCoqDerivation, single ? false,
-  coqPackages, coq, equations, version ? null }@args:
+  coq, equations, version ? null }@args:

 let
  repo  = "metacoq";
@@ -1,4 +1,4 @@
-{ lib, stdenv, pkgs, mkCoqDerivation, coq, veriT, zchaff, fetchurl, cvc5, version ? null }:
+{ lib, pkgs, mkCoqDerivation, coq, veriT, zchaff, fetchurl, cvc5, version ? null }:

 let
  # version of veriT that works with SMTCoq
@@ -1,4 +1,4 @@
-{ lib, mkCoqDerivation, coq, mathcomp, zorns-lemma, version ? null }:
+{ lib, mkCoqDerivation, coq, zorns-lemma, version ? null }:

 mkCoqDerivation rec {
  pname = "topology";
@@ -1,4 +1,4 @@
-{ metaFetch, mkCoqDerivation, coq, lib, glib, adwaita-icon-theme, wrapGAppsHook3,
+{ metaFetch, coq, lib, glib, adwaita-icon-theme, wrapGAppsHook3,
  version ? null }:

 let ocamlPackages = coq.ocamlPackages;
@@ -6,7 +6,6 @@
  backendStdenv,
  fetchurl,
  lib,
-  lndir,
  markForCudatoolkitRootHook,
  flags,
  stdenv,
@@ -1,4 +1,4 @@
-{ bossa, git, fetchFromGitHub }:
+{ bossa, fetchFromGitHub }:

 bossa.overrideAttrs (attrs: rec {
  pname = "bossa-arduino";
@@ -5,7 +5,6 @@
 , thrift
 , cmake
 , pkg-config
-, doxygen
 , swig
 , python
 , logLib
@@ -8,13 +8,13 @@

 stdenv.mkDerivation {
  pname = "hare-ev";
-  version = "0-unstable-2024-07-07";
+  version = "0-unstable-2024-07-11";

  src = fetchFromSourcehut {
    owner = "~sircmpwn";
    repo = "hare-ev";
-    rev = "aa01cdd0ba226ed9a4c5e6031e6aa7158aa05c9a";
-    hash = "sha256-xq6d2+BbHk2iLg50mtqXqhkky/P9GeRAulSD7ouMnrA=";
+    rev = "ed023beb4b4db88e22f608aa001682ac18cad230";
+    hash = "sha256-bZWVrxk3CMAHRnizRAqgT5wmRQaQ/Ua3AIAR5HZxMbE=";
  };

  nativeCheckInputs = [ hareHook ];
@@ -1,4 +1,4 @@
-{ runCommand, haskellPackages, lib, all-cabal-hashes, writeShellScript }:
+{ runCommand, haskellPackages, lib, all-cabal-hashes }:
 let
  # Checks if the version looks like a Haskell PVP version which is the format
  # Hackage enforces. This will return false if the version strings is empty or
@@ -7,7 +7,6 @@
 , makeWrapper
 , ncurses
 , python3
-, runCommand
 , zlib

 # *NOT* from LLVM 9!
@@ -1,6 +1,5 @@
 { lib, stdenv, octave, buildEnv
 , makeWrapper, texinfo
-, octavePackages
 , wrapOctave
 , computeRequiredOctavePackages
 , extraLibs ? []
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , rustPlatform
 , fetchFromGitHub
 }:
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, autoreconfHook }:
+{ stdenv, lib, fetchFromGitHub }:

 stdenv.mkDerivation ( finalAttrs: {
  pname = "blst";
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, writeShellScript
 , cmake
 , ogre
 , freetype
@@ -4,7 +4,6 @@
 , cmake
 , freedvSupport ? false
 , lpcnetfreedv
-, codec2
 }:

 stdenv.mkDerivation rec {
@@ -1,5 +1,4 @@
 { runCommand
-, writeText
 , libxslt
 , dbus
 , findXMLCatalogs
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, installShellFiles, cmake }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }:

 stdenv.mkDerivation rec {
  pname = "doctest";
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, autoreconfHook, mpiCheckPhaseHook
-, gfortran, perl, mpi, blas, lapack, scalapack, openssh
+, perl, mpi, blas, lapack, scalapack, openssh
 # CPU optimizations
 , avxSupport ? stdenv.hostPlatform.avxSupport
 , avx2Support ? stdenv.hostPlatform.avx2Support
@@ -1,6 +1,5 @@
 { lib
 , stdenv
-, overrideSDK
 , fetchFromGitHub
 , boost
 , cmake
@@ -10,7 +10,6 @@
 , json-glib
 , gobject-introspection
 , gtk-doc
-, pkgs
 , docbook-xsl-nons
 }:

@@ -17,7 +17,7 @@
 , buildPackages

 # this is just for tests (not in the closure of any regular package)
-, coreutils, dbus, tzdata
+, dbus, tzdata
 , desktop-file-utils, shared-mime-info
 , darwin
 , makeHardcodeGsettingsPatch
@@ -8,7 +8,6 @@
 , ninja
 , gtk-doc
 , docbook-xsl-nons
-, docbook_xml_dtd_43
 , docbook_xml_dtd_45
 , pkg-config
 , libffi
@@ -14,7 +14,6 @@
 , libxml2
 , lua5_4
 , liboauth
-, libgdata
 , libmediaart
 , grilo
 , gst_all_1
@@ -30,7 +30,6 @@
 , libepoxy
 , libxkbcommon
 , libxml2
-, gmp
 , gnome
 , gsettings-desktop-schemas
 , sassc
@@ -17,7 +17,6 @@
 , glib
 , cairo
 , pango
-, pandoc
 , gdk-pixbuf
 , gobject-introspection
 , fribidi
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip, atk, cairo, dcompiler, gdk-pixbuf, gnome, gst_all_1, librsvg
+{ lib, stdenv, fetchzip, atk, cairo, dcompiler, gdk-pixbuf, gst_all_1, librsvg
 , glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }:

 let
@@ -41,7 +41,6 @@
 , libgdata
 , libmsgraph
 , python3
-, python3Packages
 , gsettings-desktop-schemas
 }:

@@ -12,7 +12,6 @@
 , pkg-config
 , boost
 , libtool
-, perlPackages
 , pythonBindings ? true
 , tclBindings ? true
 , perlBindings ? stdenv.buildPlatform == stdenv.hostPlatform
@@ -6,7 +6,6 @@
 , cmake
 , hwloc
 , gperftools
-, ninja
 , pkg-config
 , python3
 }:
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip, libGLU, libGL, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }:
+{ lib, stdenv, fetchzip, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }:

 let
  common = import ./common.nix { inherit fetchzip; };
@@ -2,7 +2,6 @@
  mkDerivation,
  extra-cmake-modules,
  libical,
-  qtbase
 }:

 mkDerivation {
@@ -1,7 +1,7 @@
 {
  mkDerivation,
  extra-cmake-modules, gettext, python3,
-  qtbase, qtdeclarative, qtscript,
+  qtdeclarative, qtscript,
 }:

 mkDerivation {
@@ -1,7 +1,7 @@
 {
  mkDerivation,
  extra-cmake-modules,
-  qtquickcontrols2, qtbase,
+  qtquickcontrols2,
 }:

 mkDerivation {
@@ -17,7 +17,6 @@
 , db
 , libedit
 , pam
-, krb5
 , libmicrohttpd
 , cjson

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake, libxml2, python3 }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake, python3 }:

 let
  version = "0.3.4";
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, pkg-config, libtool, perl, bsdbuild, gettext, mandoc
-, libpng, libjpeg, libXinerama, freetype, SDL, libGLU, libGL
+, libpng, libjpeg, libXinerama, freetype, SDL, libGL
 , libsndfile, portaudio, libmysqlclient, fontconfig
 }:

@@ -1,7 +1,6 @@
 { stdenv
 , lib
 , fetchFromGitHub
-, srcOnly
 , cmake
 , ninja
 , pkg-config
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, makeWrapper
+{ lib, stdenv, fetchFromGitHub
 , autoreconfHook, autoconf-archive
 , installShellFiles, libiconv }:

--- a/Show More
+++ b/Show More