From 4cc4fd6ff1b9f32f519c3ed7acc3b8b98b410bec Mon Sep 17 00:00:00 2001 From: Jack N Date: Tue, 3 Sep 2024 18:11:41 -0700 Subject: [PATCH 01/87] bitwarden-desktop: fix system authentication --- .../dont-auto-setup-biometrics.patch | 13 +++++++++++++ pkgs/by-name/bi/bitwarden-desktop/package.nix | 11 +++++++++++ .../by-name/bi/bitwarden-desktop/set-exe-path.patch | 13 +++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch create mode 100644 pkgs/by-name/bi/bitwarden-desktop/set-exe-path.patch diff --git a/pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch b/pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch new file mode 100644 index 00000000000000..245395899afec9 --- /dev/null +++ b/pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch @@ -0,0 +1,13 @@ +diff --git a/apps/desktop/src/platform/main/biometric/biometric.unix.main.ts b/apps/desktop/src/platform/main/biometric/biometric.unix.main.ts +index e2428d9d12..de4e9e1e62 100644 +--- a/apps/desktop/src/platform/main/biometric/biometric.unix.main.ts ++++ b/apps/desktop/src/platform/main/biometric/biometric.unix.main.ts +@@ -109,7 +109,7 @@ export default class BiometricUnixMain implements OsBiometricService { + // The user needs to manually set up the polkit policy outside of the sandbox + // since we allow access to polkit via dbus for the sandboxed clients, the authentication works from + // the sandbox, once the policy is set up outside of the sandbox. +- return isLinux() && !isSnapStore() && !isFlatpak(); ++ return false; + } + + async osBiometricsSetup(): Promise { diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index a45712bfe8019f..8dd09aa0be920a 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -40,11 +40,15 @@ in buildNpmPackage rec { patches = [ ./electron-builder-package-lock.patch + ./dont-auto-setup-biometrics.patch + ./set-exe-path.patch # ensures `app.getPath("exe")` returns our wrapper, not ${electron}/bin/electron ]; postPatch = '' # remove code under unfree license rm -r bitwarden_license + + substituteInPlace apps/desktop/src/main.ts --replace-fail '%%exePath%%' "$out/bin/bitwarden" ''; nodejs = nodejs_20; @@ -174,6 +178,13 @@ in buildNpmPackage rec { --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 + # Extract the polkit policy file from the multiline string in the source code. + # This may break in the future but its better than copy-pasting it manually. + mkdir -p $out/share/polkit-1/actions/ + pushd apps/desktop/src/platform/main/biometric + awk '/const polkitPolicy = `/{gsub(/^.*`/, ""); print; str=1; next} str{if (/`;/) str=0; gsub(/`;/, ""); print}' biometric.unix.main.ts > $out/share/polkit-1/actions/com.bitwarden.Bitwarden.policy + popd + pushd apps/desktop/resources/icons for icon in *.png; do dir=$out/share/icons/hicolor/"''${icon%.png}"/apps diff --git a/pkgs/by-name/bi/bitwarden-desktop/set-exe-path.patch b/pkgs/by-name/bi/bitwarden-desktop/set-exe-path.patch new file mode 100644 index 00000000000000..deba588d11bc81 --- /dev/null +++ b/pkgs/by-name/bi/bitwarden-desktop/set-exe-path.patch @@ -0,0 +1,13 @@ +diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts +index 86d07440a7..be9fa6b4ab 100644 +--- a/apps/desktop/src/main.ts ++++ b/apps/desktop/src/main.ts +@@ -80,6 +80,8 @@ export class Main { + appDataPath = path.join(process.env.SNAP_USER_DATA, "appdata"); + } + ++ app.setPath("exe", "%%exePath%%"); ++ + app.on("ready", () => { + // on ready stuff... + }); From d0c7f81ae80bc05ecfd16e84e31404b334665a76 Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Thu, 24 Oct 2024 01:48:00 +0800 Subject: [PATCH 02/87] biliass: 2.1.0 -> 2.1.1 --- pkgs/development/python-modules/biliass/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix index 8fbdd5541f787a..a0d3ed2b1e93aa 100644 --- a/pkgs/development/python-modules/biliass/default.nix +++ b/pkgs/development/python-modules/biliass/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "biliass"; - version = "2.1.0"; + version = "2.1.1"; pyproject = true; src = fetchFromGitHub { owner = "yutto-dev"; repo = "yutto"; rev = "refs/tags/biliass@${version}"; - hash = "sha256-PlZD+988KdJqYC1I1K7i+YAH1Tzr6zfXcJFR/M4mQRA="; + hash = "sha256-Pn6z4iDxNcLVoY4xk7v0zc8hmajWEaOYFDEw5HEYxl4="; }; sourceRoot = "source/packages/biliass"; @@ -30,7 +30,7 @@ buildPythonPackage rec { src ; sourceRoot = "${sourceRoot}/${cargoRoot}"; - hash = "sha256-DMKUbJSVME5siSPybdO5bOluPn3obVq1/6822uoSsDQ="; + hash = "sha256-7jv/Q98qyn2xnv4rNK9ifGhxo9n3X90iF9CTyqc6sHU="; }; nativeBuildInputs = with rustPlatform; [ From 56ad9c0e01a01cfa03656522c495d139c054b330 Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Thu, 24 Oct 2024 01:48:19 +0800 Subject: [PATCH 03/87] yutto: 2.0.0-rc.4 -> 2.0.0-rc.5 --- pkgs/by-name/yu/yutto/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yu/yutto/package.nix b/pkgs/by-name/yu/yutto/package.nix index 8c08f19adf4f97..ccb6e05c22cb7b 100644 --- a/pkgs/by-name/yu/yutto/package.nix +++ b/pkgs/by-name/yu/yutto/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "yutto"; - version = "2.0.0-rc.4"; + version = "2.0.0-rc.5"; pyproject = true; disabled = python3Packages.pythonOlder "3.9"; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { owner = "yutto-dev"; repo = "yutto"; rev = "refs/tags/v${version}"; - hash = "sha256-QP3sbZANsyYeZmLZSwQz6E1eysCVojRYHu/z9Szdb6U="; + hash = "sha256-QaApCkZtHjvGB6FOfic9wEH7rUlukwmxnrDaHkbvyJo="; }; build-system = with python3Packages; [ hatchling ]; From 19ff2dc86ffae4f31d00a3030a9a506d881576bb Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sat, 14 Sep 2024 11:32:28 +0200 Subject: [PATCH 04/87] zitadel.console: remove mkYarnPackage usage --- pkgs/by-name/zi/zitadel/console.nix | 59 +++++++++--------- pkgs/by-name/zi/zitadel/package.json | 92 ---------------------------- 2 files changed, 31 insertions(+), 120 deletions(-) delete mode 100644 pkgs/by-name/zi/zitadel/package.json diff --git a/pkgs/by-name/zi/zitadel/console.nix b/pkgs/by-name/zi/zitadel/console.nix index d73d34b8d71742..1346de248b855c 100644 --- a/pkgs/by-name/zi/zitadel/console.nix +++ b/pkgs/by-name/zi/zitadel/console.nix @@ -1,13 +1,20 @@ -{ generateProtobufCode -, version -, zitadelRepo +{ + generateProtobufCode, + version, + zitadelRepo, }: -{ mkYarnPackage -, fetchYarnDeps -, grpc-gateway -, protoc-gen-grpc-web -, protoc-gen-js +{ + lib, + stdenv, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + nodejs, + + grpc-gateway, + protoc-gen-grpc-web, + protoc-gen-js, }: let @@ -24,36 +31,32 @@ let hash = "sha256-n6BJ1gSSm66yOGdHcSea/nQbjiHZX2YX2zbFT4o75/4="; }; in -mkYarnPackage rec { - name = "zitadel-console"; +stdenv.mkDerivation { + pname = "zitadel-console"; inherit version; - src = "${zitadelRepo}/console"; + src = zitadelRepo; + + sourceRoot = "${zitadelRepo.name}/console"; - packageJSON = ./package.json; offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; + yarnLock = "${zitadelRepo}/console/yarn.lock"; hash = "sha256-MWATjfhIbo3cqpzOdXP52f/0Td60n99OTU1Qk6oWmXU="; }; - postPatch = '' - substituteInPlace src/styles.scss \ - --replace-fail "/node_modules/flag-icons" "flag-icons" - - substituteInPlace angular.json \ - --replace-fail "./node_modules/tinycolor2" "../../node_modules/tinycolor2" - ''; + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + nodejs + ]; - buildPhase = '' - ln -s "${zitadelRepo}/docs" deps/docs - mkdir deps/console/src/app/proto - cp -r ${protobufGenerated}/* deps/console/src/app/proto/ - yarn --offline build + preBuild = '' + cp -r ${protobufGenerated} src/app/proto ''; installPhase = '' - cp -r deps/console/dist/console $out + runHook preInstall + cp -r dist/console "$out" + runHook postInstall ''; - - doDist = false; } diff --git a/pkgs/by-name/zi/zitadel/package.json b/pkgs/by-name/zi/zitadel/package.json deleted file mode 100644 index 70390d87e1d7ba..00000000000000 --- a/pkgs/by-name/zi/zitadel/package.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "name": "console", - "version": "0.0.0", - "scripts": { - "ng": "ng", - "start": "node prebuild.development.js && ng serve", - "build": "ng build --configuration production --base-href=/ui/console/", - "prelint": "npm run generate", - "lint": "ng lint && prettier --check src", - "lint:fix": "prettier --write src", - "generate": "buf generate ../proto --include-imports --include-wkt" - }, - "private": true, - "dependencies": { - "@angular/animations": "^16.2.5", - "@angular/cdk": "^16.2.4", - "@angular/common": "^16.2.5", - "@angular/compiler": "^16.2.5", - "@angular/core": "^16.2.5", - "@angular/forms": "^16.2.5", - "@angular/material": "^16.2.4", - "@angular/material-moment-adapter": "^16.2.4", - "@angular/platform-browser": "^16.2.5", - "@angular/platform-browser-dynamic": "^16.2.5", - "@angular/router": "^16.2.5", - "@angular/service-worker": "^16.2.5", - "@ctrl/ngx-codemirror": "^6.1.0", - "@fortawesome/angular-fontawesome": "^0.13.0", - "@fortawesome/fontawesome-svg-core": "^6.4.2", - "@fortawesome/free-brands-svg-icons": "^6.4.2", - "@grpc/grpc-js": "^1.9.3", - "@netlify/framework-info": "^9.8.10", - "@ngx-translate/core": "^15.0.0", - "angular-oauth2-oidc": "^15.0.1", - "angularx-qrcode": "^16.0.0", - "buffer": "^6.0.3", - "codemirror": "^5.65.8", - "cors": "^2.8.5", - "file-saver": "^2.0.5", - "flag-icons": "^7.1.0", - "google-proto-files": "^4.0.0", - "google-protobuf": "^3.21.2", - "grpc-web": "^1.4.1", - "i18n-iso-countries": "^7.7.0", - "libphonenumber-js": "^1.10.49", - "material-design-icons-iconfont": "^6.1.1", - "moment": "^2.29.4", - "ngx-color": "^9.0.0", - "opentype.js": "^1.3.4", - "rxjs": "~7.8.0", - "tinycolor2": "^1.6.0", - "tslib": "^2.6.2", - "uuid": "^9.0.1", - "zone.js": "~0.13.3" - }, - "devDependencies": { - "@angular-devkit/build-angular": "^16.2.2", - "@angular-eslint/builder": "16.2.0", - "@angular-eslint/eslint-plugin": "16.2.0", - "@angular-eslint/eslint-plugin-template": "16.2.0", - "@angular-eslint/schematics": "16.2.0", - "@angular-eslint/template-parser": "16.2.0", - "@angular/cli": "^16.2.2", - "@angular/compiler-cli": "^16.2.5", - "@angular/language-service": "^16.2.5", - "@bufbuild/buf": "^1.23.1", - "@types/file-saver": "^2.0.7", - "@types/google-protobuf": "^3.15.3", - "@types/jasmine": "~5.1.4", - "@types/jasminewd2": "~2.0.13", - "@types/jsonwebtoken": "^9.0.5", - "@types/node": "^20.7.0", - "@types/opentype.js": "^1.3.8", - "@types/qrcode": "^1.5.2", - "@types/uuid": "^9.0.7", - "@typescript-eslint/eslint-plugin": "^5.59.11", - "@typescript-eslint/parser": "^5.60.1", - "codelyzer": "^6.0.2", - "eslint": "^8.50.0", - "jasmine-core": "~4.6.0", - "jasmine-spec-reporter": "~7.0.0", - "karma": "^6.4.2", - "karma-chrome-launcher": "^3.2.0", - "karma-coverage-istanbul-reporter": "^3.0.3", - "karma-jasmine": "^5.1.0", - "karma-jasmine-html-reporter": "^2.1.0", - "prettier": "^3.1.1", - "prettier-plugin-organize-imports": "^3.2.4", - "protractor": "~7.0.0", - "typescript": "^5.1.6" - } -} From 833eebc021af388fd917d74bb68bb6c76c6caa96 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 6 Nov 2024 02:35:07 +0100 Subject: [PATCH 05/87] python312Packages.bidsschematools: init at 0.11.3 --- .../bidsschematools/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/bidsschematools/default.nix diff --git a/pkgs/development/python-modules/bidsschematools/default.nix b/pkgs/development/python-modules/bidsschematools/default.nix new file mode 100644 index 00000000000000..c27bbfd85f3dc5 --- /dev/null +++ b/pkgs/development/python-modules/bidsschematools/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchPypi, + setuptools, + click, + pyyaml, + jsonschema, +}: + +buildPythonPackage rec { + pname = "bidsschematools"; + version = "0.11.3"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + pname = "bidsschematools"; + inherit version; + hash = "sha256-GvR3pOXXmdpjH2xdL+trhLW6ZdsTpEWUdNUlVQ4gFXo="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + click + pyyaml + jsonschema + ]; + + pythonImportsCheck = [ + "bidsschematools" + ]; + + meta = { + description = "Python tools for working with the BIDS schema"; + homepage = "https://github.com/bids-standard/bids-specification/tree/master/tools/schemacode"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ wegank ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6f9e572d92a34c..f0ef277cf7b7af 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1601,6 +1601,8 @@ self: super: with self; { bids-validator = callPackage ../development/python-modules/bids-validator { }; + bidsschematools = callPackage ../development/python-modules/bidsschematools { }; + biliass = callPackage ../development/python-modules/biliass { }; bilibili-api-python = callPackage ../development/python-modules/bilibili-api-python { }; From cd2d4944bedfac8de96e70844c25cc3719219fb7 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 6 Nov 2024 02:35:20 +0100 Subject: [PATCH 06/87] python312Packages.bids-validator: fix build --- .../python-modules/bids-validator/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index 3162ba276cf741..061e85b734cc32 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -7,6 +7,9 @@ # build-system setuptools, versioneer, + + # dependencies + bidsschematools, }: buildPythonPackage rec { @@ -14,7 +17,7 @@ buildPythonPackage rec { version = "1.14.7.post0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "bids_validator"; @@ -22,21 +25,22 @@ buildPythonPackage rec { hash = "sha256-5gBaUAt1+KlhWT+2fUYIUQfa2xFvWaXDtSSqBpeUW2Y="; }; - nativeBuildInputs = [ + build-system = [ setuptools versioneer ]; - # needs packages which are not available in nixpkgs - doCheck = false; + dependencies = [ + bidsschematools + ]; pythonImportsCheck = [ "bids_validator" ]; - meta = with lib; { + meta = { description = "Validator for the Brain Imaging Data Structure"; homepage = "https://github.com/bids-standard/bids-validator"; changelog = "https://github.com/bids-standard/bids-validator/releases/tag/v${version}"; - license = licenses.mit; - maintainers = [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ wegank ]; }; } From 221b2afe734658cc09f2b9fdec0cc1783990b0f0 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 6 Nov 2024 02:35:30 +0100 Subject: [PATCH 07/87] python312Packages.pybids: fix build --- pkgs/development/python-modules/pybids/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index 80db75b9551a8a..aaf3efd234cd93 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -12,6 +12,7 @@ nibabel, bids-validator, sqlalchemy, + universal-pathlib, pytestCheckHook, versioneer, }: @@ -31,12 +32,12 @@ buildPythonPackage rec { "sqlalchemy" ]; - nativeBuildInputs = [ + build-system = [ setuptools versioneer ] ++ versioneer.optional-dependencies.toml; - propagatedBuildInputs = [ + dependencies = [ bids-validator click formulaic @@ -46,6 +47,7 @@ buildPythonPackage rec { pandas scipy sqlalchemy + universal-pathlib ]; pythonImportsCheck = [ "bids" ]; @@ -64,12 +66,12 @@ buildPythonPackage rec { "test_to_df" ]; - meta = with lib; { + meta = { description = "Python tools for querying and manipulating BIDS datasets"; homepage = "https://github.com/bids-standard/pybids"; changelog = "https://github.com/bids-standard/pybids/blob/${version}/CHANGELOG.rst"; - license = licenses.mit; - maintainers = [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ wegank ]; mainProgram = "pybids"; }; } From 65835ab8d2a4339d9a7404b28ab1ea6e536a3531 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 7 Nov 2024 00:58:03 +0100 Subject: [PATCH 08/87] python312Packages.templateflow: fix build --- .../python-modules/templateflow/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/templateflow/default.nix b/pkgs/development/python-modules/templateflow/default.nix index f00ce991ea3e23..32f922065e56c3 100644 --- a/pkgs/development/python-modules/templateflow/default.nix +++ b/pkgs/development/python-modules/templateflow/default.nix @@ -4,6 +4,8 @@ fetchFromGitHub, pythonOlder, setuptools-scm, + hatchling, + hatch-vcs, nipreps-versions, pybids, requests, @@ -24,8 +26,13 @@ buildPythonPackage rec { hash = "sha256-COS767n2aC65m6AJihZb4NhJ4ZK9YkTAZR7Hcnc/LMs="; }; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ + build-system = [ + setuptools-scm + hatchling + hatch-vcs + ]; + + dependencies = [ nipreps-versions pybids requests @@ -33,7 +40,12 @@ buildPythonPackage rec { ]; doCheck = false; # most tests try to download data - #pythonImportsCheck = [ "templateflow" ]; # touches $HOME/.cache, hence needs https://github.com/NixOS/nixpkgs/pull/120300 + + postFixup = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ "templateflow" ]; meta = with lib; { homepage = "https://templateflow.org/python-client"; From 5106cce978472c09277608cc88f444486fa9acd5 Mon Sep 17 00:00:00 2001 From: schrobingus Date: Thu, 7 Nov 2024 13:53:46 -0800 Subject: [PATCH 09/87] maintainers: add schrobingus --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a844c0b45998b3..f44e2b0485be87 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19517,6 +19517,13 @@ githubId = 5104601; name = "schnusch"; }; + schrobingus = { + email = "brent.monning.jr@gmail.com"; + name = "Brent Monning"; + github = "schrobingus"; + githubId = 72168352; + matrix = "@schrobingus:matrix.org"; + }; Schweber = { github = "Schweber"; githubId = 64630479; From 51fc0761d20831aed4a05c2f6916d90fefdcc87f Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 8 Nov 2024 07:28:42 +0000 Subject: [PATCH 10/87] syshud: 0-unstable-2024-09-26 -> 0-unstable-2024-11-04 --- pkgs/by-name/sy/syshud/package.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sy/syshud/package.nix b/pkgs/by-name/sy/syshud/package.nix index e8989bcf47b1d7..38aad6a345b26d 100644 --- a/pkgs/by-name/sy/syshud/package.nix +++ b/pkgs/by-name/sy/syshud/package.nix @@ -14,18 +14,22 @@ stdenv.mkDerivation (finalAttrs: { pname = "syshud"; - version = "0-unstable-2024-09-26"; + version = "0-unstable-2024-11-04"; src = fetchFromGitHub { owner = "System64fumo"; repo = "syshud"; - rev = "0b6e4958d8ea66b54bc67f0b5aa005fa3eaa4f6f"; - hash = "sha256-cyE7ZxesAmnepW7kI6b9Gp7R/v+yG2//EQAj4/X6c+c="; + rev = "157b725a3f29d67f16c25fb3062b62ad6fec4e15"; + hash = "sha256-q04xYOdnnyUyiFc72Gzk65fWzQgYSOACPUXIk7kvIP8="; }; postPatch = '' substituteInPlace Makefile \ - --replace-fail 'pkg-config' ''${PKG_CONFIG} + --replace-fail pkg-config ''${PKG_CONFIG} + substituteInPlace src/main.cpp \ + --replace-fail /usr/share/sys64/hud/config.conf $out/share/sys64/hud/config.conf + substituteInPlace src/window.cpp \ + --replace-fail /usr/share/sys64/hud/style.css $out/share/sys64/hud/style.css ''; nativeBuildInputs = [ From d3f1862053ebbcd52ad6185b82b04166920bc935 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Fri, 8 Nov 2024 02:49:43 +0800 Subject: [PATCH 11/87] redlib: 0.35.1-unstable-2024-09-22 -> 0.35.1-unstable-2024-11-01 Diff: https://github.com/redlib-org/redlib/compare/d5f137ce47de39e2c8c4ed09d13ba1f809bee560...f03bdcf472d32d51a1093528071dc329b348379d --- pkgs/by-name/re/redlib/package.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/re/redlib/package.nix b/pkgs/by-name/re/redlib/package.nix index 51c80078e3725b..7db03a2b0153e0 100644 --- a/pkgs/by-name/re/redlib/package.nix +++ b/pkgs/by-name/re/redlib/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage rec { pname = "redlib"; - version = "0.35.1-unstable-2024-09-22"; + version = "0.35.1-unstable-2024-11-01"; src = fetchFromGitHub { owner = "redlib-org"; repo = "redlib"; - rev = "d5f137ce47de39e2c8c4ed09d13ba1f809bee560"; - hash = "sha256-12XKeBCKciKummI43oTbKGkkY0mghA82ir2C3LhnwSs="; + rev = "f03bdcf472d32d51a1093528071dc329b348379d"; + hash = "sha256-fbk0m20NpaUCWvH/l9hfmx+VKw4U3pkTkXdAeHL7bHs="; }; - cargoHash = "sha256-XSmeJAK18J9WxrG5orFbAB9hWVLQQ50oB223oHT3OOk="; + cargoHash = "sha256-PNqecQSx0Q+K3bBfbOJYWPdl7JdUTDQ4f95RUuW0vPw="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security @@ -35,6 +35,9 @@ rustPlatform.buildRustPackage rec { "--skip=test_obfuscated_share_link" "--skip=test_share_link_strip_json" "--skip=test_localization_popular" + "--skip=test_private_sub" + "--skip=test_banned_sub" + "--skip=test_gated_sub" # subreddit.rs "--skip=test_fetching_subreddit" @@ -48,6 +51,7 @@ rustPlatform.buildRustPackage rec { "--skip=test_oauth_client" "--skip=test_oauth_client_refresh" "--skip=test_oauth_token_exists" + "--skip=test_oauth_headers_len" ]; env = { From 731e8265608fe0f2bec8b22ae2c77b07b3407453 Mon Sep 17 00:00:00 2001 From: Jun Matsushita Date: Fri, 8 Nov 2024 19:10:21 +0100 Subject: [PATCH 12/87] release.nix: add haskell.packages.ghc910.haskell-language-server to release --- pkgs/top-level/release.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index bf69d13c98f1a8..bb8707cca6b6f2 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -288,6 +288,7 @@ let "ghc94" "ghc96" "ghc98" + "ghc910" ] (compilerName: { inherit (packagePlatforms pkgs.haskell.packages.${compilerName}) haskell-language-server; From d777c8158f2f96706078b0e5888c956a4f21f613 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Fri, 8 Nov 2024 14:28:45 -0800 Subject: [PATCH 13/87] immersed: nixfmt --- pkgs/by-name/im/immersed/darwin.nix | 20 ++++++++---- pkgs/by-name/im/immersed/linux.nix | 48 +++++++++++++++------------- pkgs/by-name/im/immersed/package.nix | 38 ++++++++++++++++------ 3 files changed, 67 insertions(+), 39 deletions(-) diff --git a/pkgs/by-name/im/immersed/darwin.nix b/pkgs/by-name/im/immersed/darwin.nix index c43d92ccfda1a2..e156cc493c8e50 100644 --- a/pkgs/by-name/im/immersed/darwin.nix +++ b/pkgs/by-name/im/immersed/darwin.nix @@ -1,13 +1,19 @@ -{ stdenv -, pname -, version -, src -, meta -, undmg +{ + stdenv, + pname, + version, + src, + meta, + undmg, }: stdenv.mkDerivation { - inherit pname version src meta; + inherit + pname + version + src + meta + ; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/by-name/im/immersed/linux.nix b/pkgs/by-name/im/immersed/linux.nix index fb989ef291c330..0447090c8231e9 100644 --- a/pkgs/by-name/im/immersed/linux.nix +++ b/pkgs/by-name/im/immersed/linux.nix @@ -1,9 +1,10 @@ -{ pname -, version -, src -, meta -, appimageTools -, libgpg-error +{ + pname, + version, + src, + meta, + appimageTools, + libgpg-error, }: let @@ -22,23 +23,24 @@ appimageTools.wrapAppImage rec { inherit pname version meta; src = src'; - extraPkgs = pkgs: with pkgs; [ - libgpg-error - fontconfig - libGL - mesa - wayland - pipewire - fribidi - harfbuzz - freetype - libthai - e2fsprogs - zlib - libp11 - xorg.libX11 - xorg.libSM - ]; + extraPkgs = + pkgs: with pkgs; [ + libgpg-error + fontconfig + libGL + mesa + wayland + pipewire + fribidi + harfbuzz + freetype + libthai + e2fsprogs + zlib + libp11 + xorg.libX11 + xorg.libSM + ]; multiArch = true; } diff --git a/pkgs/by-name/im/immersed/package.nix b/pkgs/by-name/im/immersed/package.nix index ece3cb1dbce3bc..6073d60fc309c6 100644 --- a/pkgs/by-name/im/immersed/package.nix +++ b/pkgs/by-name/im/immersed/package.nix @@ -1,8 +1,9 @@ -{ lib -, appimageTools -, callPackage -, fetchurl -, stdenv +{ + lib, + appimageTools, + callPackage, + fetchurl, + stdenv, }: let pname = "immersed"; @@ -26,11 +27,30 @@ let description = "VR coworking platform"; homepage = "https://immersed.com"; license = licenses.unfree; - maintainers = with maintainers; [ haruki7049 pandapip1 ]; + maintainers = with maintainers; [ + haruki7049 + pandapip1 + ]; platforms = builtins.attrNames sources; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; -in if stdenv.hostPlatform.isDarwin -then callPackage ./darwin.nix { inherit pname version src meta; } -else callPackage ./linux.nix { inherit pname version src meta; } +in +if stdenv.hostPlatform.isDarwin then + callPackage ./darwin.nix { + inherit + pname + version + src + meta + ; + } +else + callPackage ./linux.nix { + inherit + pname + version + src + meta + ; + } From 77cbf2a1b176be674f1d12ce1b1eb01f33ca102e Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sat, 9 Nov 2024 22:46:01 +0100 Subject: [PATCH 14/87] trimage: migrate to pkgs/by-name --- .../tr/trimage/package.nix} | 26 ++++++++++--------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 14 insertions(+), 14 deletions(-) rename pkgs/{applications/graphics/trimage/default.nix => by-name/tr/trimage/package.nix} (88%) diff --git a/pkgs/applications/graphics/trimage/default.nix b/pkgs/by-name/tr/trimage/package.nix similarity index 88% rename from pkgs/applications/graphics/trimage/default.nix rename to pkgs/by-name/tr/trimage/package.nix index 6f38e22de14f69..594930775a1c62 100644 --- a/pkgs/applications/graphics/trimage/default.nix +++ b/pkgs/by-name/tr/trimage/package.nix @@ -1,20 +1,22 @@ -{ lib -, stdenv -, fetchFromGitHub +{ + lib, + stdenv, + fetchFromGitHub, -, python3 -, installShellFiles -, makeWrapper -, wrapQtAppsHook + python3, + installShellFiles, + makeWrapper, + qt5, -, advancecomp -, jpegoptim -, optipng -, pngcrush + advancecomp, + jpegoptim, + optipng, + pngcrush, }: let pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 ]); + binPath = lib.makeBinPath [ advancecomp jpegoptim @@ -36,7 +38,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ installShellFiles makeWrapper - wrapQtAppsHook + qt5.wrapQtAppsHook ]; dontWrapQtApps = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3226511390c35..0d0f20c9221534 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1143,8 +1143,6 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreAudio CoreGraphics Foundation IOKit MediaPlayer Security; }; - trimage = callPackage ../applications/graphics/trimage { inherit (qt5) wrapQtAppsHook; }; - ufolint = with python3Packages; toPythonApplication ufolint; valeronoi = qt6Packages.callPackage ../tools/misc/valeronoi { }; From f92bb6938fc791d16c5d68a0a86aaf4e0c2ba768 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 10 Nov 2024 15:58:55 +0800 Subject: [PATCH 15/87] pflask: nixfmt --- pkgs/by-name/pf/pflask/package.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pf/pflask/package.nix b/pkgs/by-name/pf/pflask/package.nix index 53ed1e5a342ca7..3ca204b709c87d 100644 --- a/pkgs/by-name/pf/pflask/package.nix +++ b/pkgs/by-name/pf/pflask/package.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, python3, wafHook }: +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + python3, + wafHook, +}: stdenv.mkDerivation rec { pname = "pflask"; @@ -21,7 +28,10 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ python3 wafHook ]; + nativeBuildInputs = [ + python3 + wafHook + ]; postInstall = '' mkdir -p $out/bin From bfa332cb9fc1e7ff45608ef1cdf94f5e20ac9d28 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 10 Nov 2024 15:59:55 +0800 Subject: [PATCH 16/87] pflask: add bot-wxt1221 as maintainers --- pkgs/by-name/pf/pflask/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pf/pflask/package.nix b/pkgs/by-name/pf/pflask/package.nix index 3ca204b709c87d..1596498cd9aca1 100644 --- a/pkgs/by-name/pf/pflask/package.nix +++ b/pkgs/by-name/pf/pflask/package.nix @@ -7,13 +7,13 @@ wafHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation ({ pname = "pflask"; version = "unstable-2018-01-23"; src = fetchFromGitHub { owner = "ghedo"; - repo = pname; + repo = "pflask"; rev = "9ac31ffe2ed29453218aac89ae992abbd6e7cc69"; hash = "sha256-bAKPUj/EipZ98kHbZiFZZI3hLVMoQpCrYKMmznpSDhg="; }; @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { homepage = "https://ghedo.github.io/pflask/"; license = lib.licenses.bsd2; platforms = lib.platforms.linux; - maintainers = [ ]; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; }; -} +}) From 797b0cd53a05561bb3a401524bff9e4e13fefef7 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 10 Nov 2024 16:00:44 +0800 Subject: [PATCH 17/87] pflask: pin to python311 --- pkgs/by-name/pf/pflask/package.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pf/pflask/package.nix b/pkgs/by-name/pf/pflask/package.nix index 1596498cd9aca1..f823d49201f870 100644 --- a/pkgs/by-name/pf/pflask/package.nix +++ b/pkgs/by-name/pf/pflask/package.nix @@ -5,9 +5,10 @@ fetchpatch, python3, wafHook, + waf, }: -stdenv.mkDerivation ({ +stdenv.mkDerivation (finalAttrs: { pname = "pflask"; version = "unstable-2018-01-23"; @@ -28,9 +29,20 @@ stdenv.mkDerivation ({ }) ]; + waf-version = "2.0.27"; + nativeBuildInputs = [ python3 - wafHook + (wafHook.override { + waf = waf.overrideAttrs (old: { + version = finalAttrs.waf-version; + src = fetchFromGitHub { + inherit (old.src) owner repo; + rev = "waf-${finalAttrs.waf-version}"; + hash = "sha256-GeEoD5CHubwR4ndGk7J7czEf0hWtPQr88TqJDPqeK0s="; + }; + }); + }) ]; postInstall = '' From 0f3a58d8b80fb3b004ba382c4dfdb7724171811c Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 4 Oct 2024 19:54:58 +0800 Subject: [PATCH 18/87] choparp: init at 0-unstable-2021-04-23 --- pkgs/by-name/ch/choparp/package.nix | 45 +++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/ch/choparp/package.nix diff --git a/pkgs/by-name/ch/choparp/package.nix b/pkgs/by-name/ch/choparp/package.nix new file mode 100644 index 00000000000000..600f6e4ee35ab7 --- /dev/null +++ b/pkgs/by-name/ch/choparp/package.nix @@ -0,0 +1,45 @@ +{ + stdenv, + lib, + fetchFromGitHub, + unstableGitUpdater, + libpcap, + installShellFiles, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "choparp"; + version = "0-unstable-2021-04-23"; + + src = fetchFromGitHub { + owner = "quinot"; + repo = "choparp"; + rev = "e9f0b81135d81cb0416504a7e695e158f4a5285e"; + hash = "sha256-0VZj7Hkn/aiRddWdBzDAXdOdxJZvwd+KaN9ddrrBjm8="; + }; + + nativeBuildInputs = [ + installShellFiles + ]; + + buildPhase = '' + runHook preBuild + + mkdir -p $out/bin + $CC -o $out/bin/choparp src/choparp.c -lpcap -L${lib.getLib libpcap}/lib -I${lib.getDev libpcap}/include + installManPage src/choparp.8 + + runHook postBuild + ''; + + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; + + meta = { + homepage = "https://github.com/quinot/choparp"; + description = "Proxy ARP daemon"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = lib.platforms.unix; + license = lib.licenses.bsd3; + mainProgram = "choparp"; + }; +}) From f4a92cf0be80149234a4a841554b73e4f92a0da4 Mon Sep 17 00:00:00 2001 From: "Samuel Hierholzer (Adfinis AG)" Date: Mon, 11 Nov 2024 15:42:25 +0100 Subject: [PATCH 19/87] oils-for-unix: 0.23.0 -> 0.24.0 --- pkgs/by-name/oi/oils-for-unix/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/oi/oils-for-unix/package.nix b/pkgs/by-name/oi/oils-for-unix/package.nix index b33c93ac6d4faa..d6c2067146a978 100644 --- a/pkgs/by-name/oi/oils-for-unix/package.nix +++ b/pkgs/by-name/oi/oils-for-unix/package.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "oils-for-unix"; - version = "0.23.0"; + version = "0.24.0"; src = fetchurl { url = "https://www.oilshell.org/download/oils-for-unix-${version}.tar.gz"; - hash = "sha256-ydNcp4tKCO6vrIvGQ54rtAvM0zcNsiJkh/rtY0ihdSE="; + hash = "sha256-30r+2U1TswOngs4DgMOT1g9tIZIe8qJZIrQAgordmPM="; }; postPatch = '' From f08afe73cb8b817982a09c949c150cea99234c15 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 11 Nov 2024 15:46:20 +0100 Subject: [PATCH 20/87] circom: fix hash --- pkgs/by-name/ci/circom/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ci/circom/package.nix b/pkgs/by-name/ci/circom/package.nix index f16bf84c4f5db9..7302e4f1848282 100644 --- a/pkgs/by-name/ci/circom/package.nix +++ b/pkgs/by-name/ci/circom/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { owner = "iden3"; repo = "circom"; rev = "v${version}"; - hash = "sha256-OxfqbsxSIy0tLDMfDmdCZeMb2LCSG7I+Vm9RHb7tXFc="; + hash = "sha256-jaBtBFvGRTRImXQNM+FXr23XQqC5V7hRa9SZAgB/K4c="; }; cargoHash = "sha256-KmUTlzRRmtD9vKJmh0MSUQxN8gz4qnp9fLs5Z0Lmypw="; From 1f983dbc47767a90b62f4e64fae6284d8b75a3ab Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sun, 10 Nov 2024 22:05:47 +0900 Subject: [PATCH 21/87] typos: add passthru.tests.version typos: avoid multi-line style typos: simplify version test with the default values Co-authored-by: Pol Dellaiera Co-authored-by: Isabel --- pkgs/by-name/ty/typos/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix index 69daacd13866d6..03c593cdbe44d5 100644 --- a/pkgs/by-name/ty/typos/package.nix +++ b/pkgs/by-name/ty/typos/package.nix @@ -2,6 +2,8 @@ lib, rustPlatform, fetchFromGitHub, + testers, + typos, }: rustPlatform.buildRustPackage rec { @@ -17,6 +19,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-WuYAE2msctMf+7C1h5pNGyjrEInnT6PxfZ94bZhzB5w="; + passthru = { + tests.version = testers.testVersion { package = typos; }; + }; + meta = with lib; { description = "Source code spell checker"; mainProgram = "typos"; From 8bc113158cd286ad0145ffef80b293546d2fc5c3 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sun, 10 Nov 2024 22:06:39 +0900 Subject: [PATCH 22/87] typos: add updateScript --- pkgs/by-name/ty/typos/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix index 03c593cdbe44d5..392961d372200c 100644 --- a/pkgs/by-name/ty/typos/package.nix +++ b/pkgs/by-name/ty/typos/package.nix @@ -3,6 +3,7 @@ rustPlatform, fetchFromGitHub, testers, + nix-update-script, typos, }: @@ -21,6 +22,8 @@ rustPlatform.buildRustPackage rec { passthru = { tests.version = testers.testVersion { package = typos; }; + + updateScript = nix-update-script { }; }; meta = with lib; { From 4035c1ad059d5cab76b8322aed55e79b02c0cebf Mon Sep 17 00:00:00 2001 From: benaryorg Date: Thu, 7 Nov 2024 03:46:23 +0000 Subject: [PATCH 23/87] phash: compilation fixes This includes a patch already sent upstream that fixes compilation with Werror due to a lacking return, as well as adding a linker flag to include a threaded version of a library. The fftw3_threads part stems from cimg requiring this apparently when linking the examples: > test_texthash.cpp:(.text.startup+0x1c1): undefined reference to `fftw_init_threads' I wouldn't know how to patch this upstream, however other packages in nixpkgs seem to provide the LDFLAGS too. Signed-off-by: benaryorg --- .../0001-proper-pthread-return-value.patch | 40 +++++++++++++++++++ pkgs/by-name/ph/phash/package.nix | 9 ++++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/ph/phash/0001-proper-pthread-return-value.patch diff --git a/pkgs/by-name/ph/phash/0001-proper-pthread-return-value.patch b/pkgs/by-name/ph/phash/0001-proper-pthread-return-value.patch new file mode 100644 index 00000000000000..52e929e57951f6 --- /dev/null +++ b/pkgs/by-name/ph/phash/0001-proper-pthread-return-value.patch @@ -0,0 +1,40 @@ +From 6ac2f207e8d8e1d16ee73198abccc64d20c5f608 Mon Sep 17 00:00:00 2001 +From: benaryorg +Date: Thu, 7 Nov 2024 03:27:52 +0000 +Subject: [PATCH 1/2] proper pthread return value + +*pthread_create(3)* states that the ways for a pthread to exit includes: + +> It returns from start_routine(). This is equivalent to calling pthread_exit(3) with the value supplied in the return statement. + +This "retval" is a void pointer which can be anything. +In this case, since all threads are always joined with a parameter of NULL for the `void**` to store the retval this isn't really relevant for providing a meaningful return value. +However a `void*` function must return a `void*`, otherwise compilers will complain: + +> pHash.cpp:416:1: warning: no return statement in function returning non-void [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wreturn-type-Wreturn-type8;;] + +Therefore returning NULL seems reasonable. +As for the choice of NULL vs. nullptr or any other value, NULL is already widely used in the file. + +Long story short: this fixes a compiler warning/error. + +Signed-off-by: benaryorg +--- + src/pHash.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/pHash.cpp b/src/pHash.cpp +index 07b03ad..23bbbf3 100644 +--- a/src/pHash.cpp ++++ b/src/pHash.cpp +@@ -417,6 +417,7 @@ void *ph_image_thread(void *p) + memcpy(dp->hash, &hash, sizeof(hash)); + dp->hash_length = 1; + } ++ return NULL; + } + + DP** ph_dct_image_hashes(char *files[], int count, int threads) +-- +2.44.1 + diff --git a/pkgs/by-name/ph/phash/package.nix b/pkgs/by-name/ph/phash/package.nix index 73097db5ccc6ca..8f40cd0d9a71c9 100644 --- a/pkgs/by-name/ph/phash/package.nix +++ b/pkgs/by-name/ph/phash/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cimg, imagemagick }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, cimg, imagemagick }: stdenv.mkDerivation rec { pname = "pHash"; @@ -24,6 +24,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-frISiZ89ei7XfI5F2nJJehfQZsk0Mlb4n91q/AiZ2vA="; }; + NIX_LDFLAGS = "-lfftw3_threads"; + + patches = [ + # proper pthread return value (https://github.com/clearscene/pHash/pull/20) + ./0001-proper-pthread-return-value.patch + ]; + meta = with lib; { description = "Compute the perceptual hash of an image"; license = licenses.gpl3; From 861af0f60d4ec26334d68d3a277ef51952818e85 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Mon, 11 Nov 2024 21:08:15 +0000 Subject: [PATCH 24/87] brave: darwin support --- pkgs/by-name/br/brave/make-brave.nix | 122 ++++++++++++++++----------- pkgs/by-name/br/brave/package.nix | 9 +- pkgs/by-name/br/brave/update.sh | 21 +++-- 3 files changed, 94 insertions(+), 58 deletions(-) diff --git a/pkgs/by-name/br/brave/make-brave.nix b/pkgs/by-name/br/brave/make-brave.nix index d0fe9afde4dc0c..709e5326f5f59a 100644 --- a/pkgs/by-name/br/brave/make-brave.nix +++ b/pkgs/by-name/br/brave/make-brave.nix @@ -50,6 +50,10 @@ xorg, zlib, + # Darwin dependencies + unzip, + makeWrapper, + # command line arguments which are always set e.g "--disable-gpu" commandLineArgs ? "", @@ -76,7 +80,6 @@ version, hash, url, - platform, }: let @@ -161,16 +164,21 @@ stdenv.mkDerivation { dontConfigure = true; dontBuild = true; dontPatchELF = true; - doInstallCheck = true; - - nativeBuildInputs = [ - dpkg - # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 - # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset. - (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) - ]; + doInstallCheck = stdenv.hostPlatform.isLinux; + + nativeBuildInputs = + lib.optionals stdenv.hostPlatform.isLinux [ + dpkg + # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 + # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset. + (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + unzip + makeWrapper + ]; - buildInputs = [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ # needed for GSETTINGS_SCHEMAS_PATH glib gsettings-desktop-schemas @@ -181,57 +189,73 @@ stdenv.mkDerivation { adwaita-icon-theme ]; - unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; + unpackPhase = + if stdenv.hostPlatform.isLinux then + "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner" + else + "unzip $src"; - installPhase = '' - runHook preInstall + installPhase = + lib.optionalString stdenv.hostPlatform.isLinux '' + runHook preInstall - mkdir -p $out $out/bin + mkdir -p $out $out/bin - cp -R usr/share $out - cp -R opt/ $out/opt + cp -R usr/share $out + cp -R opt/ $out/opt - export BINARYWRAPPER=$out/opt/brave.com/brave/brave-browser + export BINARYWRAPPER=$out/opt/brave.com/brave/brave-browser - # Fix path to bash in $BINARYWRAPPER - substituteInPlace $BINARYWRAPPER \ - --replace /bin/bash ${stdenv.shell} + # Fix path to bash in $BINARYWRAPPER + substituteInPlace $BINARYWRAPPER \ + --replace /bin/bash ${stdenv.shell} - ln -sf $BINARYWRAPPER $out/bin/brave + ln -sf $BINARYWRAPPER $out/bin/brave - for exe in $out/opt/brave.com/brave/{brave,chrome_crashpad_handler}; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${rpath}" $exe - done + for exe in $out/opt/brave.com/brave/{brave,chrome_crashpad_handler}; do + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${rpath}" $exe + done - # Fix paths - substituteInPlace $out/share/applications/brave-browser.desktop \ - --replace /usr/bin/brave-browser-stable $out/bin/brave - substituteInPlace $out/share/gnome-control-center/default-apps/brave-browser.xml \ - --replace /opt/brave.com $out/opt/brave.com - substituteInPlace $out/share/menu/brave-browser.menu \ - --replace /opt/brave.com $out/opt/brave.com - substituteInPlace $out/opt/brave.com/brave/default-app-block \ - --replace /opt/brave.com $out/opt/brave.com + # Fix paths + substituteInPlace $out/share/applications/brave-browser.desktop \ + --replace /usr/bin/brave-browser-stable $out/bin/brave + substituteInPlace $out/share/gnome-control-center/default-apps/brave-browser.xml \ + --replace /opt/brave.com $out/opt/brave.com + substituteInPlace $out/share/menu/brave-browser.menu \ + --replace /opt/brave.com $out/opt/brave.com + substituteInPlace $out/opt/brave.com/brave/default-app-block \ + --replace /opt/brave.com $out/opt/brave.com - # Correct icons location - icon_sizes=("16" "24" "32" "48" "64" "128" "256") + # Correct icons location + icon_sizes=("16" "24" "32" "48" "64" "128" "256") - for icon in ''${icon_sizes[*]} - do - mkdir -p $out/share/icons/hicolor/$icon\x$icon/apps - ln -s $out/opt/brave.com/brave/product_logo_$icon.png $out/share/icons/hicolor/$icon\x$icon/apps/brave-browser.png - done + for icon in ''${icon_sizes[*]} + do + mkdir -p $out/share/icons/hicolor/$icon\x$icon/apps + ln -s $out/opt/brave.com/brave/product_logo_$icon.png $out/share/icons/hicolor/$icon\x$icon/apps/brave-browser.png + done - # Replace xdg-settings and xdg-mime - ln -sf ${xdg-utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings - ln -sf ${xdg-utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime + # Replace xdg-settings and xdg-mime + ln -sf ${xdg-utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings + ln -sf ${xdg-utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime - runHook postInstall - ''; + runHook postInstall + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + runHook preInstall + + mkdir -p $out/{Applications,bin} + + cp -r "Brave Browser.app" $out/Applications/ + + makeWrapper "$out/Applications/Brave Browser.app/Contents/MacOS/Brave Browser" $out/bin/brave + + runHook postInstall + ''; - preFixup = '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' # Add command line args to wrapGApp. gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : ${rpath} @@ -290,6 +314,8 @@ stdenv.mkDerivation { platforms = [ "aarch64-linux" "x86_64-linux" + "aarch64-darwin" + "x86_64-darwin" ]; mainProgram = "brave"; }; diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index 79bc50213e4d28..758a5578af8b35 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -14,6 +14,14 @@ let url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; hash = "sha256-fJczTAra+j8+veicz4lIyKSNJyxJK4q9gpZoAyQwkxQ="; }; + aarch64-darwin = { + url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; + hash = "sha256-kDiZ6NKQ+v1jBEUexItKTCKFsbnOtSzPmGEVWI5JoXI="; + }; + x86_64-darwin = { + url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip"; + hash = "sha256-/yl4k/XvmL7oBW1XU4wVNHfa07Z+XMHYTkkufhDCXUc="; + }; }; archive = @@ -27,6 +35,5 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) ( archive // { inherit pname version; - platform = stdenv.system; } ) diff --git a/pkgs/by-name/br/brave/update.sh b/pkgs/by-name/br/brave/update.sh index 306f4d12e53b6a..b6443b64eae50d 100755 --- a/pkgs/by-name/br/brave/update.sh +++ b/pkgs/by-name/br/brave/update.sh @@ -5,15 +5,10 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" latestVersion="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/brave/brave-browser/releases/latest" | jq -r '.tag_name' | sed 's/^v//')" -hashAarch64="$(nix hash to-sri --type sha256 \ - $(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-arm64/Packages \ - | sed -r -n 's/^SHA256: (.*)/\1/p' | head -n1) -)" - -hashAmd64="$(nix hash to-sri --type sha256 \ - $(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-amd64/Packages \ - | sed -r -n 's/^SHA256: (.*)/\1/p' | head -n1) -)" +hashAarch64="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-browser_${latestVersion}_arm64.deb")")" +hashAmd64="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-browser_${latestVersion}_amd64.deb")")" +hashAarch64Darwin="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-v${latestVersion}-darwin-arm64.zip")")" +hashAmd64Darwin="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-v${latestVersion}-darwin-x64.zip")")" cat > $SCRIPT_DIR/package.nix << EOF # Expression generated by update.sh; do not edit it by hand! @@ -32,6 +27,14 @@ let url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_amd64.deb"; hash = "${hashAmd64}"; }; + aarch64-darwin = { + url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-v\${version}-darwin-arm64.zip"; + hash = "${hashAarch64Darwin}"; + }; + x86_64-darwin = { + url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-v\${version}-darwin-x64.zip"; + hash = "${hashAmd64Darwin}"; + }; }; archive = From c00f07313fb04e9d2233273fa5067065c5ffd9d1 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Mon, 11 Nov 2024 21:08:35 +0000 Subject: [PATCH 25/87] brave: add darwin maintainer --- pkgs/by-name/br/brave/make-brave.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/br/brave/make-brave.nix b/pkgs/by-name/br/brave/make-brave.nix index 709e5326f5f59a..48b1ad51bb105a 100644 --- a/pkgs/by-name/br/brave/make-brave.nix +++ b/pkgs/by-name/br/brave/make-brave.nix @@ -310,6 +310,7 @@ stdenv.mkDerivation { jefflabonte nasirhm buckley310 + matteopacini ]; platforms = [ "aarch64-linux" From 7a26f140f9ecdc288bfbb23ca716296f9c02c2cb Mon Sep 17 00:00:00 2001 From: Radik Islamov Date: Tue, 12 Nov 2024 02:47:13 +0500 Subject: [PATCH 26/87] python312Packages.nlpo3: init at 1.4.0-unstable-2024-11-11 --- .../python-modules/nlpo3/default.nix | 74 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 76 insertions(+) create mode 100644 pkgs/development/python-modules/nlpo3/default.nix diff --git a/pkgs/development/python-modules/nlpo3/default.nix b/pkgs/development/python-modules/nlpo3/default.nix new file mode 100644 index 00000000000000..a88dceb9f8b439 --- /dev/null +++ b/pkgs/development/python-modules/nlpo3/default.nix @@ -0,0 +1,74 @@ +{ + lib, + stdenv, + buildPythonPackage, + pythonAtLeast, + unittestCheckHook, + rustPlatform, + fetchFromGitHub, + rustc, + cargo, + libiconv, + setuptools, + setuptools-rust, +}: + +buildPythonPackage rec { + pname = "nlpo3"; + version = "1.4.0-unstable-2024-11-11"; + pyproject = true; + + src = fetchFromGitHub { + owner = "PyThaiNLP"; + repo = "nlpo3"; + rev = "280c47b7f98e88319c1a4ac2c7a2e5f273c00621"; + hash = "sha256-bEN2SaINfqvTIPSROXApR3zoLdjZY0h6bdAzbMHrJdM="; + }; + + postPatch = '' + substituteInPlace tests/test_tokenize.py \ + --replace-fail "data/test_dict.txt" "$src/nlpo3-python/tests/data/test_dict.txt" + ''; + + sourceRoot = "${src.name}/nlpo3-python"; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src sourceRoot; + hash = "sha256-PDDlG5nLedgA+HFZzkrxtfUjTwwioQhpsk5qlbAe3ws="; + }; + + preCheck = '' + rm -r nlpo3 + ''; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustc + cargo + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; + + build-system = [ + setuptools + setuptools-rust + ]; + + nativeCheckInputs = [ unittestCheckHook ]; + + unittestFlagsArray = [ + "-s" + "tests" + "-v" + ]; + + pythonImportsCheck = [ "nlpo3" ]; + + meta = { + description = "Thai Natural Language Processing library in Rust, with Python and Node bindings"; + homepage = "https://github.com/PyThaiNLP/nlpo3"; + changelog = "https://github.com/PyThaiNLP/nlpo3/releases/tag/nlpo3-python-v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ vizid ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8c0fe5e270bd8c..e15685b8d5a274 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9117,6 +9117,8 @@ self: super: with self; { nlpcloud = callPackage ../development/python-modules/nlpcloud { }; + nlpo3 = callPackage ../development/python-modules/nlpo3 { }; + nltk = callPackage ../development/python-modules/nltk { }; nnpdf = toPythonModule (pkgs.nnpdf.override { From 003a6274ff02c782b2fcc9cdcfcc8604bc76a1e4 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 11 Nov 2024 17:12:25 -0500 Subject: [PATCH 27/87] zfs_unstable: 2.3.0-rc2 -> 2.3.0-rc3 Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.3.0-rc3 --- pkgs/os-specific/linux/zfs/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index 7590481b6efb92..c60bb0e47f43d5 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -20,14 +20,14 @@ callPackage ./generic.nix args { # IMPORTANT: Always use a tagged release candidate or commits from the # zfs--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.3.0-rc2"; + version = "2.3.0-rc3"; # rev = ""; tests = { inherit (nixosTests.zfs) unstable; }; - hash = "sha256-/INlfiPpRm5JprcORzJJKyjpGIMY1LceY3yZ811uf2A="; + hash = "sha256-9s8Sb5+vksFsFI2Ra432QXexmbX3R17dzYzzLZviel0="; extraLongDescription = '' This is "unstable" ZFS, and will usually be a pre-release version of ZFS. From 36fe9df8f0803ee742ff64907d119d58ffea7c3b Mon Sep 17 00:00:00 2001 From: Alex James Date: Mon, 11 Nov 2024 16:53:06 -0600 Subject: [PATCH 28/87] gpac: migrate to new apple-sdk pattern Tracked by #354146. --- pkgs/applications/video/gpac/default.nix | 4 +--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index b036e69ce8a39d..8cd33a1b578f63 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cctools, pkg-config, Carbon, zlib }: +{ lib, stdenv, fetchFromGitHub, cctools, pkg-config, zlib }: stdenv.mkDerivation rec { pname = "gpac"; @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { buildInputs = [ zlib - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6b62ab86648a9..bee27bb2f528ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9582,9 +9582,7 @@ with pkgs; autoconf = buildPackages.autoconf269; }; - gpac = callPackage ../applications/video/gpac { - inherit (darwin.apple_sdk.frameworks) Carbon; - }; + gpac = callPackage ../applications/video/gpac { }; gpgme = callPackage ../development/libraries/gpgme { }; From a51bd410393ad4c3b1492abcb915be25ae2414eb Mon Sep 17 00:00:00 2001 From: Dee Engan Date: Mon, 11 Nov 2024 20:52:32 -0600 Subject: [PATCH 29/87] maintainers: add deeengan --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f419fa734a094f..84bd30dab2ec45 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5134,6 +5134,12 @@ github = "DeclanRixon"; githubId = 57464835; }; + deeengan = { + github = "deeengan"; + githubId = 87693324; + name = "Dee Engan"; + keys = [ { fingerprint = "9C24 79F5 F0CE 48F4 00EE 4A5B B8ED 46EB 468B F72D"; } ]; + }; deejayem = { email = "nixpkgs.bu5hq@simplelogin.com"; github = "deejayem"; From 0a7e3b69409fa27338c17adc687c9ad691022322 Mon Sep 17 00:00:00 2001 From: Shogo Takata Date: Tue, 12 Nov 2024 16:21:00 +0900 Subject: [PATCH 30/87] circt: fix build for x86_64-darwin on rosetta --- pkgs/by-name/ci/circt/package.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix index 6042e95d5c340c..d8865be0b75425 100644 --- a/pkgs/by-name/ci/circt/package.nix +++ b/pkgs/by-name/ci/circt/package.nix @@ -67,12 +67,14 @@ stdenv.mkDerivation rec { # Disable some tests on x86_64-darwin ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [ # These test seem to pass on hydra (rosetta) but not on x86_64-darwin machines - "CIRCT :: Target/ExportSMTLIB/attributes.mlir" - "CIRCT :: Target/ExportSMTLIB/basic.mlir" - "CIRCT :: circt-bmc/comb-errors.mlir" - "CIRCT :: circt-bmc/seq-errors.mlir" - # This test was having issues with rosetta - "CIRCT :: Dialect/SMT/basic.mlir" + "CIRCT :: Target/ExportSMTLIB/.*\.mlir" + "CIRCT :: circt-bmc/.*\.mlir" + # These tests were having issues on rosetta + "CIRCT :: Dialect/.*/Reduction/.*\.mlir" + "CIRCT :: Dialect/SMT/.*\.mlir" + "CIRCT :: circt-as-dis/.*\.mlir" + "CIRCT :: circt-reduce/.*\.mlir" + "CIRCT :: circt-test/basic.mlir" ]; in if lit-filters != [ ] then lib.strings.concatStringsSep "|" lit-filters else null; From 7d682551cc5d93b73912ea0ed9daea41c048806a Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Tue, 12 Nov 2024 08:47:01 +0100 Subject: [PATCH 31/87] python3Packages.miasm: 0.1.5-unstable-2024-04-28 -> 0.1.5-unstable-2024-08-20 --- pkgs/development/python-modules/miasm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/miasm/default.nix b/pkgs/development/python-modules/miasm/default.nix index ddbbd1262c536e..beba82cc72a1ac 100644 --- a/pkgs/development/python-modules/miasm/default.nix +++ b/pkgs/development/python-modules/miasm/default.nix @@ -12,11 +12,11 @@ setuptools, }: let - commit = "90dc1671b59077ee27c3d44d9d536d6659eb3bbe"; + commit = "cbc722eed8dc807955bd46f84886ae74d161dd0c"; in -buildPythonPackage rec { +buildPythonPackage { pname = "miasm"; - version = "0.1.5-unstable-2024-04-28"; + version = "0.1.5-unstable-2024-08-20"; pyproject = true; build-system = [ setuptools ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "cea-sec"; repo = "miasm"; rev = commit; - hash = "sha256-nkRcirJLmTwSL7lwd+Yk6mteU3YPnm5ekJ4eFF5FmYo="; + hash = "sha256-Ot11QuMtaJ8OQDAUgV3zVxTNp0kKc0Y9EXRZD96Caow="; }; patches = [ From 474fcca65360d208f92ddf5a374994aeaa8ee1f1 Mon Sep 17 00:00:00 2001 From: KSJ2000 Date: Tue, 12 Nov 2024 10:04:23 +0200 Subject: [PATCH 32/87] maintainers: add KSJ2000 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6fd827cd72b9de..82dd9e68b63a7a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11816,6 +11816,12 @@ github = "krzaczek"; githubId = 5773701; }; + KSJ2000 = { + email = "katsho123@outlook.com"; + name = "KSJ2000"; + github = "KSJ2000"; + githubId = 184105270; + }; ktf = { email = "giulio.eulisse@cern.ch"; github = "ktf"; From 8f728739cf8ec0274cbd80301b7ce14dd8a78088 Mon Sep 17 00:00:00 2001 From: KSJ2000 Date: Tue, 12 Nov 2024 10:05:54 +0200 Subject: [PATCH 33/87] unyaffs: init at 0.9 --- pkgs/by-name/un/unyaffs/package.nix | 45 +++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/un/unyaffs/package.nix diff --git a/pkgs/by-name/un/unyaffs/package.nix b/pkgs/by-name/un/unyaffs/package.nix new file mode 100644 index 00000000000000..b5f8e0269ab8b7 --- /dev/null +++ b/pkgs/by-name/un/unyaffs/package.nix @@ -0,0 +1,45 @@ +{ + fetchFromGitHub, + lib, + stdenv, + versionCheckHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "unyaffs"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "whataday"; + repo = "unyaffs"; + rev = "${finalAttrs.version}"; + hash = "sha256-FcuPaxq74gVJ6UlOhFPSMtuwUAJVV/sAxAQojhmVXCs="; + }; + + preBuild = '' + sed -i '54i #if defined(__linux__)' unyaffs.c + sed -i '55i #include ' unyaffs.c + sed -i '56i #endif' unyaffs.c + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 unyaffs -t $out/bin + + runHook postInstall + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgramArg = "-V"; + + meta = { + description = "Tool to extract files from a YAFFS2 file system image"; + homepage = "https://github.com/whataday/unyaffs"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ KSJ2000 ]; + mainProgram = "unyaffs"; + }; +}) From 2e0d910966964407c76be410c1685e0cf9f1d1c5 Mon Sep 17 00:00:00 2001 From: schrobingus Date: Thu, 7 Nov 2024 14:01:14 -0800 Subject: [PATCH 34/87] macmon: init at v0.3.3 --- pkgs/by-name/ma/macmon/package.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/by-name/ma/macmon/package.nix diff --git a/pkgs/by-name/ma/macmon/package.nix b/pkgs/by-name/ma/macmon/package.nix new file mode 100644 index 00000000000000..3b63efd27bf68c --- /dev/null +++ b/pkgs/by-name/ma/macmon/package.nix @@ -0,0 +1,27 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "macmon"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "vladkens"; + repo = "macmon"; + rev = "v${version}"; + hash = "sha256-COpEjK1LUwGzhSgD09D4gx+MtS2hT0qt06rTPT8JQiQ="; + }; + + cargoHash = "sha256-DTkpFGl8kTWttFGKTCpny2L0IRrCgpnnXaKIFoxWrW4="; + + meta = { + homepage = "https://github.com/vladkens/macmon"; + description = "Sudoless performance monitoring for Apple Silicon processors"; + platforms = [ "aarch64-darwin" ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ schrobingus ]; + }; +} From fcb0131cc86c2fc04db58b9525a3e4b299e8cd78 Mon Sep 17 00:00:00 2001 From: Mateusz Kubica Date: Thu, 7 Nov 2024 01:47:59 +0000 Subject: [PATCH 35/87] mpb: init at 1.11.1 --- pkgs/by-name/mp/mpb/package.nix | 67 +++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 pkgs/by-name/mp/mpb/package.nix diff --git a/pkgs/by-name/mp/mpb/package.nix b/pkgs/by-name/mp/mpb/package.nix new file mode 100644 index 00000000000000..e6eaedf90bcdb2 --- /dev/null +++ b/pkgs/by-name/mp/mpb/package.nix @@ -0,0 +1,67 @@ +{ + stdenv, + lib, + fetchFromGitHub, + autoreconfHook, + gfortran, + pkg-config, + blas, + lapack, + fftw, + hdf5, + libctl, + guile, + perl, +}: + +assert !blas.isILP64; +assert !lapack.isILP64; + +stdenv.mkDerivation rec { + pname = "mpb"; + version = "1.11.1"; + + src = fetchFromGitHub { + owner = "NanoComp"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-+2cMjZSGdfngtGoAeZRPRPBDvflTEIOWO8Se0W6jv9k="; + }; + + nativeBuildInputs = [ + autoreconfHook + gfortran + pkg-config + ]; + + buildInputs = [ + blas + lapack + fftw + hdf5 + libctl + guile + perl + ]; + + enableParallelBuilding = true; + + configureFlags = [ + "--with-libctl=yes" + "--with-libctl=${libctl}" + "--enable-maintainer-mode" + "--disable-dependency-tracking" + ] ++ lib.optional (!stdenv.hostPlatform.isStatic) "--enable-shared"; + + doCheck = true; + + meta = { + description = "MIT Photonic-Bands: computation of photonic band structures in periodic media"; + homepage = "https://mpb.readthedocs.io/en/latest/"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + sheepforce + ]; + }; +} From 312b6643afbdbd915dbad8e137755e12e1884b91 Mon Sep 17 00:00:00 2001 From: Mateusz Kubica Date: Sat, 9 Nov 2024 17:22:30 +0000 Subject: [PATCH 36/87] python3Packages.meep: add mpb support --- pkgs/development/python-modules/meep/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/meep/default.nix b/pkgs/development/python-modules/meep/default.nix index ab8e238dc6d04f..6bd726428989c8 100644 --- a/pkgs/development/python-modules/meep/default.nix +++ b/pkgs/development/python-modules/meep/default.nix @@ -19,6 +19,7 @@ libctl, libGDSII, guile, + mpb, python, numpy, scipy, @@ -72,6 +73,7 @@ buildPythonPackage rec { libGDSII guile gsl + mpb ]; propagatedBuildInputs = @@ -124,6 +126,9 @@ buildPythonPackage rec { nativeCheckInputs = [ mpiCheckPhaseHook ]; + pythonImportCheck = [ + "meep.mpb" + ]; checkPhase = '' runHook preCheck @@ -154,12 +159,12 @@ buildPythonPackage rec { runHook postCheck ''; - meta = with lib; { + meta = { description = "Free finite-difference time-domain (FDTD) software for electromagnetic simulations"; homepage = "https://meep.readthedocs.io/en/latest/"; - license = licenses.gpl2Only; - platforms = platforms.linux; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ sheepforce markuskowa ]; From 0a3b14980c5e9fa1fc116c6d8bfb249ed3e4d6c3 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Tue, 12 Nov 2024 13:19:22 +0100 Subject: [PATCH 37/87] python310Packages.websockets: disable failing test a1a6f4a1fbc38db6658b5ce581b5d0349f673f93 already partially fixed this, but missed the test in tests/asyncio/test_client.py --- pkgs/development/python-modules/websockets/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index 658d69ea942db2..063fa1a43e758c 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { + lib.optionalString (pythonOlder "3.11") '' # Our Python 3.10 and older raise SSLError instead of SSLCertVerificationError sed -i "s/def test_reject_invalid_server_certificate(/def skip_test_reject_invalid_server_certificate(/" tests/sync/test_client.py + sed -i "s/def test_reject_invalid_server_certificate(/def skip_test_reject_invalid_server_certificate(/" tests/asyncio/test_client.py ''; nativeCheckInputs = [ unittestCheckHook ]; From 735722572029ef07cf410f0bd143e8550a824832 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Tue, 12 Nov 2024 21:03:56 +0800 Subject: [PATCH 38/87] hpuefi: only build on x86_64 --- pkgs/os-specific/linux/hpuefi-mod/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/hpuefi-mod/default.nix b/pkgs/os-specific/linux/hpuefi-mod/default.nix index 201d1ea501533e..ec22be081b7f18 100644 --- a/pkgs/os-specific/linux/hpuefi-mod/default.nix +++ b/pkgs/os-specific/linux/hpuefi-mod/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://ftp.hp.com/pub/caps-softpaq/cmit/linuxtools/HP_LinuxTools.html"; description = "Kernel module for managing BIOS settings and updating BIOS firmware on supported HP computers"; license = lib.licenses.gpl2Only; # See "License" section in ./non-rpms/hpuefi-mod-*.tgz/README - platforms = lib.platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ tomodachi94 ]; }; }) From 39959e10a829ea87198dae12392066b92a5ea383 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Tue, 12 Nov 2024 21:11:28 +0800 Subject: [PATCH 39/87] ocrfeeder: nixfmt --- pkgs/by-name/oc/ocrfeeder/package.nix | 69 +++++++++++++++------------ 1 file changed, 38 insertions(+), 31 deletions(-) diff --git a/pkgs/by-name/oc/ocrfeeder/package.nix b/pkgs/by-name/oc/ocrfeeder/package.nix index 05d157c2d9b4c5..b2ad88f20e4c1c 100644 --- a/pkgs/by-name/oc/ocrfeeder/package.nix +++ b/pkgs/by-name/oc/ocrfeeder/package.nix @@ -1,18 +1,20 @@ -{ lib, stdenv -, fetchurl -, pkg-config -, wrapGAppsHook3 -, intltool -, itstool -, libxml2 -, gobject-introspection -, gtk3 -, goocanvas2 -, gtkspell3 -, isocodes -, python3 -, tesseract4 -, extraOcrEngines ? [] # other supported engines are: ocrad gocr cuneiform +{ + lib, + stdenv, + fetchurl, + pkg-config, + wrapGAppsHook3, + intltool, + itstool, + libxml2, + gobject-introspection, + gtk3, + goocanvas2, + gtkspell3, + isocodes, + python3, + tesseract4, + extraOcrEngines ? [ ], # other supported engines are: ocrad gocr cuneiform }: stdenv.mkDerivation (finalAttrs: { @@ -21,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/ocrfeeder/${lib.versions.majorMinor finalAttrs.version}/ocrfeeder-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-sD0qWUndguJzTw0uy0FIqupFf4OX6dTFvcd+Mz+8Su0="; + hash = "sha256-sD0qWUndguJzTw0uy0FIqupFf4OX6dTFvcd+Mz+8Su0="; }; nativeBuildInputs = [ @@ -38,14 +40,16 @@ stdenv.mkDerivation (finalAttrs: { goocanvas2 gtkspell3 isocodes - (python3.withPackages(ps: with ps; [ - pyenchant - sane - pillow - reportlab - odfpy - pygobject3 - ])) + (python3.withPackages ( + ps: with ps; [ + pyenchant + sane + pillow + reportlab + odfpy + pygobject3 + ] + )) ]; patches = [ # Compiles, but doesn't launch without this, see: @@ -53,20 +57,23 @@ stdenv.mkDerivation (finalAttrs: { ./fix-launch.diff ]; - enginesPath = lib.makeBinPath ([ - tesseract4 - ] ++ extraOcrEngines); + enginesPath = lib.makeBinPath ( + [ + tesseract4 + ] + ++ extraOcrEngines + ); preFixup = '' gappsWrapperArgs+=(--prefix PATH : "${finalAttrs.enginesPath}") gappsWrapperArgs+=(--set ISO_CODES_DIR "${isocodes}/share/xml/iso-codes") ''; - meta = with lib; { + meta = { homepage = "https://gitlab.gnome.org/GNOME/ocrfeeder"; description = "Complete Optical Character Recognition and Document Analysis and Recognition program"; - maintainers = with maintainers; [ doronbehar ]; - license = licenses.gpl3Plus; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ doronbehar ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; }; }) From dcc7d30300f716e52f27cc1e21ed66ae419cba87 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Tue, 12 Nov 2024 21:38:24 +0800 Subject: [PATCH 40/87] ocrfeeder: fix build --- pkgs/by-name/oc/ocrfeeder/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/oc/ocrfeeder/package.nix b/pkgs/by-name/oc/ocrfeeder/package.nix index b2ad88f20e4c1c..5dc36c45b4ca18 100644 --- a/pkgs/by-name/oc/ocrfeeder/package.nix +++ b/pkgs/by-name/oc/ocrfeeder/package.nix @@ -35,6 +35,13 @@ stdenv.mkDerivation (finalAttrs: { gobject-introspection ]; + postPatch = '' + substituteInPlace configure \ + --replace-fail "import imp" "import importlib.util" \ + --replace-fail "imp.find_module" "importlib.util.find_spec" \ + --replace-fail "distutils" "setuptools._distutils" + ''; + buildInputs = [ gtk3 goocanvas2 From 6ea31c8a7e6323f722f154ca345c7346ec60a5c9 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Tue, 12 Nov 2024 21:50:51 +0800 Subject: [PATCH 41/87] trinity: nixfmt --- pkgs/by-name/tr/trinity/package.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/tr/trinity/package.nix b/pkgs/by-name/tr/trinity/package.nix index a3e795c8ea02ec..bd52447afd0e08 100644 --- a/pkgs/by-name/tr/trinity/package.nix +++ b/pkgs/by-name/tr/trinity/package.nix @@ -1,6 +1,10 @@ -{ lib, stdenv, fetchFromGitHub }: +{ + lib, + stdenv, + fetchFromGitHub, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "trinity"; version = "1.9-unstable-2023-07-10"; @@ -20,12 +24,12 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" ]; - meta = with lib; { + meta = { description = "Linux System call fuzz tester"; mainProgram = "trinity"; homepage = "https://github.com/kernelslacker/trinity"; - license = licenses.gpl2Only; - maintainers = [ maintainers.dezgeg ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Only; + maintainers = [ lib.maintainers.dezgeg ]; + platforms = lib.platforms.linux; }; -} +}) From 3b619965a6924ddffed93804134b17a5527db5a2 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Tue, 12 Nov 2024 21:51:49 +0800 Subject: [PATCH 42/87] trinity: add passthru.updateScript --- pkgs/by-name/tr/trinity/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/tr/trinity/package.nix b/pkgs/by-name/tr/trinity/package.nix index bd52447afd0e08..799477e198b5c6 100644 --- a/pkgs/by-name/tr/trinity/package.nix +++ b/pkgs/by-name/tr/trinity/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + unstableGitUpdater, }: stdenv.mkDerivation (finalAttrs: { @@ -24,6 +25,8 @@ stdenv.mkDerivation (finalAttrs: { installFlags = [ "DESTDIR=$(out)" ]; + passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; }; + meta = { description = "Linux System call fuzz tester"; mainProgram = "trinity"; From 25a1708f211bd39dc54d4f325d590e48cb3f1d21 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Tue, 12 Nov 2024 21:56:16 +0800 Subject: [PATCH 43/87] trinity: 1.9-unstable-2023-07-10 -> 1.9-unstable-2024-09-19 --- pkgs/by-name/tr/trinity/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tr/trinity/package.nix b/pkgs/by-name/tr/trinity/package.nix index 799477e198b5c6..ba745c5252ddcd 100644 --- a/pkgs/by-name/tr/trinity/package.nix +++ b/pkgs/by-name/tr/trinity/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "trinity"; - version = "1.9-unstable-2023-07-10"; + version = "1.9-unstable-2024-09-19"; src = fetchFromGitHub { owner = "kernelslacker"; repo = "trinity"; - rev = "e71872454d26baf37ae1d12e9b04a73d64179555"; - hash = "sha256-Zy+4L1CuB2Ul5iF+AokDkAW1wheDzoCTNkvRZFGRNps="; + rev = "ba2360ed84a8c521d9c34af9c909315ea7c62aad"; + hash = "sha256-lj27EtMzj+ULrAJh27rjiuL3/SzW/NRMG65l8sBi8k4="; }; postPatch = '' From 1c67d02cd2e4cb452ceb4210a3150996cada2d95 Mon Sep 17 00:00:00 2001 From: Erno Hopearuoho Date: Wed, 30 Oct 2024 22:22:41 +0200 Subject: [PATCH 44/87] goxlr-utility: 1.1.1-unstable-2024-08-06 -> 1.1.4 fixes #352352 --- pkgs/by-name/go/goxlr-utility/Cargo.lock | 35 ++++++++++++----------- pkgs/by-name/go/goxlr-utility/package.nix | 26 ++++++++--------- 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/pkgs/by-name/go/goxlr-utility/Cargo.lock b/pkgs/by-name/go/goxlr-utility/Cargo.lock index 5c3dc838179972..e491ef35bff22c 100644 --- a/pkgs/by-name/go/goxlr-utility/Cargo.lock +++ b/pkgs/by-name/go/goxlr-utility/Cargo.lock @@ -510,7 +510,7 @@ checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ "async-task", "concurrent-queue", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-lite 2.3.0", "slab", ] @@ -1755,9 +1755,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" @@ -1964,7 +1964,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-core", "futures-io", "parking", @@ -2059,7 +2059,7 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "goxlr-audio" -version = "1.1.1" +version = "1.1.4" dependencies = [ "anyhow", "cpal", @@ -2076,7 +2076,7 @@ dependencies = [ [[package]] name = "goxlr-client" -version = "1.1.1" +version = "1.1.4" dependencies = [ "anyhow", "clap 4.5.11", @@ -2093,7 +2093,7 @@ dependencies = [ [[package]] name = "goxlr-daemon" -version = "1.1.1" +version = "1.1.4" dependencies = [ "actix", "actix-cors", @@ -2164,7 +2164,7 @@ dependencies = [ [[package]] name = "goxlr-defaults" -version = "1.1.1" +version = "1.1.4" dependencies = [ "clap 4.5.11", "include_dir", @@ -2172,7 +2172,7 @@ dependencies = [ [[package]] name = "goxlr-initialiser" -version = "1.1.1" +version = "1.1.4" dependencies = [ "anyhow", "block", @@ -2184,7 +2184,7 @@ dependencies = [ [[package]] name = "goxlr-ipc" -version = "1.1.1" +version = "1.1.4" dependencies = [ "anyhow", "async-trait", @@ -2205,7 +2205,7 @@ dependencies = [ [[package]] name = "goxlr-launcher" -version = "1.1.1" +version = "1.1.4" dependencies = [ "anyhow", "goxlr-ipc", @@ -2221,12 +2221,13 @@ dependencies = [ [[package]] name = "goxlr-profile-loader" -version = "1.1.1" +version = "1.1.4" dependencies = [ "anyhow", "byteorder", "enum-map", "enum-map-derive", + "fastrand 2.1.1", "log", "quick-xml", "ritelinked", @@ -2238,7 +2239,7 @@ dependencies = [ [[package]] name = "goxlr-scribbles" -version = "1.1.1" +version = "1.1.4" dependencies = [ "ab_glyph", "anyhow", @@ -2249,7 +2250,7 @@ dependencies = [ [[package]] name = "goxlr-types" -version = "1.1.1" +version = "1.1.4" dependencies = [ "clap 4.5.11", "derivative", @@ -2262,7 +2263,7 @@ dependencies = [ [[package]] name = "goxlr-usb" -version = "1.1.1" +version = "1.1.4" dependencies = [ "anyhow", "byteorder", @@ -3801,7 +3802,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-io", ] @@ -4989,7 +4990,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 2.1.0", + "fastrand 2.1.1", "rustix 0.38.34", "windows-sys 0.52.0", ] diff --git a/pkgs/by-name/go/goxlr-utility/package.nix b/pkgs/by-name/go/goxlr-utility/package.nix index d3b9cabe803dbb..47cf18086f0e47 100644 --- a/pkgs/by-name/go/goxlr-utility/package.nix +++ b/pkgs/by-name/go/goxlr-utility/package.nix @@ -1,23 +1,24 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, installShellFiles -, pkg-config -, libpulseaudio -, dbus -, openssl -, speechd-minimal +{ + lib, + fetchFromGitHub, + rustPlatform, + installShellFiles, + pkg-config, + libpulseaudio, + dbus, + openssl, + speechd-minimal, }: rustPlatform.buildRustPackage rec { pname = "goxlr-utility"; - version = "1.1.1-unstable-2024-08-06"; + version = "1.1.4"; src = fetchFromGitHub { owner = "GoXLR-on-Linux"; repo = "goxlr-utility"; - rev = "dcd4454a2634f5a2af10f00c1cbcb016241ce2cb"; - hash = "sha256-kWfCFsk0GhqX+pYOTeJd7XHlcWOX4D6fmIU/4nylU3Y="; + rev = "v${version}"; + hash = "sha256-aThIu+3eNHCKS6lsio7cLZeIMg0509qkE0YQ6M6vPAI="; }; cargoLock = { @@ -70,4 +71,3 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ errnoh ]; }; } - From f3b123ec9ddb4393abc76a8f4052db9168027f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C3=B6lfchen?= <115360611+W-lfchen@users.noreply.github.com> Date: Tue, 12 Nov 2024 16:14:19 +0100 Subject: [PATCH 45/87] obsidian: 1.7.5 -> 1.7.6 --- pkgs/by-name/ob/obsidian/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ob/obsidian/package.nix b/pkgs/by-name/ob/obsidian/package.nix index aebb166a4689fd..6e3c279033b864 100644 --- a/pkgs/by-name/ob/obsidian/package.nix +++ b/pkgs/by-name/ob/obsidian/package.nix @@ -12,7 +12,7 @@ }: let pname = "obsidian"; - version = "1.7.5"; + version = "1.7.6"; appname = "Obsidian"; meta = with lib; { description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -26,7 +26,7 @@ let filename = if stdenv.hostPlatform.isDarwin then "Obsidian-${version}.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - hash = if stdenv.hostPlatform.isDarwin then "sha256-2gUXA0a7gcVFtTl5qiJFTAu6A9W79DiP0hd8j1Mwv3I=" else "sha256-T177UqPnPLM/2dGUdwhK21AByYrJu9wgEKOWrrGBQkA="; + hash = if stdenv.hostPlatform.isDarwin then "sha256-K7NLFbsTVNNH2VEXLiBM1KaG3fEWwaUkvxYh3vtKGvc=" else "sha256-5xkhm87eN36NmwG+t7SYnn20zT+ZELC7g2x+6/UGrHE="; }; icon = fetchurl { From ac225abfd139e74649ca6ea9c8009c0a89e9eb24 Mon Sep 17 00:00:00 2001 From: cloudripper <70971768+cloudripper@users.noreply.github.com> Date: Tue, 12 Nov 2024 07:24:55 -0800 Subject: [PATCH 46/87] maintainers: add cloudripper --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a6ede4546b63be..f356219dac856e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4156,6 +4156,12 @@ githubId = 69784758; matrix = "@clot27:matrix.org"; }; + cloudripper = { + email = "other.wing8806@fastmail.com"; + github = "cloudripper"; + githubId = 70971768; + name = "cloudripper"; + }; clr-cera = { email = "clrcera05@gmail.com"; github = "clr-cera"; From 83bc60628cb163221ac4f488ee7bd1aa21de1f04 Mon Sep 17 00:00:00 2001 From: Dmitry Ivankov Date: Tue, 12 Nov 2024 16:26:03 +0100 Subject: [PATCH 47/87] bazel_7: 7.3.1 -> 7.4.0 --- .../build-managers/bazel/bazel_7/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix index 149f6bcd533d7d..697ef3c0651d71 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix @@ -47,7 +47,7 @@ # Always assume all markers valid (this is needed because we remove markers; they are non-deterministic). # Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers). enableNixHacks ? false, - version ? "7.3.1", + version ? "7.4.0", }: let @@ -55,7 +55,7 @@ let src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - hash = "sha256-8FAfkMn8dM1pM9vcWeF7jWJy1sCfi448QomFxYlxR8c="; + hash = "sha256-GY1wu3O5O7K2MMJv6wjE+DLnUgwjkHdmcqhT1o9G9Cg="; }; defaultShellUtils = @@ -112,23 +112,23 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-linux-x86_64"; - hash = "sha256-05fHtz47OilpOVYawB17VRVEDpycfYTIHBmwYCOyPjI="; + hash = "sha256-0glQLNAU0aT7+3Hzv0+IzgvJlfs7y8wflEwFssIvnkk="; } else if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-linux-arm64"; - hash = "sha256-olrlIia/oXWleXp12E+LGXv+F1m4/S4jj/t7p2/xGdM="; + hash = "sha256-736PrTFckHyChRh0Uv8zNtCppQYhfZWECl9+44cs6Qo="; } else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-darwin-x86_64"; - hash = "sha256-LraN6MSVJQ3NzkyeLl5LvGxf+VNDJiVo/dVJIkyF1jU="; + hash = "sha256-FX7ZKKG7uoteEvx0fBqpsoB3Gj0aJNaC2IXgJ2ffgz4="; } else fetchurl { # stdenv.hostPlatform.system == "aarch64-darwin" url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-darwin-arm64"; - hash = "sha256-mB+CpHC60TSTIrb1HJxv+gqikdqxAU+sQRVDwS5mHf8="; + hash = "sha256-+EP+HssT4aISUZwLKkSuuXjGQm9lheNJDr7WZw1v0pU="; }; nativeBuildInputs = defaultShellUtils; @@ -244,14 +244,14 @@ let outputHashMode = "recursive"; outputHash = if stdenv.hostPlatform.system == "x86_64-linux" then - "sha256-II5R2YjaIejcO4Topdcz1H268eplYsYrW2oLJHKEkYw=" + "sha256-yKy6IBIkjvN413kFMgkWCH3jAgF5AdpxrVnQyhgfWPA=" else if stdenv.hostPlatform.system == "aarch64-linux" then - "sha256-n8RMKf8OxJsEkcxLe7xZgMu9RyeU58NESFF9F0nLNC4=" + "sha256-NW/JMVC7k2jBW+d8syMl9L5tDB7SQENJtlMFjAKascI=" else if stdenv.hostPlatform.system == "aarch64-darwin" then - "sha256-E6j31Sl+aGs6+Xdx+c0Xi6ryfYZ/ms5/HzIyc3QpMHY=" + lib.fakeHash else # x86_64-darwin - "sha256-VVuNGY4+SFDhcv9iEo8JToYPzqk9NQCrYlLhhae89MM="; + lib.fakeHash; outputHashAlgo = "sha256"; }; From 48d9ef212d127eebd222c1db94e066d710d8b3ed Mon Sep 17 00:00:00 2001 From: cloudripper <70971768+cloudripper@users.noreply.github.com> Date: Tue, 12 Nov 2024 07:25:09 -0800 Subject: [PATCH 48/87] intentrace: init at 0.2.4 --- pkgs/by-name/in/intentrace/package.nix | 34 ++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 pkgs/by-name/in/intentrace/package.nix diff --git a/pkgs/by-name/in/intentrace/package.nix b/pkgs/by-name/in/intentrace/package.nix new file mode 100644 index 00000000000000..750e2ac8159092 --- /dev/null +++ b/pkgs/by-name/in/intentrace/package.nix @@ -0,0 +1,34 @@ +{ + fetchFromGitHub, + lib, + rustPlatform, +}: + +let + version = "0.2.4"; +in +rustPlatform.buildRustPackage { + inherit version; + pname = "intentrace"; + + src = fetchFromGitHub { + owner = "sectordistrict"; + repo = "intentrace"; + rev = "refs/tags/v${version}"; + hash = "sha256-Bsis8tL2xahJT/qAFVbbd/CZ7n8KJYLPTIl1a1WHR4c="; + }; + + cargoHash = "sha256-pyGcQy7p0+Vqv3Khy1hLgahcOpqnbKKmRLZcKwkvVWw="; + + meta = { + description = "Prettified Linux syscall tracing tool (like strace)"; + homepage = "https://github.com/sectordistrict/intentrace"; + license = lib.licenses.mit; + platforms = [ "x86_64-linux" ]; + mainProgram = "intentrace"; + maintainers = with lib.maintainers; [ + cloudripper + jk + ]; + }; +} From 168d5617a2787c0857aef609355578301fd19c73 Mon Sep 17 00:00:00 2001 From: D3vil0p3r Date: Thu, 25 Apr 2024 12:35:35 +0200 Subject: [PATCH 49/87] libguytools: init at 2.1.0 --- pkgs/by-name/li/libguytools/package.nix | 56 +++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 pkgs/by-name/li/libguytools/package.nix diff --git a/pkgs/by-name/li/libguytools/package.nix b/pkgs/by-name/li/libguytools/package.nix new file mode 100644 index 00000000000000..b882a1eb2ab077 --- /dev/null +++ b/pkgs/by-name/li/libguytools/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + fetchurl, + libsForQt5, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libguytools"; + version = "2.1.0"; + + src = fetchurl { + url = "mirror://sourceforge/project/libguytools/libguytools/LatestSource/tools-${finalAttrs.version}.tar.gz"; + hash = "sha256-eVYvjo2wKW2g9/9hL9nbQa1FRWDMMqMHok0V/adPHVY="; + }; + + qmakeFlags = [ + "trunk.pro" + "toolsstatic.pro" + ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + libsForQt5.qmake + libsForQt5.wrapQtAppsHook + ]; + dontWrapQtApps = true; + buildInputs = [ libsForQt5.qtbase ]; + + postPatch = '' + sed -i "/dpkg-buildflags/d" tools.pro + patchShebangs create_version_file.sh + ''; + + preConfigure = '' + ./create_version_file.sh + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -r lib $out/ + cp -r include $out/ + runHook postInstall + ''; + + meta = { + description = "Small programming toolbox"; + mainProgram = "libguytools"; + homepage = "https://libguytools.sourceforge.io"; + maintainers = with lib.maintainers; [ d3vil0p3r ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; + }; +}) From bceebe8702d0fcf74d4e9cf5295fc4e78c0ea5e8 Mon Sep 17 00:00:00 2001 From: D3vil0p3r Date: Tue, 12 Nov 2024 11:40:53 +0100 Subject: [PATCH 50/87] guymager: init at 0.8.13 --- pkgs/by-name/gu/guymager/package.nix | 79 ++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 pkgs/by-name/gu/guymager/package.nix diff --git a/pkgs/by-name/gu/guymager/package.nix b/pkgs/by-name/gu/guymager/package.nix new file mode 100644 index 00000000000000..27700c07f48670 --- /dev/null +++ b/pkgs/by-name/gu/guymager/package.nix @@ -0,0 +1,79 @@ +{ + lib, + stdenv, + fetchurl, + libsForQt5, + dpkg, + parted, + udev, + libewf-legacy, + libbfio, + libguytools, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "guymager"; + version = "0.8.13"; + + src = fetchurl { + url = "mirror://sourceforge/project/guymager/guymager/LatestSource/guymager-${finalAttrs.version}.tar.gz"; + hash = "sha256-xDsQ/d6fyfLOr4uXpdoqMljfFrVgQTUu0t2e5opcaRg="; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + dpkg + libsForQt5.qmake + libsForQt5.qttools + libsForQt5.wrapQtAppsHook + ]; + buildInputs = [ + libsForQt5.qtbase + libewf-legacy + libbfio + libguytools + parted + udev + ]; + + postPatch = '' + patchShebangs compileinfo.sh + substituteInPlace manuals/guymager_body.1 config.cpp \ + --replace-fail "/etc/guymager/guymager.cfg" "$out/share/guymager/guymager.cfg" + substituteInPlace compileinfo.sh \ + --replace-fail " debian/changelog" "" \ + --replace-fail "dpkg-parsechangelog" "dpkg-parsechangelog -l changelog" + substituteInPlace threadscan.cpp \ + --replace-fail '/lib,/usr/lib,/usr/lib64,/usr/local/lib' '${ + builtins.replaceStrings [ ":" ] [ "," ] ( + lib.makeLibraryPath [ + udev + parted + ] + ) + }' + substituteInPlace org.freedesktop.guymager.policy guymager.pro main.cpp guymager.cfg \ + --replace-fail /usr $out + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,share} + make clean + rm -rf *.cpp *.h *.pro + cp -aR . "$out/share/guymager/" + makeWrapper $out/share/guymager/guymager $out/bin/guymager + runHook postInstall + ''; + + meta = { + description = "Forensic imager for media acquisition"; + mainProgram = "guymager"; + homepage = "https://guymager.sourceforge.io"; + maintainers = with lib.maintainers; [ d3vil0p3r ]; + platforms = lib.platforms.linux; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.gpl2Only; + }; +}) From a8892ad6ae1c3fcf281567cad7f292570eab3932 Mon Sep 17 00:00:00 2001 From: Dmitry Ivankov Date: Tue, 12 Nov 2024 18:18:09 +0100 Subject: [PATCH 51/87] Update pkgs/development/tools/build-managers/bazel/bazel_7/default.nix --- pkgs/development/tools/build-managers/bazel/bazel_7/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix index 697ef3c0651d71..c83f668243f99f 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix @@ -251,7 +251,7 @@ let lib.fakeHash else # x86_64-darwin - lib.fakeHash; + "sha256-VDrqS9YByYxboF6AcjAR0BRZa5ioGgX1pjx09zPfWTE="; outputHashAlgo = "sha256"; }; From 04adc05ffea797efaead230f1467e0e7d29c0e17 Mon Sep 17 00:00:00 2001 From: Dmitry Ivankov Date: Tue, 12 Nov 2024 18:31:46 +0100 Subject: [PATCH 52/87] Update pkgs/development/tools/build-managers/bazel/bazel_7/default.nix --- pkgs/development/tools/build-managers/bazel/bazel_7/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix index c83f668243f99f..1a77dea9757435 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix @@ -248,7 +248,7 @@ let else if stdenv.hostPlatform.system == "aarch64-linux" then "sha256-NW/JMVC7k2jBW+d8syMl9L5tDB7SQENJtlMFjAKascI=" else if stdenv.hostPlatform.system == "aarch64-darwin" then - lib.fakeHash + "sha256-QVk0Qr86U350oLJ5P50SE6CUYqn5XEqgGCXVf+89wVY=" else # x86_64-darwin "sha256-VDrqS9YByYxboF6AcjAR0BRZa5ioGgX1pjx09zPfWTE="; From 33811d45da29819ceb2a454d17460b60df78b523 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 12 Nov 2024 18:54:39 +0100 Subject: [PATCH 53/87] grafana: 11.3.0 -> 11.3.0+security-01, fix CVE-2024-9476 ChangeLog: https://github.com/grafana/grafana/releases/tag/v11.3.0%2Bsecurity-01 --- pkgs/servers/monitoring/grafana/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index af9673228d4ac4..ce933af360ddce 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "grafana"; - version = "11.3.0"; + version = "11.3.0+security-01"; subPackages = [ "pkg/cmd/grafana" "pkg/cmd/grafana-server" "pkg/cmd/grafana-cli" ]; @@ -16,7 +16,7 @@ buildGoModule rec { owner = "grafana"; repo = "grafana"; rev = "v${version}"; - hash = "sha256-tPPhRCZ8auVaX68YhGzpkykxqln8zzqdAZiedpmYqlk="; + hash = "sha256-t8D5JHhWJdsnY+SR+eiHy+jHkasAg8b5+uQ38OEFyR4="; }; # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22 From 4adac0bc9bc1d56297ac0f5e535786a191bccc40 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 18:44:08 +0000 Subject: [PATCH 54/87] screenly-cli: 1.0.1 -> 1.0.2 --- pkgs/by-name/sc/screenly-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sc/screenly-cli/package.nix b/pkgs/by-name/sc/screenly-cli/package.nix index b93266bbdc253c..ceb00112ecb547 100644 --- a/pkgs/by-name/sc/screenly-cli/package.nix +++ b/pkgs/by-name/sc/screenly-cli/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "screenly-cli"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "screenly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-7Y9n6qo5kqaV8xHYn4BFbPBF/7mCV9DJJTSz4dqrgPc="; + hash = "sha256-iEz6LFPzOZCOvUMx3s6entcwyEsAKirY8CiIoId/Ie0="; }; - cargoHash = "sha256-4fPC/BW2irA1iTKkxBhPOsxzS4uSfM3vOXhrx/7qRxg="; + cargoHash = "sha256-YurXcmjL44TBrLQocbCKtOEpG7d49aKU9Q/3vPoPvHg="; nativeBuildInputs = [ pkg-config From 870ce837c5552ec92e662b1a2bf7ea0e2235f1d4 Mon Sep 17 00:00:00 2001 From: ede1998 Date: Mon, 11 Nov 2024 17:41:01 +0100 Subject: [PATCH 55/87] rip2: Add shell completions --- pkgs/by-name/ri/rip2/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/ri/rip2/package.nix b/pkgs/by-name/ri/rip2/package.nix index eba6c5f8148428..c14b829c510b50 100644 --- a/pkgs/by-name/ri/rip2/package.nix +++ b/pkgs/by-name/ri/rip2/package.nix @@ -3,6 +3,8 @@ rustPlatform, fetchFromGitHub, versionCheckHook, + installShellFiles, + stdenv, }: rustPlatform.buildRustPackage rec { @@ -18,6 +20,8 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-l6rbeiyIsr1csBcp+428TpQYSs9RvfJutGoL/wtSGR8="; + nativeBuildInputs = [ installShellFiles ]; + # TODO: Unsure why this test fails, but not a major issue so # skipping for now. checkFlags = [ "--skip=test_filetypes::file_type_3___fifo__" ]; @@ -25,6 +29,12 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/rip"; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd rip \ + --bash <($out/bin/rip completions bash) \ + --fish <($out/bin/rip completions fish) \ + --zsh <($out/bin/rip completions zsh) + ''; meta = { description = "Safe and ergonomic alternative to rm"; From 87774518c80da2fe8597b5cbc12a5c8b1c02985f Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sat, 19 Oct 2024 21:56:32 +0200 Subject: [PATCH 56/87] eslint_d: 14.1.1 -> 14.2.2 --- pkgs/by-name/es/eslint_d/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/es/eslint_d/package.nix b/pkgs/by-name/es/eslint_d/package.nix index 6e6607372db9ed..1a4a71d43fefe0 100644 --- a/pkgs/by-name/es/eslint_d/package.nix +++ b/pkgs/by-name/es/eslint_d/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "eslint_d"; - version = "14.1.1"; + version = "14.2.2"; src = fetchFromGitHub { owner = "mantoni"; repo = "eslint_d.js"; rev = "v${version}"; - hash = "sha256-r+AQFFzB3PhvER6oVHpqQiFuaHuT+2O8gL2zu8aCTbs="; + hash = "sha256-7VsbGudZlfrjU+x3a9OWxu9qDCiDUq8xez85qNj08xY="; }; - npmDepsHash = "sha256-XOFRzGPrisXE8GyqVO5xms+o9OwA9w0y+uJkcdyX+z0="; + npmDepsHash = "sha256-u8kmHQ7UfCR446d+HbkGlK76Aki+KrOtBO6/a/VXoTg="; dontNpmBuild = true; From b1ca8bea94a7095b01cbf791225879b62c408087 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 19:15:58 +0000 Subject: [PATCH 57/87] skypeforlinux: 8.131.0.202 -> 8.132.0.201 --- pkgs/by-name/sk/skypeforlinux/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sk/skypeforlinux/package.nix b/pkgs/by-name/sk/skypeforlinux/package.nix index 16822a140032bd..8c97f6ed1a9e25 100644 --- a/pkgs/by-name/sk/skypeforlinux/package.nix +++ b/pkgs/by-name/sk/skypeforlinux/package.nix @@ -42,8 +42,8 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.131.0.202"; - revision = "370"; + version = "8.132.0.201"; + revision = "373"; rpath = lib.makeLibraryPath [ @@ -103,7 +103,7 @@ let fetchurl { name = "skypeforlinux-${version}-${revision}.snap"; url = "https://api.snapcraft.io/api/v1/snaps/download/QRDEfjn4WJYnm0FzDKwqqRZZI77awQEV_${revision}.snap"; - hash = "sha512-POCDkJe58ie78PIze6qADPIbjfFxNhLJt5z7ooHNIna6IrJoeqpFYIrRo9uosHkUURu83MfueeyYd6z0j+P/RQ=="; + hash = "sha512-Hrb/MlCYTvQ/4kicsnBfdKtnUPP8nFi1TKQ4zl3dtvwUWl9QGXX//sNQoBOj6b9KkgpCi6pI04wIWp/zdRMl6Q=="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; From d9e756a5957d3cd1986ffe8d95a449070189f8cb Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Tue, 12 Nov 2024 13:38:33 +0000 Subject: [PATCH 58/87] google-chrome: 130.0.6723.91 -> 131.0.6778.69 --- pkgs/by-name/go/google-chrome/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 28890bccec41be..31828fbfed43f8 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -166,11 +166,11 @@ let linux = stdenv.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "130.0.6723.91"; + version = "131.0.6778.69"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-30RwtLlU4GhqDhbHTZMqrih77d2yOFeIBiOG3CugvLo="; + hash = "sha256-7aE6RZE5kB3DaJFUDdc2Ter8SsZZM0JzYmKn1hF1BUs="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -266,11 +266,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "130.0.6723.92"; + version = "131.0.6778.70"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/adlhlvvxwq7oxwh4d3ghghzdnhaq_130.0.6723.92/GoogleChrome-130.0.6723.92.dmg"; - hash = "sha256-R1YCj0Ou+pyGUCxh6ATTTPIb5qUTnGROZypuAh8SlAg="; + url = "http://dl.google.com/release2/chrome/acwi7l3xj4g6lag6mccophfiv2aa_131.0.6778.70/GoogleChrome-131.0.6778.70.dmg"; + hash = "sha256-Gikqdh9g3FAnWBLrxMtbomKceIaMsz/GnguiEUpKJW0="; }; dontPatch = true; From 171278f7d1b51fa6f0c1f8602a7c17b43ce25ba3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Nov 2024 21:15:03 +0100 Subject: [PATCH 59/87] checkov: 3.2.286 -> 3.2.291 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.286...3.2.291 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.291 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 03e3afcb0658c4..c0cea09646f580 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.286"; + version = "3.2.291"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-HW1maTuRqieOzvdpMAxs4h5SpTZ3FyKGmmDof0UItOE="; + hash = "sha256-CpLJD76FK2kX4p8M41S/GmGAwfTX1ugyyl10MEG4WNY="; }; patches = [ ./flake8-compat-5.x.patch ]; From 7cbb66324fca95da5fb74d1f03d03b05c507ccc3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Nov 2024 21:17:31 +0100 Subject: [PATCH 60/87] python312Packages.archinfo: 9.2.127 -> 9.2.128 Diff: https://github.com/angr/archinfo/compare/refs/tags/v9.2.127...v9.2.128 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 7b0f033ec87f85..9cbdd72e979f62 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.127"; + version = "9.2.128"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; rev = "refs/tags/v${version}"; - hash = "sha256-hIjL0pa4/TNnyFq61R0ND8o2mEjeRwUJ/S1wP1VglYg="; + hash = "sha256-uNzT3doBHbbRLjxTtndQx+03M9zCdOI+FuTmVea1C1M="; }; build-system = [ setuptools ]; From 1aee3f183b68c78d1f49af2a7659f79090b0f5de Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Nov 2024 21:17:40 +0100 Subject: [PATCH 61/87] python312Packages.ailment: 9.2.127 -> 9.2.128 Diff: https://github.com/angr/ailment/compare/refs/tags/v9.2.127...v9.2.128 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 3fb23cba1ce08e..69174d4fd0ee3f 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.127"; + version = "9.2.128"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; rev = "refs/tags/v${version}"; - hash = "sha256-yd4O4REUjTRYZ3lODlsxmbbPHY7Z2X217wQWSn3Uv3U="; + hash = "sha256-08cIIFuo0Kf3jLtH6STPRAJVo+0ywFCcOo5rpXHXnwA="; }; build-system = [ setuptools ]; From faab3ebba5d11a7349792b27d6c7c8b9ff9e1fd9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Nov 2024 21:19:31 +0100 Subject: [PATCH 62/87] python312Packages.pyvex: 9.2.127 -> 9.2.128 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index acebbd90ef9f91..55e52042704c0e 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.127"; + version = "9.2.128"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-pBbbYtI2ITky6xw09/MSMvCk7HZUCJaMP86GSFkSa1o="; + hash = "sha256-ASo1hqxLsX4UkdhXLOArKBQdxws/maUjGb/HotAoxzw="; }; build-system = [ setuptools ]; From 2abeff7730e7f3c7e4040c02a1090d5a244ec942 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Nov 2024 21:21:00 +0100 Subject: [PATCH 63/87] python312Packages.cle: 9.2.127 -> 9.2.128 Diff: https://github.com/angr/cle/compare/refs/tags/v9.2.127...v9.2.128 --- pkgs/development/python-modules/cle/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index c87cad4fade93f..af5800eb106fbe 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -5,27 +5,25 @@ cart, cffi, fetchFromGitHub, - minidump, pefile, pyelftools, pytestCheckHook, pythonOlder, pyvex, - pyxbe, setuptools, sortedcontainers, }: let # The binaries are following the argr projects release cycle - version = "9.2.127"; + version = "9.2.128"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-EgkYynllp/UGMRJmshQRpnMdwhdOkYHgoMlTiqdtZO1="; + hash = "sha256-wROuTg+RMp2tkjPsjHTK7aJs4SWTuIw4SsuIKIUZvkw="; }; in buildPythonPackage rec { @@ -39,28 +37,22 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-DcfFOzP7Ylms1/kAX5CIhujzj6Vpma8sb0Qyq6tSJq0="; + hash = "sha256-C3lp9Dhg0XZXTxnYbRMfanxVn8qJhL1VEVDrMCpkMe4="; }; build-system = [ setuptools ]; - pythonRelaxDeps = [ "pyvex" ]; - dependencies = [ archinfo cart cffi - minidump pefile pyelftools pyvex - pyxbe sortedcontainers ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; # Place test binaries in the right location (location is hard-coded in the tests) preCheck = '' From 947b12a5957ed51d0860116cb4acc349d34159d5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Nov 2024 21:23:45 +0100 Subject: [PATCH 64/87] python312Packages.claripy: 9.2.127 -> 9.2.128 Diff: https://github.com/angr/claripy/compare/refs/tags/v9.2.127...v9.2.128 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 1b474003ad6079..7a74eba553395b 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.127"; + version = "9.2.128"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-uiB67+5zfLig1TgAzniWaRhibJKmdOPMDAfDVVfMs/0="; + hash = "sha256-YP2Cphf57iyZXrdseZhUkzrkop0+jCRu98ckurxS1UU="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail From 39b547fb848f7e7921dc7a2e16cc9295aca16b0c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Nov 2024 21:24:36 +0100 Subject: [PATCH 65/87] python311Packages.angr: 9.2.127 -> 9.2.128 Diff: https://github.com/angr/angr/compare/refs/tags/v9.2.127...v9.2.128 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 68f100536e5e66..661c458c21fd4b 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.127"; + version = "9.2.128"; pyproject = true; disabled = pythonOlder "3.11"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-hGKxLgXOL+PhhYxxJJQIMcEmFjG4WC9PQE4yP+/QuBg="; + hash = "sha256-OAdPBmJAGqQEiQCXKZMtEoyDMS/A9pUYeTXJQ0qQYVs="; }; postPatch = '' From b8e8cd93f3a3a3eb25e182888d3033a9a21e9156 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Nov 2024 21:54:58 +0100 Subject: [PATCH 66/87] python312Packages.jsonargparse: 4.33.2 -> 4.34.0 Diff: https://github.com/omni-us/jsonargparse/compare/refs/tags/v4.33.2...v4.34.0 Changelog: https://github.com/omni-us/jsonargparse/blob/4.34.0/CHANGELOG.rst --- pkgs/development/python-modules/jsonargparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonargparse/default.nix b/pkgs/development/python-modules/jsonargparse/default.nix index 87f735079ce287..a8334404ae6632 100644 --- a/pkgs/development/python-modules/jsonargparse/default.nix +++ b/pkgs/development/python-modules/jsonargparse/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "jsonargparse"; - version = "4.33.2"; + version = "4.34.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "omni-us"; repo = "jsonargparse"; rev = "refs/tags/v${version}"; - hash = "sha256-yY/j4UwAoe/qQjBQXgFSrv2BX7DB5EyGCdVYoioyKr8="; + hash = "sha256-dj2539vTmzsGNvHqjsCzqo2sqOh2ink8Ut4Mi0qCDzI="; }; build-system = [ setuptools ]; From aa79218b2c6dea1b70f35636713f17df88a6fa5c Mon Sep 17 00:00:00 2001 From: ginkogruen <93037574+ginkogruen@users.noreply.github.com> Date: Tue, 12 Nov 2024 21:55:34 +0100 Subject: [PATCH 67/87] nixos/protonmail-bridge: fix typo protonmail-bride's --> protonmail-bridge's --- nixos/modules/services/mail/protonmail-bridge.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/protonmail-bridge.nix b/nixos/modules/services/mail/protonmail-bridge.nix index da58d9731f0492..acb216d1cfcf0b 100644 --- a/nixos/modules/services/mail/protonmail-bridge.nix +++ b/nixos/modules/services/mail/protonmail-bridge.nix @@ -18,7 +18,7 @@ in type = lib.types.listOf lib.types.path; default = [ ]; example = lib.literalExpression "with pkgs; [ pass gnome-keyring ]"; - description = "List of derivations to put in protonmail-bride's path."; + description = "List of derivations to put in protonmail-bridge's path."; }; logLevel = lib.mkOption { From 3446825e47265b8881866b860963a9216a2bf603 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Nov 2024 21:55:58 +0100 Subject: [PATCH 68/87] python312Packages.playwrightcapture: 1.27.0 -> 1.27.1 Diff: https://github.com/Lookyloo/PlaywrightCapture/compare/refs/tags/v1.27.0...v1.27.1 Changelog: https://github.com/Lookyloo/PlaywrightCapture/releases/tag/v1.27.1 --- pkgs/development/python-modules/playwrightcapture/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index 6b2be979b101e2..32d567b3a79a44 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.27.0"; + version = "1.27.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; rev = "refs/tags/v${version}"; - hash = "sha256-cfgNeUZh492SkgfSJZyaDDeqxC3vHopdIe5UcKHFVck="; + hash = "sha256-2QF59YzveW4OJmueEs9v4qk+sONVQ/XgXhsT8nswNyo="; }; pythonRelaxDeps = [ From 99fc7a750101a5a026033b0c26f050a289756b7d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Nov 2024 21:58:19 +0100 Subject: [PATCH 69/87] python312Packages.mypy-boto3-cloudfront: 1.35.0 -> 1.35.58 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index d900824c486758..05c0cb9ecc86c3 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -230,8 +230,8 @@ rec { "sha256-ElaYUwcYs2/Z5CoTzclkAoMERA2AknrfLh389eN2g54="; mypy-boto3-cloudfront = - buildMypyBoto3Package "cloudfront" "1.35.0" - "sha256-ewZmBuNAs3YS2tG5WDbNBRr1y1BmmOTxvXrSASNhAp4="; + buildMypyBoto3Package "cloudfront" "1.35.58" + "sha256-s71YfOrIIPFeAci2Ca+q5QyV4+JjQ5xdQ5sU8SZE29c="; mypy-boto3-cloudhsm = buildMypyBoto3Package "cloudhsm" "1.35.0" From 07ceb45f3ef5fb9f4c74f597af463770c8c68111 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Nov 2024 21:58:21 +0100 Subject: [PATCH 70/87] python312Packages.mypy-boto3-codebuild: 1.35.55 -> 1.35.59 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 05c0cb9ecc86c3..0fc70c7554f8a5 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -266,8 +266,8 @@ rec { "sha256-wCjyRnd7RlnLRQrADd2Xmh74IsQxBfUgLIJuaZW7kjw="; mypy-boto3-codebuild = - buildMypyBoto3Package "codebuild" "1.35.55" - "sha256-qZ0POshM6WseOoeinzEkGiZP4UxkRvyf2Y83Vv6UYas="; + buildMypyBoto3Package "codebuild" "1.35.59" + "sha256-O/ZxlUd9+dMpYfhaLQEP1XjHx1bpeebQn2aVuh7A0is="; mypy-boto3-codecatalyst = buildMypyBoto3Package "codecatalyst" "1.35.0" From fdd2b90f4e7c78f9999926e9e5f97482f97432ec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Nov 2024 21:58:27 +0100 Subject: [PATCH 71/87] python312Packages.mypy-boto3-controltower: 1.35.0 -> 1.35.59 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 0fc70c7554f8a5..2049283ff29da1 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -358,8 +358,8 @@ rec { "sha256-rYvtpy8Uac5YO4x/WSvUHz0aY8vYVf30gW1aLyYDbRM="; mypy-boto3-controltower = - buildMypyBoto3Package "controltower" "1.35.0" - "sha256-Hc9S/t+sTaMHIk93/pIWowMm0qXyyKf2Jth0j/JdtyA="; + buildMypyBoto3Package "controltower" "1.35.59" + "sha256-fLh9uKE/8iAb/dOIgxe3wKJizZkXjlfBmO2hEr4/L1U="; mypy-boto3-cur = buildMypyBoto3Package "cur" "1.35.0" From f596dffd0dad57d447ea84a782369ee1fb281a26 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Nov 2024 21:58:37 +0100 Subject: [PATCH 72/87] python312Packages.mypy-boto3-fis: 1.35.12 -> 1.35.59 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 2049283ff29da1..c8bcfbf9b1f65d 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -538,8 +538,8 @@ rec { "sha256-QsLASn6dGIQs/nedmPXwzHeZRPIEqWjPqfDKMbaFOmM="; mypy-boto3-fis = - buildMypyBoto3Package "fis" "1.35.12" - "sha256-rm0PB0oie7q+8pl+efohmHe8StLZVvSWYgLIajxd3Fo="; + buildMypyBoto3Package "fis" "1.35.59" + "sha256-Wha+Y0/PXM87u4t2fXD36pe+SrEomr7V9TaxyED6jyA="; mypy-boto3-fms = buildMypyBoto3Package "fms" "1.35.45" From 2d02b1a423178ac0fb501d06c9f9e71136f93cc0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Nov 2024 21:58:39 +0100 Subject: [PATCH 73/87] python312Packages.mypy-boto3-gamelift: 1.35.13 -> 1.35.59 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index c8bcfbf9b1f65d..d2e413c21d5762 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -562,8 +562,8 @@ rec { "sha256-rPVWNk0+Xt9kMAl8xD0xM/EIbiYPSUL8Yc8b+2RcD4o="; mypy-boto3-gamelift = - buildMypyBoto3Package "gamelift" "1.35.13" - "sha256-Xd0jrg/w4CPn5mDgHTaahyRAu5RZxdMcpci0cx7/1sQ="; + buildMypyBoto3Package "gamelift" "1.35.59" + "sha256-OyORzgahpj8UmmKkbdl0FrYaRWtrS07/LSYIkYgcwOY="; mypy-boto3-glacier = buildMypyBoto3Package "glacier" "1.35.0" From b56a493849dc9386f8ebdc0a379c3ac1473acf42 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Nov 2024 21:58:44 +0100 Subject: [PATCH 74/87] python312Packages.mypy-boto3-inspector2: 1.35.4 -> 1.35.58 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index d2e413c21d5762..85130e5dc9057c 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -626,8 +626,8 @@ rec { "sha256-4QXRWahJ0y9Svi/WRIiRFfo36tkKM25bXCTMrZjE41g="; mypy-boto3-inspector2 = - buildMypyBoto3Package "inspector2" "1.35.4" - "sha256-NslpiIBwxTvcEe/Lh8wM2PJE31JNmu4qyCZMbB+9noE="; + buildMypyBoto3Package "inspector2" "1.35.58" + "sha256-jHZg5Y9hX7KinsiwNfwAs8bg8uO71JLIKFl6xDAQJwQ="; mypy-boto3-internetmonitor = buildMypyBoto3Package "internetmonitor" "1.35.8" From 042b0bef2366cbf9ceef6ab17a53d80dc446e75d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Nov 2024 21:58:52 +0100 Subject: [PATCH 75/87] python312Packages.mypy-boto3-lambda: 1.35.57 -> 1.35.58 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 85130e5dc9057c..aa8c6bc61b1fca 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -770,8 +770,8 @@ rec { "sha256-QuVCDfj8bAtFhEnrsGqDYHFbl6awqAjLDjeJn5Rq0IM="; mypy-boto3-lambda = - buildMypyBoto3Package "lambda" "1.35.57" - "sha256-m6zdSyQbRTiCuoWH7GX7CQnZe0A2SMPb8gglgzzldYc="; + buildMypyBoto3Package "lambda" "1.35.58" + "sha256-xoBzY+4YV5s9bf98CQ9ktGKh8kO+Rv5oRzM2JOMeu/w="; mypy-boto3-lex-models = buildMypyBoto3Package "lex-models" "1.35.0" From 866e1d6c714ca013564793495d4329cf7b798623 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Nov 2024 21:59:03 +0100 Subject: [PATCH 76/87] python312Packages.mypy-boto3-opensearch: 1.35.52 -> 1.35.58 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index aa8c6bc61b1fca..9745b374beff19 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -970,8 +970,8 @@ rec { "sha256-CwD0stU2217XD+SXTp+WRyf/qH3EOA5PuBSdTWcXOGU="; mypy-boto3-opensearch = - buildMypyBoto3Package "opensearch" "1.35.52" - "sha256-6a9zygN6Al1yEaOwUvO2Hq/swESKrLW315diz/sgH6c="; + buildMypyBoto3Package "opensearch" "1.35.58" + "sha256-8D48c4NG00r6zpgcoK8FjQqCpOBB4DNE653lwn/K36k="; mypy-boto3-opensearchserverless = buildMypyBoto3Package "opensearchserverless" "1.35.52" From cfdbb4e2fe63a96f8a4d8e151fd4a69261bbe409 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Nov 2024 21:59:05 +0100 Subject: [PATCH 77/87] python312Packages.mypy-boto3-outposts: 1.35.38 -> 1.35.58 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 9745b374beff19..aeba049f810780 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -994,8 +994,8 @@ rec { "sha256-PdOH3KaQn9d455qCR565qFlyCb8t7R8x8wXBebHgtt8="; mypy-boto3-outposts = - buildMypyBoto3Package "outposts" "1.35.38" - "sha256-Adb8A8DVn3T00xuEtXXT+LHxwM4jh0IG3JLUiAi02ds="; + buildMypyBoto3Package "outposts" "1.35.58" + "sha256-L1Kge8GPBYFN7HkTimCTvBOEf1ge1s7FWa4nMM6gypU="; mypy-boto3-panorama = buildMypyBoto3Package "panorama" "1.35.0" From 0b8191aad52164a6b38f7e1ccdddd986be46be8d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Nov 2024 21:59:06 +0100 Subject: [PATCH 78/87] python312Packages.mypy-boto3-payment-cryptography: 1.35.0 -> 1.35.59 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index aeba049f810780..bcfe043a63e9c3 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1002,8 +1002,8 @@ rec { "sha256-HFjrSRkc3cEqImMkqC4V/lfk/ArD9/2swrK7xo9Hut4="; mypy-boto3-payment-cryptography = - buildMypyBoto3Package "payment-cryptography" "1.35.0" - "sha256-b9gTTuQxsXE4CjZgRgbZn4xGSC7N/4v3eF4fF9fFSow="; + buildMypyBoto3Package "payment-cryptography" "1.35.59" + "sha256-WrQdJntSi1l0jLTGdx0icfUn6VLOn543GDz8WxX7h9k="; mypy-boto3-payment-cryptography-data = buildMypyBoto3Package "payment-cryptography-data" "1.35.45" From 20549c4544a595489bcabcca995179a46632863b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Nov 2024 21:59:11 +0100 Subject: [PATCH 79/87] python312Packages.mypy-boto3-rds: 1.35.50 -> 1.35.59 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index bcfe043a63e9c3..83d47b9b140e78 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1086,8 +1086,8 @@ rec { "sha256-85yUjKQ8oiECUYHhmmYrDssyFSQb6itfIRY2iuwCZdo="; mypy-boto3-rds = - buildMypyBoto3Package "rds" "1.35.50" - "sha256-doZ8u+pU5akzuLCa1T+qns/fxOakvsJR5Fj4TsrraBs="; + buildMypyBoto3Package "rds" "1.35.59" + "sha256-287lEFwBHJEvRK1b+heJrpOC6WouOoYyk1Sc1ogMVbo="; mypy-boto3-rds-data = buildMypyBoto3Package "rds-data" "1.35.28" From 28287ac01f1d9881c97bec3d5a0459310b59827c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Nov 2024 21:56:15 +0100 Subject: [PATCH 80/87] python312Packages.lacuscore: 1.12.0 -> 1.12.3 Diff: https://github.com/ail-project/LacusCore/compare/refs/tags/v1.12.0...v1.12.3 Changelog: https://github.com/ail-project/LacusCore/releases/tag/v1.12.3 --- pkgs/development/python-modules/lacuscore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix index f589399afa141a..1cd4707a421d4c 100644 --- a/pkgs/development/python-modules/lacuscore/default.nix +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "lacuscore"; - version = "1.12.0"; + version = "1.12.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "LacusCore"; rev = "refs/tags/v${version}"; - hash = "sha256-83OD/oGzjLsW0FRFyW6Yh9pwh/lcCfZDIe6uahhTRVc="; + hash = "sha256-cKAHNOZZtIdys0z36F0ORf6xXL/JkAgwZouvYYu/OTU="; }; pythonRelaxDeps = [ From 3a5902323ec1024cbfc1203beefdb6617027b996 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 10 Nov 2024 22:03:37 +0100 Subject: [PATCH 81/87] invidious: move to by-name --- .../invidious/default.nix => by-name/in/invidious/package.nix} | 0 pkgs/{servers => by-name/in}/invidious/shards.nix | 0 pkgs/{servers => by-name/in}/invidious/update.sh | 2 +- pkgs/{servers => by-name/in}/invidious/versions.json | 0 pkgs/{servers => by-name/in}/invidious/videojs.nix | 0 pkgs/{servers => by-name/in}/invidious/videojs.sh | 0 pkgs/top-level/all-packages.nix | 2 -- 7 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{servers/invidious/default.nix => by-name/in/invidious/package.nix} (100%) rename pkgs/{servers => by-name/in}/invidious/shards.nix (100%) rename pkgs/{servers => by-name/in}/invidious/update.sh (97%) rename pkgs/{servers => by-name/in}/invidious/versions.json (100%) rename pkgs/{servers => by-name/in}/invidious/videojs.nix (100%) rename pkgs/{servers => by-name/in}/invidious/videojs.sh (100%) diff --git a/pkgs/servers/invidious/default.nix b/pkgs/by-name/in/invidious/package.nix similarity index 100% rename from pkgs/servers/invidious/default.nix rename to pkgs/by-name/in/invidious/package.nix diff --git a/pkgs/servers/invidious/shards.nix b/pkgs/by-name/in/invidious/shards.nix similarity index 100% rename from pkgs/servers/invidious/shards.nix rename to pkgs/by-name/in/invidious/shards.nix diff --git a/pkgs/servers/invidious/update.sh b/pkgs/by-name/in/invidious/update.sh similarity index 97% rename from pkgs/servers/invidious/update.sh rename to pkgs/by-name/in/invidious/update.sh index 848a6a9010eaed..a23cc7de0cfe8f 100755 --- a/pkgs/servers/invidious/update.sh +++ b/pkgs/by-name/in/invidious/update.sh @@ -51,7 +51,7 @@ json_set '.invidious.date' "$date" json_set '.invidious.commit' "$commit" json_set '.invidious.version' "$new_version" -new_hash=$(nix-prefetch -I 'nixpkgs=../../..' "$pkg") +new_hash=$(nix-prefetch -I 'nixpkgs=../../../..' "$pkg") json_set '.invidious.hash' "$new_hash" # fetch video.js dependencies diff --git a/pkgs/servers/invidious/versions.json b/pkgs/by-name/in/invidious/versions.json similarity index 100% rename from pkgs/servers/invidious/versions.json rename to pkgs/by-name/in/invidious/versions.json diff --git a/pkgs/servers/invidious/videojs.nix b/pkgs/by-name/in/invidious/videojs.nix similarity index 100% rename from pkgs/servers/invidious/videojs.nix rename to pkgs/by-name/in/invidious/videojs.nix diff --git a/pkgs/servers/invidious/videojs.sh b/pkgs/by-name/in/invidious/videojs.sh similarity index 100% rename from pkgs/servers/invidious/videojs.sh rename to pkgs/by-name/in/invidious/videojs.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fdeeb4ed343c7c..1c64c52d8c5247 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3995,8 +3995,6 @@ with pkgs; internetarchive = with python3Packages; toPythonApplication internetarchive; - invidious = callPackage ../servers/invidious { }; - iocextract = with python3Packages; toPythonApplication iocextract; iocsearcher = with python3Packages; toPythonApplication iocsearcher; From 8a01636d81f2edd5459776c6237ca34b3ae155fc Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Mon, 11 Nov 2024 20:54:35 +0000 Subject: [PATCH 82/87] python3Packages.dulwich: 0.22.1 -> 0.22.5 --- pkgs/development/python-modules/dulwich/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 91a1869099c860..752a09be221e5f 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -20,7 +20,7 @@ }: buildPythonPackage rec { - version = "0.22.1"; + version = "0.22.5"; pname = "dulwich"; format = "setuptools"; @@ -30,17 +30,9 @@ buildPythonPackage rec { owner = "jelmer"; repo = "dulwich"; rev = "refs/tags/dulwich-${version}"; - hash = "sha256-bf3ZUMX4afpdTBpFnx0HMyzCNG6V/p4eOl36djxGbtk="; + hash = "sha256-/YqC7y8PU+H2qjPqqzdw6iSSSElK709izLTcs9qbt1I="; }; - patches = [ - (fetchpatch2 { - name = "dulwich-geventhttpclient-api-breakage.patch"; - url = "https://github.com/jelmer/dulwich/commit/5f0497de9c37ac4f4e8f27bed8decce13765d3df.patch"; - hash = "sha256-0GgDgmYuLCsMc9nRRLNL2W6WYrkZ/1ZnZBQusEAzLKI="; - }) - ]; - build-system = [ setuptools setuptools-rust From 8a103a32b4553a03f413c69df25897d0d6c94cd1 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Tue, 15 Oct 2024 15:37:27 +0800 Subject: [PATCH 83/87] alist: init at 3.38.0 Co-authored-by: jian-lin --- pkgs/by-name/al/alist/package.nix | 108 ++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 pkgs/by-name/al/alist/package.nix diff --git a/pkgs/by-name/al/alist/package.nix b/pkgs/by-name/al/alist/package.nix new file mode 100644 index 00000000000000..c9bbb2768ff483 --- /dev/null +++ b/pkgs/by-name/al/alist/package.nix @@ -0,0 +1,108 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + fetchurl, + fuse, + stdenv, + installShellFiles, + versionCheckHook, +}: +buildGoModule rec { + pname = "alist"; + version = "3.38.0"; + + src = fetchFromGitHub { + owner = "AlistGo"; + repo = "alist"; + rev = "refs/tags/v${version}"; + hash = "sha256-HF5T/TZXiyT186qZyzz+m0K9ajF1wk8YAZljcq5ccWM="; + # populate values that require us to use git. By doing this in postFetch we + # can delete .git afterwards and maintain better reproducibility of the src. + leaveDotGit = true; + postFetch = '' + cd "$out" + git rev-parse HEAD > $out/COMMIT + # '0000-00-00T00:00:00Z' + date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; + }; + web = fetchurl { + url = "https://github.com/AlistGo/alist-web/releases/download/${version}/dist.tar.gz"; + hash = "sha256-jHbWhjvHfgtdocuuELbOwrMzL8tOQfBVdH9MxasEwGo="; + }; + + vendorHash = "sha256-qSbvb2/y5rdS/OCutNEcRDUQBCAgNudux8XDnY9TRSo="; + + buildInputs = [ fuse ]; + + tags = [ "jsoniter" ]; + + ldflags = [ + "-s" + "-w" + "-X \"github.com/alist-org/alist/v3/internal/conf.GitAuthor=Xhofe \"" + "-X github.com/alist-org/alist/v3/internal/conf.Version=${version}" + "-X github.com/alist-org/alist/v3/internal/conf.WebVersion=${version}" + ]; + + preConfigure = '' + # use matched web files + rm -rf public/dist + tar -xzf ${web} + mv -f dist public + ''; + + preBuild = '' + ldflags+=" -X \"github.com/alist-org/alist/v3/internal/conf.GoVersion=$(go version | sed 's/go version //')\"" + ldflags+=" -X \"github.com/alist-org/alist/v3/internal/conf.BuiltAt=$(cat SOURCE_DATE_EPOCH)\"" + ldflags+=" -X github.com/alist-org/alist/v3/internal/conf.GitCommit=$(cat COMMIT)" + ''; + + checkFlags = + let + # Skip tests that require network access + skippedTests = [ + "TestHTTPAll" + "TestWebsocketAll" + "TestWebsocketCaller" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd alist \ + --bash <($out/bin/alist completion bash) \ + --fish <($out/bin/alist completion fish) \ + --zsh <($out/bin/alist completion zsh) + ''; + + doInstallCheck = true; + + versionCheckProgramArg = "version"; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + meta = { + description = "File list/WebDAV program that supports multiple storages"; + homepage = "https://github.com/alist-org/alist"; + changelog = "https://github.com/alist-org/alist/releases/tag/v${version}"; + license = with lib.licenses; [ + agpl3Only + # alist-web + mit + ]; + maintainers = with lib.maintainers; [ moraxyc ]; + sourceProvenance = with lib.sourceTypes; [ + fromSource + # alist-web + binaryBytecode + ]; + mainProgram = "alist"; + }; +} From 05169e07a654feb2fbb300bbdb907dda72d1e7c9 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Wed, 13 Nov 2024 16:02:49 +0800 Subject: [PATCH 84/87] alist: add proxyVendor Co-authored-by: jian-lin --- pkgs/by-name/al/alist/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/al/alist/package.nix b/pkgs/by-name/al/alist/package.nix index c9bbb2768ff483..b89eb1387968c4 100644 --- a/pkgs/by-name/al/alist/package.nix +++ b/pkgs/by-name/al/alist/package.nix @@ -33,7 +33,8 @@ buildGoModule rec { hash = "sha256-jHbWhjvHfgtdocuuELbOwrMzL8tOQfBVdH9MxasEwGo="; }; - vendorHash = "sha256-qSbvb2/y5rdS/OCutNEcRDUQBCAgNudux8XDnY9TRSo="; + proxyVendor = true; + vendorHash = "sha256-Q5E86bNedXOqMKS3WrXicWg27vnjyGao0nE34Ws2l9E="; buildInputs = [ fuse ]; From 7ce8314339cbbbc2e528047859aaa8e97ec28b85 Mon Sep 17 00:00:00 2001 From: Wataru Matsuoka <93639059+wattmto@users.noreply.github.com> Date: Wed, 13 Nov 2024 17:31:44 +0900 Subject: [PATCH 85/87] maintainers: rename milran to wattmto (#355397) * maintainers: Update email and rename * gqlgenc: rename maintainter * onioncircuits: rename maintainer * fcitx5-skk: rename maintainer --- maintainers/maintainer-list.nix | 12 ++++++------ pkgs/by-name/gq/gqlgenc/package.nix | 2 +- pkgs/by-name/on/onioncircuits/package.nix | 2 +- pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 74b8a15d61f3e5..f7256fa822949b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14378,12 +14378,6 @@ githubId = 5378535; name = "Milo Gertjejansen"; }; - milran = { - email = "milranmike@protonmail.com"; - github = "wattmto"; - githubId = 93639059; - name = "Milran Mike"; - }; mimame = { email = "miguel.madrid.mencia@gmail.com"; github = "mimame"; @@ -23360,6 +23354,12 @@ github = "water-sucks"; githubId = 68445574; }; + wattmto = { + email = "dev@wattmto.dev"; + github = "wattmto"; + githubId = 93639059; + name = "wattmto"; + }; waynr = { name = "Wayne Warren"; email = "wayne.warren.s@gmail.com"; diff --git a/pkgs/by-name/gq/gqlgenc/package.nix b/pkgs/by-name/gq/gqlgenc/package.nix index e737adb026563c..d06916abca1b14 100644 --- a/pkgs/by-name/gq/gqlgenc/package.nix +++ b/pkgs/by-name/gq/gqlgenc/package.nix @@ -20,6 +20,6 @@ buildGoModule rec { mainProgram = "gqlgenc"; homepage = "https://github.com/Yamashou/gqlgenc"; license = licenses.mit; - maintainers = with maintainers; [ milran ]; + maintainers = with maintainers; [ wattmto ]; }; } diff --git a/pkgs/by-name/on/onioncircuits/package.nix b/pkgs/by-name/on/onioncircuits/package.nix index e5979a0f7084ef..e15509925bcb9b 100644 --- a/pkgs/by-name/on/onioncircuits/package.nix +++ b/pkgs/by-name/on/onioncircuits/package.nix @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec { description = "GTK application to display Tor circuits and streams"; mainProgram = "onioncircuits"; license = licenses.gpl3; - maintainers = with maintainers; [ milran ]; + maintainers = with maintainers; [ wattmto ]; }; } diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix index c2679dbcd71d0b..7f57597052554e 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { description = "Input method engine for Fcitx5, which uses libskk as its backend"; homepage = "https://github.com/fcitx/fcitx5-skk"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ milran ]; + maintainers = with maintainers; [ wattmto ]; platforms = platforms.linux; }; } From 6733601f454b3e7ad93ba99654ebf7fdb58cfe6c Mon Sep 17 00:00:00 2001 From: Jonas Chevalier Date: Wed, 13 Nov 2024 10:52:48 +0100 Subject: [PATCH 86/87] mergiraf: init at 0.2.0 (#354870) --- pkgs/by-name/me/mergiraf/Cargo.lock | 1588 ++++++++++++++++++++++++++ pkgs/by-name/me/mergiraf/package.nix | 41 + 2 files changed, 1629 insertions(+) create mode 100644 pkgs/by-name/me/mergiraf/Cargo.lock create mode 100644 pkgs/by-name/me/mergiraf/package.nix diff --git a/pkgs/by-name/me/mergiraf/Cargo.lock b/pkgs/by-name/me/mergiraf/Cargo.lock new file mode 100644 index 00000000000000..84be0981f76834 --- /dev/null +++ b/pkgs/by-name/me/mergiraf/Cargo.lock @@ -0,0 +1,1588 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56" + +[[package]] +name = "anstyle-parse" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" +dependencies = [ + "anstyle", + "windows-sys 0.59.0", +] + +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] + +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "cc" +version = "1.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", + "windows-targets 0.52.6", +] + +[[package]] +name = "clap" +version = "4.5.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.85", +] + +[[package]] +name = "clap_lex" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + +[[package]] +name = "colorchoice" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "cpufeatures" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.85", +] + +[[package]] +name = "derive_more" +version = "0.99.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.85", +] + +[[package]] +name = "diffy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d3041965b7a63e70447ec818a46b1e5297f7fcae3058356d226c02750c4e6cb" +dependencies = [ + "nu-ansi-term", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.85", +] + +[[package]] +name = "dot-generator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aaac7ada45f71873ebce336491d1c1bc4a7c8042c7cea978168ad59e805b871" +dependencies = [ + "dot-structures", +] + +[[package]] +name = "dot-structures" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "675e35c02a51bb4d4618cb4885b3839ce6d1787c97b664474d9208d074742e20" + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + +[[package]] +name = "fastrand" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "futures" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" + +[[package]] +name = "futures-executor" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + +[[package]] +name = "futures-macro" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.85", +] + +[[package]] +name = "futures-sink" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" + +[[package]] +name = "futures-task" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" + +[[package]] +name = "futures-timer" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" + +[[package]] +name = "futures-util" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "graphviz-rust" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f7892a4538fc9aa3658ae6962774428487c16e11663c58c594357975377c901" +dependencies = [ + "dot-generator", + "dot-structures", + "into-attr", + "into-attr-derive", + "pest", + "pest_derive", + "rand", + "tempfile", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +dependencies = [ + "equivalent", + "hashbrown 0.15.0", +] + +[[package]] +name = "integer-sqrt" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "276ec31bcb4a9ee45f58bec6f9ec700ae4cf4f4f8f2fa7e06cb406bd5ffdd770" +dependencies = [ + "num-traits", +] + +[[package]] +name = "into-attr" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18b48c537e49a709e678caec3753a7dba6854661a1eaa27675024283b3f8b376" +dependencies = [ + "dot-structures", +] + +[[package]] +name = "into-attr-derive" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecac7c1ae6cd2c6a3a64d1061a8bdc7f52ff62c26a831a2301e54c1b5d70d5b1" +dependencies = [ + "dot-generator", + "dot-structures", + "into-attr", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "is-terminal" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "js-sys" +version = "0.3.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "libc" +version = "0.2.161" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "lockfree-object-pool" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "mergiraf" +version = "0.1.1" +dependencies = [ + "cc", + "clap", + "diffy", + "etcetera", + "graphviz-rust", + "itertools 0.13.0", + "log", + "rand", + "regex", + "rstest", + "stderrlog", + "tempfile", + "tree-edit-distance", + "tree-sitter", + "tree-sitter-c-sharp", + "tree-sitter-cpp", + "tree-sitter-go", + "tree-sitter-html", + "tree-sitter-java", + "tree-sitter-javascript", + "tree-sitter-json", + "tree-sitter-rust", + "tree-sitter-xml", + "tree-sitter-yaml", + "typed-arena", + "zip", +] + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "nu-ansi-term" +version = "0.50.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[package]] +name = "pathfinding" +version = "3.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb45190a18e771c500291c549959777a3be38d30113a860930bc1f2119f0cc13" +dependencies = [ + "fixedbitset", + "indexmap 1.9.3", + "integer-sqrt", + "itertools 0.10.5", + "num-traits", + "rustc-hash", + "thiserror", +] + +[[package]] +name = "pest" +version = "2.7.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn 2.0.85", +] + +[[package]] +name = "pest_meta" +version = "2.7.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "proc-macro-crate" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" +dependencies = [ + "toml_edit", +] + +[[package]] +name = "proc-macro2" +version = "1.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "regex" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "relative-path" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" + +[[package]] +name = "rstest" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9afd55a67069d6e434a95161415f5beeada95a01c7b815508a82dcb0e1593682" +dependencies = [ + "futures", + "futures-timer", + "rstest_macros", + "rustc_version", +] + +[[package]] +name = "rstest_macros" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4165dfae59a39dd41d8dec720d3cbfbc71f69744efb480a3920f5d4e0cc6798d" +dependencies = [ + "cfg-if", + "glob", + "proc-macro-crate", + "proc-macro2", + "quote", + "regex", + "relative-path", + "rustc_version", + "syn 2.0.85", + "unicode-ident", +] + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a" +dependencies = [ + "bitflags", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "stderrlog" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c910772f992ab17d32d6760e167d2353f4130ed50e796752689556af07dc6b" +dependencies = [ + "chrono", + "is-terminal", + "log", + "termcolor", + "thread_local", +] + +[[package]] +name = "streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.85" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.85", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" + +[[package]] +name = "toml_edit" +version = "0.22.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +dependencies = [ + "indexmap 2.6.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tree-edit-distance" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71cf959f76103341744494caf1ace7f105244b980b1a3b848d5b1a070c42c16" +dependencies = [ + "arrayvec", + "derive_more", + "itertools 0.10.5", + "pathfinding", +] + +[[package]] +name = "tree-sitter" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9871f16d6cf5c4757dcf30d5d2172a2df6987c510c017bbb7abfb7f9aa24d06" +dependencies = [ + "cc", + "regex", + "regex-syntax", + "streaming-iterator", + "tree-sitter-language", +] + +[[package]] +name = "tree-sitter-c-sharp" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04c0f6d2209a3cd6d0bb9d2934715da15a15710d3c09c7c1ecd4c9804c3ecd10" +dependencies = [ + "cc", + "tree-sitter-language", +] + +[[package]] +name = "tree-sitter-cpp" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d67e862242878d6ee50e1e5814f267ee3eea0168aea2cdbd700ccfb4c74b6d3" +dependencies = [ + "cc", + "tree-sitter-language", +] + +[[package]] +name = "tree-sitter-go" +version = "0.23.1" +source = "git+https://github.com/tree-sitter/tree-sitter-go.git?rev=ecc20866d1bd4d80f3aef06456ed3014d4d598e6#ecc20866d1bd4d80f3aef06456ed3014d4d598e6" +dependencies = [ + "cc", + "tree-sitter-language", +] + +[[package]] +name = "tree-sitter-html" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d52d710a3723360ebade986d3f0ae2aa2c3bcfb87bb1cdf60988ec51c81c40d" +dependencies = [ + "cc", + "tree-sitter-language", +] + +[[package]] +name = "tree-sitter-java" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b38b26736e6e97421760201f7a91c859f3b0d44382d48ac18aa963828f784ebf" +dependencies = [ + "cc", + "tree-sitter-language", +] + +[[package]] +name = "tree-sitter-javascript" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59e1f62f8babb640b909f30675d1addeb1f17802f2a4d2af287569753b243977" +dependencies = [ + "cc", + "tree-sitter-language", +] + +[[package]] +name = "tree-sitter-json" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86a5d6b3ea17e06e7a34aabeadd68f5866c0d0f9359155d432095f8b751865e4" +dependencies = [ + "cc", + "tree-sitter-language", +] + +[[package]] +name = "tree-sitter-language" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8ddffe35a0e5eeeadf13ff7350af564c6e73993a24db62caee1822b185c2600" + +[[package]] +name = "tree-sitter-rust" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cffbbcb780348fbae8395742ae5b34c1fd794e4085d43aac9f259387f9a84dc8" +dependencies = [ + "cc", + "tree-sitter-language", +] + +[[package]] +name = "tree-sitter-xml" +version = "0.7.0" +source = "git+https://github.com/tree-sitter-grammars/tree-sitter-xml.git?rev=cd1316e476ec40da6ce1fb5749c9d7e6b4f1090c#cd1316e476ec40da6ce1fb5749c9d7e6b4f1090c" +dependencies = [ + "cc", + "tree-sitter-language", +] + +[[package]] +name = "tree-sitter-yaml" +version = "0.6.1" +source = "git+https://github.com/wetneb/tree-sitter-yaml.git?rev=7b5199133abceb03d6d1d8f1672f49b4f2a71442#7b5199133abceb03d6d1d8f1672f49b4f2a71442" +dependencies = [ + "cc", + "tree-sitter-language", +] + +[[package]] +name = "typed-arena" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "ucd-trie" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.85", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.85", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +dependencies = [ + "memchr", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.85", +] + +[[package]] +name = "zip" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494" +dependencies = [ + "arbitrary", + "crc32fast", + "crossbeam-utils", + "displaydoc", + "flate2", + "indexmap 2.6.0", + "memchr", + "thiserror", + "zopfli", +] + +[[package]] +name = "zopfli" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" +dependencies = [ + "bumpalo", + "crc32fast", + "lockfree-object-pool", + "log", + "once_cell", + "simd-adler32", +] diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix new file mode 100644 index 00000000000000..d0437be51e6fca --- /dev/null +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -0,0 +1,41 @@ +{ + stdenv, + lib, + fetchFromGitea, + rustPlatform, + + # native check inputs + git, +}: + +rustPlatform.buildRustPackage rec { + pname = "mergiraf"; + version = "0.2.0"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "mergiraf"; + repo = "mergiraf"; + rev = "refs/tags/v${version}"; + hash = "sha256-egtX2daCbPXi5rX2OxbEZA/VI9R4HMj5LRKbUEBFo+E="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "tree-sitter-go-0.23.1" = "sha256-elPqkvVYs0vADOuN/umDteWP5hqcXhQAoSkqYDtTxaU="; + "tree-sitter-xml-0.7.0" = "sha256-RTWvOUAs3Uql9DKsP1jf9FZZHaZORE40GXd+6g6RQZw="; + "tree-sitter-yaml-0.6.1" = "sha256-gS+SjOnGl/86U9VV/y1ca7naYIe7DAOvOv++jCRLTKo="; + }; + }; + + nativeCheckInputs = [ git ]; + + meta = { + description = "Syntax-aware git merge driver for a growing collection of programming languages and file formats"; + mainProgram = "mergiraf"; + homepage = "https://mergiraf.org/"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ zimbatm ]; + }; +} From 8b4df30ab31fa4103dfc6fb8c30a8beaa0aec395 Mon Sep 17 00:00:00 2001 From: Bot_wxt1221 <3264117476@qq.com> Date: Wed, 13 Nov 2024 19:57:57 +0800 Subject: [PATCH 87/87] Mindustry: fix build on non x86 device (#355174) * Mindustry: move to by-name * Mindustry: nixfmt * Mindustry: fix build on non x86 device --- ...1-fix-include-path-for-SDL2-on-linux.patch | 0 .../{games => by-name/mi}/mindustry/deps.json | 0 pkgs/by-name/mi/mindustry/package.nix | 286 ++++++++++++++++++ pkgs/games/mindustry/default.nix | 245 --------------- pkgs/top-level/all-packages.nix | 5 +- 5 files changed, 288 insertions(+), 248 deletions(-) rename pkgs/{games => by-name/mi}/mindustry/0001-fix-include-path-for-SDL2-on-linux.patch (100%) rename pkgs/{games => by-name/mi}/mindustry/deps.json (100%) create mode 100644 pkgs/by-name/mi/mindustry/package.nix delete mode 100644 pkgs/games/mindustry/default.nix diff --git a/pkgs/games/mindustry/0001-fix-include-path-for-SDL2-on-linux.patch b/pkgs/by-name/mi/mindustry/0001-fix-include-path-for-SDL2-on-linux.patch similarity index 100% rename from pkgs/games/mindustry/0001-fix-include-path-for-SDL2-on-linux.patch rename to pkgs/by-name/mi/mindustry/0001-fix-include-path-for-SDL2-on-linux.patch diff --git a/pkgs/games/mindustry/deps.json b/pkgs/by-name/mi/mindustry/deps.json similarity index 100% rename from pkgs/games/mindustry/deps.json rename to pkgs/by-name/mi/mindustry/deps.json diff --git a/pkgs/by-name/mi/mindustry/package.nix b/pkgs/by-name/mi/mindustry/package.nix new file mode 100644 index 00000000000000..998946c8eeb9f0 --- /dev/null +++ b/pkgs/by-name/mi/mindustry/package.nix @@ -0,0 +1,286 @@ +{ + lib, + stdenv, + fetchpatch, + makeWrapper, + makeDesktopItem, + copyDesktopItems, + fetchFromGitHub, + gradle, + jdk17, + zenity, + + # for arc + SDL2, + pkg-config, + ant, + curl, + wget, + alsa-lib, + alsa-plugins, + glew, + + # for soloud + libpulseaudio ? null, + libjack2 ? null, + + nixosTests, + + # Make the build version easily overridable. + # Server and client build versions must match, and an empty build version means + # any build is allowed, so this parameter acts as a simple whitelist. + # Takes the package version and returns the build version. + makeBuildVersion ? (v: v), + enableClient ? true, + enableServer ? true, + + enableWayland ? false, +}: + +let + pname = "mindustry"; + version = "146"; + buildVersion = makeBuildVersion version; + + jdk = jdk17; + + Mindustry = fetchFromGitHub { + owner = "Anuken"; + repo = "Mindustry"; + rev = "v${version}"; + hash = "sha256-pJAJjb8rgDL5q2hfuXH2Cyb1Szu4GixeXoLMdnIAlno="; + }; + Arc = fetchFromGitHub { + owner = "Anuken"; + repo = "Arc"; + rev = "v${version}"; + hash = "sha256-L+5fshI1oo1lVdTMTBuPzqtEeR2dq1NORP84rZ83rT0="; + }; + soloud = fetchFromGitHub { + owner = "Anuken"; + repo = "soloud"; + # This is pinned in Arc's arc-core/build.gradle + rev = "v0.9"; + hash = "sha256-6KlqOtA19MxeqZttNyNrMU7pKqzlNiA4rBZKp9ekanc="; + }; + + desktopItem = makeDesktopItem { + name = "Mindustry"; + desktopName = "Mindustry"; + exec = "mindustry"; + icon = "mindustry"; + categories = [ "Game" ]; + }; + +in +assert lib.assertMsg ( + enableClient || enableServer +) "mindustry: at least one of 'enableClient' and 'enableServer' must be true"; +stdenv.mkDerivation { + inherit pname version; + + unpackPhase = '' + runHook preUnpack + + cp -r ${Mindustry} Mindustry + cp -r ${Arc} Arc + chmod -R u+w -- Mindustry Arc + cp -r ${soloud} Arc/arc-core/csrc/soloud + chmod -R u+w -- Arc/arc-core/csrc/soloud + + runHook postUnpack + ''; + + patches = [ + ./0001-fix-include-path-for-SDL2-on-linux.patch + # Fix build with gradle 8.8, remove on next Arc release + (fetchpatch { + url = "https://github.com/Anuken/Arc/commit/2a91c51bf45d700091e397fd0b62384763901ae6.patch"; + hash = "sha256-sSD78GmF14vBvNe+ajUJ4uIc4p857shTP/UkAK6Pyyg="; + extraPrefix = "Arc/"; + stripLen = 1; + }) + (fetchpatch { + url = "https://github.com/Anuken/Arc/commit/d7f8ea858c425410dbd43374271a703d4443b432.patch"; + hash = "sha256-5LPgBOV0r/dUtpyxitTu3/9tMIqjeIKfGVJi3MEr7fQ="; + extraPrefix = "Arc/"; + stripLen = 1; + }) + (fetchpatch { + url = "https://github.com/Anuken/Mindustry/commit/695dad201fb4c2b4252f2ee5abde32e968169ba5.patch"; + hash = "sha256-bbTjyfUl+XFG/dgD1XPddVKD/ImOP5ARAP3q0FPnt58="; + name = "always-use-local-arc-1.patch"; + stripLen = 1; + extraPrefix = "Mindustry/"; + }) + (fetchpatch { + url = "https://github.com/Anuken/Mindustry/commit/f6082225e859c759c8d9c944250b6ecd490151ed.patch"; + hash = "sha256-xFHdAUTS1EiHNQqw6qfzYk2LMr/DjeHoEzQfcfOUcFs="; + name = "always-use-local-arc-2.patch"; + stripLen = 1; + extraPrefix = "Mindustry/"; + }) + (fetchpatch { + url = "https://github.com/Anuken/Mindustry/commit/e4eadbbb7f35db3093a0a3d13272bdfbedfaead3.patch"; + hash = "sha256-L/XQAxh6UgKsTVTgQKDXNRIAdtVtaY4ameT/Yb/+1p8="; + name = "always-use-local-arc-3.patch"; + stripLen = 1; + extraPrefix = "Mindustry/"; + }) + ]; + + postPatch = + '' + # Ensure the prebuilt shared objects don't accidentally get shipped + rm -r Arc/natives/natives-*/libs/* + rm -r Arc/backends/backend-*/libs/* + + cd Mindustry + + # Remove unbuildable iOS stuff + sed -i '/^project(":ios"){/,/^}/d' build.gradle + sed -i '/robo(vm|VM)/d' build.gradle + rm ios/build.gradle + '' + + lib.optionalString (!stdenv.hostPlatform.isx86) '' + substituteInPlace ../Arc/arc-core/build.gradle \ + --replace-fail "-msse" "" + substituteInPlace ../Arc/backends/backend-sdl/build.gradle \ + --replace-fail "-m64" "" + ''; + + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + buildInputs = lib.optionals enableClient [ + SDL2 + alsa-lib + glew + ]; + nativeBuildInputs = + [ + pkg-config + gradle + makeWrapper + jdk + ] + ++ lib.optionals enableClient [ + ant + copyDesktopItems + curl + wget + ]; + + desktopItems = lib.optional enableClient desktopItem; + + gradleFlags = [ + "-Pbuildversion=${buildVersion}" + "-Dorg.gradle.java.home=${jdk}" + ]; + + buildPhase = + '' + runHook preBuild + '' + + lib.optionalString enableServer '' + gradle server:dist + '' + + lib.optionalString enableClient '' + pushd ../Arc + gradle jnigenBuild + gradle jnigenJarNativesDesktop + glewlib=${lib.getLib glew}/lib/libGLEW.so + sdllib=${lib.getLib SDL2}/lib/libSDL2.so + patchelf backends/backend-sdl/libs/linux64/libsdl-arc*.so \ + --add-needed $glewlib \ + --add-needed $sdllib + # Put the freshly-built libraries where the pre-built libraries used to be: + cp arc-core/libs/*/* natives/natives-desktop/libs/ + cp extensions/freetype/libs/*/* natives/natives-freetype-desktop/libs/ + popd + + gradle desktop:dist + '' + + '' + runHook postBuild + ''; + + installPhase = + let + installClient = '' + install -Dm644 desktop/build/libs/Mindustry.jar $out/share/mindustry.jar + mkdir -p $out/bin + makeWrapper ${jdk}/bin/java $out/bin/mindustry \ + --add-flags "-jar $out/share/mindustry.jar" \ + ${lib.optionalString stdenv.hostPlatform.isLinux "--suffix PATH : ${lib.makeBinPath [ zenity ]}"} \ + --suffix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + libpulseaudio + alsa-lib + libjack2 + ] + } \ + --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib/ ${lib.optionalString enableWayland '' + --set SDL_VIDEODRIVER wayland \ + --set SDL_VIDEO_WAYLAND_WMCLASS Mindustry + ''} + + # Retain runtime depends to prevent them from being cleaned up. + # Since a jar is a compressed archive, nix can't figure out that the dependency is actually in there, + # and will assume that it's not actually needed. + # This can cause issues. + # See https://github.com/NixOS/nixpkgs/issues/109798. + echo "# Retained runtime dependencies: " >> $out/bin/mindustry + for dep in ${SDL2.out} ${alsa-lib.out} ${glew.out}; do + echo "# $dep" >> $out/bin/mindustry + done + + install -Dm644 core/assets/icons/icon_64.png $out/share/icons/hicolor/64x64/apps/mindustry.png + ''; + installServer = '' + install -Dm644 server/build/libs/server-release.jar $out/share/mindustry-server.jar + mkdir -p $out/bin + makeWrapper ${jdk}/bin/java $out/bin/mindustry-server \ + --add-flags "-jar $out/share/mindustry-server.jar" + ''; + in + '' + runHook preInstall + '' + + lib.optionalString enableClient installClient + + lib.optionalString enableServer installServer + + '' + runHook postInstall + ''; + + postGradleUpdate = '' + # this fetches non-gradle dependencies + cd ../Arc + gradle preJni + ''; + + passthru.tests.nixosTest = nixosTests.mindustry; + + meta = { + homepage = "https://mindustrygame.github.io/"; + downloadPage = "https://github.com/Anuken/Mindustry/releases"; + description = "Sandbox tower defense game"; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode # deps + ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + chkno + fgaz + thekostins + ]; + platforms = lib.platforms.all; + # TODO alsa-lib is linux-only, figure out what dependencies are required on Darwin + broken = enableClient && stdenv.hostPlatform.isDarwin; + }; +} diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix deleted file mode 100644 index b92f78ab5d608c..00000000000000 --- a/pkgs/games/mindustry/default.nix +++ /dev/null @@ -1,245 +0,0 @@ -{ lib -, stdenv -, fetchpatch -, makeWrapper -, makeDesktopItem -, copyDesktopItems -, fetchFromGitHub -, gradle -, jdk17 -, zenity - -# for arc -, SDL2 -, pkg-config -, ant -, curl -, wget -, alsa-lib -, alsa-plugins -, glew - -# for soloud -, libpulseaudio ? null -, libjack2 ? null - -, nixosTests - - -# Make the build version easily overridable. -# Server and client build versions must match, and an empty build version means -# any build is allowed, so this parameter acts as a simple whitelist. -# Takes the package version and returns the build version. -, makeBuildVersion ? (v: v) -, enableClient ? true -, enableServer ? true - -, enableWayland ? false -}: - -let - pname = "mindustry"; - version = "146"; - buildVersion = makeBuildVersion version; - - jdk = jdk17; - - Mindustry = fetchFromGitHub { - owner = "Anuken"; - repo = "Mindustry"; - rev = "v${version}"; - hash = "sha256-pJAJjb8rgDL5q2hfuXH2Cyb1Szu4GixeXoLMdnIAlno="; - }; - Arc = fetchFromGitHub { - owner = "Anuken"; - repo = "Arc"; - rev = "v${version}"; - hash = "sha256-L+5fshI1oo1lVdTMTBuPzqtEeR2dq1NORP84rZ83rT0="; - }; - soloud = fetchFromGitHub { - owner = "Anuken"; - repo = "soloud"; - # This is pinned in Arc's arc-core/build.gradle - rev = "v0.9"; - hash = "sha256-6KlqOtA19MxeqZttNyNrMU7pKqzlNiA4rBZKp9ekanc="; - }; - - desktopItem = makeDesktopItem { - name = "Mindustry"; - desktopName = "Mindustry"; - exec = "mindustry"; - icon = "mindustry"; - categories = [ "Game" ]; - }; - -in -assert lib.assertMsg (enableClient || enableServer) - "mindustry: at least one of 'enableClient' and 'enableServer' must be true"; -stdenv.mkDerivation { - inherit pname version; - - unpackPhase = '' - cp -r ${Mindustry} Mindustry - cp -r ${Arc} Arc - chmod -R u+w -- Mindustry Arc - cp -r ${soloud} Arc/arc-core/csrc/soloud - chmod -R u+w -- Arc/arc-core/csrc/soloud - ''; - - patches = [ - ./0001-fix-include-path-for-SDL2-on-linux.patch - # Fix build with gradle 8.8, remove on next Arc release - (fetchpatch { - url = "https://github.com/Anuken/Arc/commit/2a91c51bf45d700091e397fd0b62384763901ae6.patch"; - hash = "sha256-sSD78GmF14vBvNe+ajUJ4uIc4p857shTP/UkAK6Pyyg="; - extraPrefix = "Arc/"; - stripLen = 1; - }) - (fetchpatch { - url = "https://github.com/Anuken/Arc/commit/d7f8ea858c425410dbd43374271a703d4443b432.patch"; - hash = "sha256-5LPgBOV0r/dUtpyxitTu3/9tMIqjeIKfGVJi3MEr7fQ="; - extraPrefix = "Arc/"; - stripLen = 1; - }) - (fetchpatch { - url = "https://github.com/Anuken/Mindustry/commit/695dad201fb4c2b4252f2ee5abde32e968169ba5.patch"; - hash = "sha256-bbTjyfUl+XFG/dgD1XPddVKD/ImOP5ARAP3q0FPnt58="; - name = "always-use-local-arc-1.patch"; - stripLen = 1; extraPrefix = "Mindustry/"; - }) - (fetchpatch { - url = "https://github.com/Anuken/Mindustry/commit/f6082225e859c759c8d9c944250b6ecd490151ed.patch"; - hash = "sha256-xFHdAUTS1EiHNQqw6qfzYk2LMr/DjeHoEzQfcfOUcFs="; - name = "always-use-local-arc-2.patch"; - stripLen = 1; extraPrefix = "Mindustry/"; - }) - (fetchpatch { - url = "https://github.com/Anuken/Mindustry/commit/e4eadbbb7f35db3093a0a3d13272bdfbedfaead3.patch"; - hash = "sha256-L/XQAxh6UgKsTVTgQKDXNRIAdtVtaY4ameT/Yb/+1p8="; - name = "always-use-local-arc-3.patch"; - stripLen = 1; extraPrefix = "Mindustry/"; - }) - ]; - - postPatch = '' - # Ensure the prebuilt shared objects don't accidentally get shipped - rm -r Arc/natives/natives-*/libs/* - rm -r Arc/backends/backend-*/libs/* - - cd Mindustry - - # Remove unbuildable iOS stuff - sed -i '/^project(":ios"){/,/^}/d' build.gradle - sed -i '/robo(vm|VM)/d' build.gradle - rm ios/build.gradle - ''; - - mitmCache = gradle.fetchDeps { - inherit pname; - data = ./deps.json; - }; - - __darwinAllowLocalNetworking = true; - - buildInputs = lib.optionals enableClient [ - SDL2 - alsa-lib - glew - ]; - nativeBuildInputs = [ - pkg-config - gradle - makeWrapper - jdk - ] ++ lib.optionals enableClient [ - ant - copyDesktopItems - curl - wget - ]; - - desktopItems = lib.optional enableClient desktopItem; - - gradleFlags = [ "-Pbuildversion=${buildVersion}" "-Dorg.gradle.java.home=${jdk}" ]; - - buildPhase = lib.optionalString enableServer '' - gradle server:dist - '' + lib.optionalString enableClient '' - pushd ../Arc - gradle jnigenBuild - gradle jnigenJarNativesDesktop - glewlib=${lib.getLib glew}/lib/libGLEW.so - sdllib=${lib.getLib SDL2}/lib/libSDL2.so - patchelf backends/backend-sdl/libs/linux64/libsdl-arc*.so \ - --add-needed $glewlib \ - --add-needed $sdllib - # Put the freshly-built libraries where the pre-built libraries used to be: - cp arc-core/libs/*/* natives/natives-desktop/libs/ - cp extensions/freetype/libs/*/* natives/natives-freetype-desktop/libs/ - popd - - gradle desktop:dist - ''; - - installPhase = let - installClient = '' - install -Dm644 desktop/build/libs/Mindustry.jar $out/share/mindustry.jar - mkdir -p $out/bin - makeWrapper ${jdk}/bin/java $out/bin/mindustry \ - --add-flags "-jar $out/share/mindustry.jar" \ - ${lib.optionalString stdenv.hostPlatform.isLinux "--suffix PATH : ${lib.makeBinPath [zenity]}"} \ - --suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath [libpulseaudio alsa-lib libjack2]} \ - --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib/ ${lib.optionalString enableWayland '' - --set SDL_VIDEODRIVER wayland \ - --set SDL_VIDEO_WAYLAND_WMCLASS Mindustry - ''} - - # Retain runtime depends to prevent them from being cleaned up. - # Since a jar is a compressed archive, nix can't figure out that the dependency is actually in there, - # and will assume that it's not actually needed. - # This can cause issues. - # See https://github.com/NixOS/nixpkgs/issues/109798. - echo "# Retained runtime dependencies: " >> $out/bin/mindustry - for dep in ${SDL2.out} ${alsa-lib.out} ${glew.out}; do - echo "# $dep" >> $out/bin/mindustry - done - - install -Dm644 core/assets/icons/icon_64.png $out/share/icons/hicolor/64x64/apps/mindustry.png - ''; - installServer = '' - install -Dm644 server/build/libs/server-release.jar $out/share/mindustry-server.jar - mkdir -p $out/bin - makeWrapper ${jdk}/bin/java $out/bin/mindustry-server \ - --add-flags "-jar $out/share/mindustry-server.jar" - ''; - in '' - runHook preInstall - '' + lib.optionalString enableClient installClient - + lib.optionalString enableServer installServer - + '' - runHook postInstall - ''; - - postGradleUpdate = '' - # this fetches non-gradle dependencies - cd ../Arc - gradle preJni - ''; - - passthru.tests.nixosTest = nixosTests.mindustry; - - meta = { - homepage = "https://mindustrygame.github.io/"; - downloadPage = "https://github.com/Anuken/Mindustry/releases"; - description = "Sandbox tower defense game"; - sourceProvenance = with lib.sourceTypes; [ - fromSource - binaryBytecode # deps - ]; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ chkno fgaz thekostins ]; - platforms = lib.platforms.all; - # TODO alsa-lib is linux-only, figure out what dependencies are required on Darwin - broken = enableClient && stdenv.hostPlatform.isDarwin; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff4afcc2fc9644..930d24a9eb825d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17214,12 +17214,11 @@ with pkgs; manaplus = callPackage ../games/manaplus { stdenv = gcc11Stdenv; }; - mindustry = callPackage ../games/mindustry { }; - mindustry-wayland = callPackage ../games/mindustry { + mindustry-wayland = callPackage ../by-name/mi/mindustry/package.nix { enableWayland = true; }; - mindustry-server = callPackage ../games/mindustry { + mindustry-server = callPackage ../by-name/mi/mindustry/package.nix { enableClient = false; enableServer = true; };