From d00ab47d42c829fd89a560d3c25f8ff08a4cf00b Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 10 Mar 2025 03:15:09 +0100 Subject: [PATCH 01/61] alpaca: 5.0.6 -> 5.2.0 --- pkgs/by-name/al/alpaca/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix index c2aacf0663e9..8403c0b37c79 100644 --- a/pkgs/by-name/al/alpaca/package.nix +++ b/pkgs/by-name/al/alpaca/package.nix @@ -20,14 +20,14 @@ python3Packages.buildPythonApplication rec { pname = "alpaca"; - version = "5.0.6"; + version = "5.2.0"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "Jeffser"; repo = "Alpaca"; tag = version; - hash = "sha256-iBce9ROWajUBq3GX/IU7yMoWTFNw98HnaE0kp+t73G0="; + hash = "sha256-uUGsdHrqzA5fZ4LNtX04H4ue9n4JQrkTYW2PCCFYFHc="; }; nativeBuildInputs = [ From a3e93dbfc843e9e65659364915551e8e491f448b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Mar 2025 09:01:57 +0000 Subject: [PATCH 02/61] codeium: 1.40.1 -> 1.42.3 --- pkgs/by-name/co/codeium/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index 8377ddfd2f7b..31590ec1ee90 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -23,10 +23,10 @@ let hash = { - x86_64-linux = "sha256-7GJMEL6rERjLTBUbSNqBIMB+92dEbeWUIApcbYYRNgE="; - aarch64-linux = "sha256-ArsDoj3G4/oBSv152wa46URWZhCaQgk5gSgVeSjPtZg="; - x86_64-darwin = "sha256-7yrW8+bpY/Suo1xeUNcwzLctjdn4yJrmLOETdV6f2lY="; - aarch64-darwin = "sha256-0c5wvo+4+UMEDPL6hSw9w120DU+Du53S8NHJWkrcyKc="; + x86_64-linux = "sha256-xczcogpRXdFX34uAjbERWf9lj3uxLKpPlceyZ7KgTz0="; + aarch64-linux = "sha256-8Ju1qUGc68xxj7ikoAQzic5tdnnemhIo/UU2G55npeE="; + x86_64-darwin = "sha256-pJZxykfeQaaNFrP3x1Hj2huWngOQc3F4KjtGV8Rae8s="; + aarch64-darwin = "sha256-jEMgFbOy65wCLxcA961u3jFwav+KVSrpDYcvt/4Ea8A="; } .${system} or throwSystem; @@ -35,7 +35,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "codeium"; - version = "1.40.1"; + version = "1.42.3"; src = fetchurl { name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz"; From acd3e908a016233657989d5e7ca4353618ccd664 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 19 Mar 2025 21:07:06 +0100 Subject: [PATCH 03/61] ddnet-server: fix Darwin build The server variant of the ddnet package does not ship the client, so we don't need to patch in libsteam_api.dylib Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/dd/ddnet/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/dd/ddnet/package.nix b/pkgs/by-name/dd/ddnet/package.nix index 4753f06e7894..f3617d3bb790 100644 --- a/pkgs/by-name/dd/ddnet/package.nix +++ b/pkgs/by-name/dd/ddnet/package.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { rm -rf $out/share/metainfo ''; - preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + preFixup = lib.optionalString (stdenv.hostPlatform.isDarwin && buildClient) '' # Upstream links against /lib while it installs this library in /lib/ddnet install_name_tool -change "$out/lib/libsteam_api.dylib" "$out/lib/ddnet/libsteam_api.dylib" "$out/bin/DDNet" ''; From 894f30ecbfbb4738ab67a3726368cbf2d7630084 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 19 Mar 2025 21:08:57 +0100 Subject: [PATCH 04/61] ddnet-server: set correct mainProgram Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/dd/ddnet/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/dd/ddnet/package.nix b/pkgs/by-name/dd/ddnet/package.nix index f3617d3bb790..9f4ad6d0c392 100644 --- a/pkgs/by-name/dd/ddnet/package.nix +++ b/pkgs/by-name/dd/ddnet/package.nix @@ -137,6 +137,6 @@ stdenv.mkDerivation rec { Scrumplex sirseruju ]; - mainProgram = "DDNet"; + mainProgram = "DDNet${lib.optionalString (!buildClient) "-Server"}"; }; } From b13a4f84b50bba04137ab5494818d4cc4d7ea111 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Mar 2025 20:59:16 +0000 Subject: [PATCH 05/61] cpu-x: 5.1.2 -> 5.1.3 --- pkgs/by-name/cp/cpu-x/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cp/cpu-x/package.nix b/pkgs/by-name/cp/cpu-x/package.nix index 09b8b18eecb5..ed22b074fb45 100644 --- a/pkgs/by-name/cp/cpu-x/package.nix +++ b/pkgs/by-name/cp/cpu-x/package.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpu-x"; - version = "5.1.2"; + version = "5.1.3"; src = fetchFromGitHub { owner = "X0rg"; repo = "CPU-X"; tag = "v${finalAttrs.version}"; - hash = "sha256-c0bReW8rSTEEcvotBy9h8SXq0p+Xq1YhXGVYLBvP8VE="; + hash = "sha256-gD5sEeALbGwMBP2UDc28TnVBlbCRMIeqWkrq0oi97Nw="; }; nativeBuildInputs = [ From 09aac85fe355774f37844cbc3712f4682bbc9de3 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sat, 22 Mar 2025 00:00:50 -0400 Subject: [PATCH 06/61] veilid: 0.4.3 -> 0.4.4 --- pkgs/tools/networking/veilid/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/veilid/default.nix b/pkgs/tools/networking/veilid/default.nix index fe30b37bf278..d6c66cc514cd 100644 --- a/pkgs/tools/networking/veilid/default.nix +++ b/pkgs/tools/networking/veilid/default.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage rec { pname = "veilid"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitLab { owner = "veilid"; repo = pname; rev = "v${version}"; - hash = "sha256-D6mfYiUj9W+2l/is/KkzwIQ1Erbapf5dl4uWGKd42r4="; + hash = "sha256-p9bQ90zUXVeVPUDuns+gmZb9SJHpAVrJOHe+RvEru7w="; }; useFetchCargoVendor = true; - cargoHash = "sha256-jjcx78iSIwMxbkJP5K0Xh9aIL1sDsX8cvjc5br8JjLM="; + cargoHash = "sha256-xbtlZ7PP+RHPlW4a9UCmaCOcsQkDyPim3yPObbXVqns="; nativeBuildInputs = [ capnproto From f790e3be5a65f428eea7f90197d7627c0ae742d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 22 Mar 2025 10:14:36 +0000 Subject: [PATCH 07/61] sopwith: 2.7.0 -> 2.8.0 --- pkgs/by-name/so/sopwith/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/so/sopwith/package.nix b/pkgs/by-name/so/sopwith/package.nix index 16e29f88fbf0..965ee151b7dc 100644 --- a/pkgs/by-name/so/sopwith/package.nix +++ b/pkgs/by-name/so/sopwith/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "sopwith"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "fragglet"; repo = "sdl-sopwith"; tag = "sdl-sopwith-${version}"; - hash = "sha256-Ah6Nv39HkYvtD/Go37G3tHowEVGLvtueoBRpi7i9HLY="; + hash = "sha256-s7npLid3GYZArQmctSwOu8zeC+mSfTiiiOaOEa9dcrg="; }; nativeBuildInputs = [ From 0ca1c255a30459536591db3972f92188788fcd16 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Sun, 23 Mar 2025 14:44:34 +0100 Subject: [PATCH 08/61] k3s: source k3s version.sh in update script to get component versions Sourcing the upstream version script is easier and more reliable than grepping for component versions. This also fixes the containerd version used for 1_31 and 1_32, the update script set them wrongly previously. --- .../networking/cluster/k3s/1_31/versions.nix | 4 +- .../networking/cluster/k3s/1_32/versions.nix | 4 +- .../networking/cluster/k3s/update-script.sh | 71 ++++++------------- 3 files changed, 25 insertions(+), 54 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix index c01e7775445b..07f5c127e09f 100644 --- a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix @@ -9,7 +9,7 @@ k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7"; k3sCNIVersion = "1.6.0-k3s1"; k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7"; - containerdVersion = "1.7.23-k3s2"; - containerdSha256 = "0lp9vxq7xj74wa7hbivvl5hwg2wzqgsxav22wa0p1l7lc1dqw8dm"; + containerdVersion = "2.0.2-k3s2"; + containerdSha256 = "1883srp3rlap0a6rx5dnbnxl67aijbymjrqdg7zg3a162j21xz3s"; criCtlVersion = "1.31.0-k3s2"; } diff --git a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix index b4ca9697224c..9f9e762344ba 100644 --- a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix @@ -9,7 +9,7 @@ k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7"; k3sCNIVersion = "1.6.0-k3s1"; k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7"; - containerdVersion = "1.7.23-k3s2"; - containerdSha256 = "0lp9vxq7xj74wa7hbivvl5hwg2wzqgsxav22wa0p1l7lc1dqw8dm"; + containerdVersion = "2.0.2-k3s2"; + containerdSha256 = "1883srp3rlap0a6rx5dnbnxl67aijbymjrqdg7zg3a162j21xz3s"; criCtlVersion = "1.31.0-k3s2"; } diff --git a/pkgs/applications/networking/cluster/k3s/update-script.sh b/pkgs/applications/networking/cluster/k3s/update-script.sh index b709703535a4..8dc14006ee0f 100755 --- a/pkgs/applications/networking/cluster/k3s/update-script.sh +++ b/pkgs/applications/networking/cluster/k3s/update-script.sh @@ -11,10 +11,6 @@ trap "rm -rf ${WORKDIR}" EXIT NIXPKGS_ROOT="$(git rev-parse --show-toplevel)"/ NIXPKGS_K3S_PATH=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/ OLD_VERSION="$(nix-instantiate --eval -E "with import $NIXPKGS_ROOT. {}; k3s_1_${MINOR_VERSION}.version or (builtins.parseDrvName k3s_1_${MINOR_VERSION}.name).version" | tr -d '"')" -cd ${NIXPKGS_K3S_PATH} - -cd 1_${MINOR_VERSION} - LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json curl --silent -f ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ @@ -31,18 +27,24 @@ K3S_COMMIT=$(curl --silent -f ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ https://api.github.com/repos/k3s-io/k3s/git/refs/tags \ | jq -r "map(select(.ref == \"refs/tags/${LATEST_TAG_NAME}\")) | .[0] | .object.sha") -K3S_REPO_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/k3s-io/k3s/archive/refs/tags/${LATEST_TAG_NAME}.tar.gz) +PREFETCH_META=$(nix-prefetch-url --unpack --print-path https://github.com/k3s-io/k3s/archive/refs/tags/${LATEST_TAG_NAME}.tar.gz) +K3S_STORE_PATH=${PREFETCH_META#*$'\n'} +K3S_REPO_SHA256=${PREFETCH_META%$'\n'*} -FILE_SCRIPTS_DOWNLOAD=${WORKDIR}/scripts-download -curl --silent -f https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts/download > $FILE_SCRIPTS_DOWNLOAD +cd "$K3S_STORE_PATH" +# Set the DRONE variables as they are expected to be set in version.sh +DRONE_TAG="$LATEST_TAG_NAME" +DRONE_COMMIT="$K3S_COMMIT" +source "${K3S_STORE_PATH}/scripts/version.sh" -FILE_SCRIPTS_VERSION=${WORKDIR}/scripts-version.sh -curl --silent -f https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts/version.sh > $FILE_SCRIPTS_VERSION +K3S_ROOT_SHA256=$(nix-prefetch-url --quiet --unpack \ + "https://github.com/k3s-io/k3s-root/releases/download/${VERSION_ROOT}/k3s-root-amd64.tar") +CNIPLUGINS_SHA256=$(nix-prefetch-url --quiet --unpack \ + "https://github.com/rancher/plugins/archive/refs/tags/${VERSION_CNIPLUGINS}.tar.gz") +CONTAINERD_SHA256=$(nix-prefetch-url --quiet --unpack \ + "https://github.com/k3s-io/containerd/archive/refs/tags/${VERSION_CONTAINERD}.tar.gz") -FILE_TRAEFIK_MANIFEST=${WORKDIR}/traefik.yml -curl --silent -f -o "$FILE_TRAEFIK_MANIFEST" https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/manifests/traefik.yaml - -CHART_FILES=( $(yq eval --no-doc .spec.chart "$FILE_TRAEFIK_MANIFEST" | xargs -n1 basename) ) +CHART_FILES=( $(yq eval --no-doc .spec.chart "${K3S_STORE_PATH}/manifests/traefik.yaml" | xargs -n1 basename) ) # These files are: # 1. traefik-crd-20.3.1+up20.3.0.tgz # 2. traefik-20.3.1+up20.3.0.tgz @@ -53,6 +55,8 @@ if [[ "${#CHART_FILES[@]}" != "2" ]]; then exit 1 fi +cd "${NIXPKGS_K3S_PATH}/1_${MINOR_VERSION}" + CHARTS_URL=https://k3s.io/k3s-charts/assets # Get metadata for both files rm -f chart-versions.nix.update @@ -95,39 +99,6 @@ while read -r name url; do '{$name: {"url": $url, "sha256": $sha256}}' done <<<"${IMAGES_ARCHIVES}" | jq --slurp 'reduce .[] as $item ({}; . * $item)' > images-versions.json -FILE_GO_MOD=${WORKDIR}/go.mod -curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/go.mod > $FILE_GO_MOD - - -K3S_ROOT_VERSION=$(grep 'VERSION_ROOT=' ${FILE_SCRIPTS_VERSION} \ - | cut -d'=' -f2 | sed -e 's/"//g' -e 's/^v//') -K3S_ROOT_SHA256=$(nix-prefetch-url --quiet --unpack \ - "https://github.com/k3s-io/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar") - -CNIPLUGINS_VERSION=$(grep 'VERSION_CNIPLUGINS=' ${FILE_SCRIPTS_VERSION} \ - | cut -d'=' -f2 | sed -e 's/"//g' -e 's/^v//') -CNIPLUGINS_SHA256=$(nix-prefetch-url --quiet --unpack \ - "https://github.com/rancher/plugins/archive/refs/tags/v${CNIPLUGINS_VERSION}.tar.gz") - -# mimics https://github.com/k3s-io/k3s/blob/v1.26.5%2Bk3s1/scripts/version.sh#L25 -CONTAINERD_VERSION=$(grep github.com/containerd/containerd ${FILE_GO_MOD} \ - | head -n1 | awk '{print $4}' | sed -e 's/^v//') -CONTAINERD_SHA256=$(nix-prefetch-url --quiet --unpack \ - "https://github.com/k3s-io/containerd/archive/refs/tags/v${CONTAINERD_VERSION}.tar.gz") - -# The repository of "cri-tools" changes for 1.31.x, this can likely be removed in future releases -if [ "$MINOR_VERSION" -gt 30 ]; then - CRI_CTL_REPO=sigs.k8s.io -else - CRI_CTL_REPO=github.com/kubernetes-sigs -fi -CRI_CTL_VERSION=$(grep "$CRI_CTL_REPO/cri-tools" ${FILE_GO_MOD} \ - | head -n1 | awk '{print $4}' | sed -e 's/"//g' -e 's/^v//') - -setKV () { - sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ${NIXPKGS_K3S_PATH}default.nix -} - FAKE_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; cat >versions.nix <versions.nix < Date: Sun, 23 Mar 2025 15:03:25 +0100 Subject: [PATCH 09/61] nixos/postgresql: fix spelling and grammar in docs --- .../modules/services/databases/postgresql.md | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md index f92e0fd19d02..4144cccac26a 100644 --- a/nixos/modules/services/databases/postgresql.md +++ b/nixos/modules/services/databases/postgresql.md @@ -9,7 +9,7 @@ -PostgreSQL is an advanced, free relational database. +PostgreSQL is an advanced, free, relational database. ## Configuring {#module-services-postgres-configuring} @@ -67,7 +67,7 @@ name. This can be done with If the database user name equals the connecting system user name, postgres by default will accept a passwordless connection via unix domain socket. This makes it possible to run many postgres-backed -services without creating any database secrets at all +services without creating any database secrets at all. ### Assigning extra permissions {#module-services-postgres-initializing-extra-permissions} @@ -178,7 +178,7 @@ These instructions are also applicable to other versions. ::: Major PostgreSQL upgrades require a downtime and a few imperative steps to be called. This is the case because -each major version has some internal changes in the databases' state during major releases. Because of that, +each major version has some internal changes in the databases' state. Because of that, NixOS places the state into {file}`/var/lib/postgresql/<version>` where each `version` can be obtained like this: ``` @@ -203,7 +203,6 @@ For an upgrade, a script like this can be used to simplify the process: systemctl stop postgresql export NEWDATA="/var/lib/postgresql/${newPostgres.psqlSchema}" - export NEWBIN="${newPostgres}/bin" export OLDDATA="${cfg.dataDir}" @@ -224,11 +223,11 @@ For an upgrade, a script like this can be used to simplify the process: The upgrade process is: - 1. Rebuild nixos configuration with the configuration above added to your {file}`configuration.nix`. Alternatively, add that into separate file and reference it in `imports` list. - 2. Login as root (`sudo su -`) - 3. Run `upgrade-pg-cluster`. It will stop old postgresql, initialize a new one and migrate the old one to the new one. You may supply arguments like `--jobs 4` and `--link` to speedup migration process. See for details. - 4. Change postgresql package in NixOS configuration to the one you were upgrading to via [](#opt-services.postgresql.package). Rebuild NixOS. This should start new postgres using upgraded data directory and all services you stopped during the upgrade. - 5. After the upgrade it's advisable to analyze the new cluster. + 1. Add the above to your {file}`configuration.nix` and rebuild. Alternatively, add that into a separate file and reference it in the `imports` list. + 2. Login as root (`sudo su -`). + 3. Run `upgrade-pg-cluster`. This will stop the old postgresql cluster, initialize a new one and migrate the old one to the new one. You may supply arguments like `--jobs 4` and `--link` to speedup the migration process. See for details. + 4. Change the postgresql package in NixOS configuration to the one you were upgrading to via [](#opt-services.postgresql.package). Rebuild NixOS. This should start the new postgres version using the upgraded data directory and all services you stopped during the upgrade. + 5. After the upgrade it's advisable to analyze the new cluster: - For PostgreSQL ≥ 14, use the `vacuumdb` command printed by the upgrades script. - For PostgreSQL < 14, run (as `su -l postgres` in the [](#opt-services.postgresql.dataDir), in this example {file}`/var/lib/postgresql/13`): @@ -273,7 +272,7 @@ A complete list of options for the PostgreSQL module may be found [here](#opt-se ## Plugins {#module-services-postgres-plugins} -Plugins collection for each PostgreSQL version can be accessed with `.pkgs`. For example, for `pkgs.postgresql_15` package, its plugin collection is accessed by `pkgs.postgresql_15.pkgs`: +The collection of plugins for each PostgreSQL version can be accessed with `.pkgs`. For example, for the `pkgs.postgresql_15` package, its plugin collection is accessed by `pkgs.postgresql_15.pkgs`: ```ShellSession $ nix repl '' @@ -301,7 +300,7 @@ To add plugins via NixOS configuration, set `services.postgresql.extensions`: } ``` -You can build custom PostgreSQL-with-plugins (to be used outside of NixOS) using function `.withPackages`. For example, creating a custom PostgreSQL package in an overlay can look like: +You can build a custom `postgresql-with-plugins` (to be used outside of NixOS) using the function `.withPackages`. For example, creating a custom PostgreSQL package in an overlay can look like this: ```nix self: super: { postgresql_custom = self.postgresql_17.withPackages (ps: [ @@ -384,7 +383,7 @@ several common hardening options from `systemd`, most notably: } ``` -The NixOS module also contains necessary adjustments for extensions from `nixpkgs` +The NixOS module also contains necessary adjustments for extensions from `nixpkgs`, if these are enabled. If an extension or a postgresql feature from `nixpkgs` breaks with hardening, it's considered a bug. From 24775f65439f1fc53c1d8f2888cd1fcce8ff7b9f Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 23 Mar 2025 15:04:51 +0100 Subject: [PATCH 10/61] nixos/postgresql: fix reference to LLVM closure size In fact, the current difference is: - 157M for postgresql to - 756M for postgresql_jit That's a difference of 589M. --- nixos/modules/services/databases/postgresql.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md index 4144cccac26a..08461547a367 100644 --- a/nixos/modules/services/databases/postgresql.md +++ b/nixos/modules/services/databases/postgresql.md @@ -330,7 +330,7 @@ self: super: { ## JIT (Just-In-Time compilation) {#module-services-postgres-jit} [JIT](https://www.postgresql.org/docs/current/jit-reason.html)-support in the PostgreSQL package -is disabled by default because of the ~300MiB closure-size increase from the LLVM dependency. It +is disabled by default because of the ~600MiB closure-size increase from the LLVM dependency. It can be optionally enabled in PostgreSQL with the following config option: ```nix From 0bc099abd6989a3053b930c5657494329c048749 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 23 Mar 2025 15:05:09 +0100 Subject: [PATCH 11/61] nixos/postgresql: add docs about procedural languages --- nixos/doc/manual/redirects.json | 3 ++ .../modules/services/databases/postgresql.md | 31 +++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index 29f7f9d51996..11c6c5813114 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -1253,6 +1253,9 @@ "module-services-postgres-plugins": [ "index.html#module-services-postgres-plugins" ], + "module-services-postgres-pls": [ + "index.html#module-services-postgres-pls" + ], "module-services-postgres-jit": [ "index.html#module-services-postgres-jit" ], diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md index 08461547a367..957c5e40a628 100644 --- a/nixos/modules/services/databases/postgresql.md +++ b/nixos/modules/services/databases/postgresql.md @@ -327,6 +327,37 @@ self: super: { } ``` +## Procedural Languages {#module-services-postgres-pls} + +PostgreSQL ships the additional procedural languages PL/Perl, PL/Python and PL/Tcl as extensions. +They are packaged as plugins and can be made available in the same way as external extensions: +```nix +{ + services.postgresql.extensions = ps: with ps; [ + plperl + plpython3 + pltcl + ]; +} +``` + +Each procedural language plugin provides a `.withPackages` helper to make language specific packages available at run-time. + +For example, to make `python3Packages.base58` available: +```nix +{ + services.postgresql.extensions = pgps: with pgps; [ + (plpython3.withPackages (pyps: with pyps; [ base58 ])) + ]; +} +``` + +This currently works for: +- `plperl` by re-using `perl.withPackages` +- `plpython3` by re-using `python3.withPackages` +- `plr` by exposing `rPackages` +- `pltcl` by exposing `tclPackages` + ## JIT (Just-In-Time compilation) {#module-services-postgres-jit} [JIT](https://www.postgresql.org/docs/current/jit-reason.html)-support in the PostgreSQL package From 0e19ef796dd6f88ffea6c76fcbdbbf1206135e70 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Sun, 23 Mar 2025 16:12:29 +0100 Subject: [PATCH 12/61] distribution: 3.0.0-rc.3 -> 3.0.0-rc.4 Signed-off-by: Paul Meyer --- pkgs/by-name/di/distribution/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/di/distribution/package.nix b/pkgs/by-name/di/distribution/package.nix index 5ebcba6b3c2b..fdbc44c8a501 100644 --- a/pkgs/by-name/di/distribution/package.nix +++ b/pkgs/by-name/di/distribution/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "distribution"; - version = "3.0.0-rc.3"; + version = "3.0.0-rc.4"; src = fetchFromGitHub { owner = "distribution"; repo = "distribution"; tag = "v${version}"; - hash = "sha256-GcgEYYBljhRyKiEex6FL4FScg+v0k7Qe7Tq6IsgXVhM="; + hash = "sha256-aDvcwsA1J1S7haNGvb2PikN51PpDqM93NJQKRH/acwM="; }; vendorHash = null; From 5b19479633bc9f267d9363fcfc3fceab5359ac33 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 23 Mar 2025 23:28:24 +0000 Subject: [PATCH 13/61] xfce.libxfce4ui: 4.20.0 -> 4.20.1 https://gitlab.xfce.org/xfce/libxfce4ui/-/compare/libxfce4ui-4.20.0...libxfce4ui-4.20.1 --- pkgs/desktops/xfce/core/libxfce4ui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/libxfce4ui/default.nix b/pkgs/desktops/xfce/core/libxfce4ui/default.nix index 8862c6dffe03..103f6f073650 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui/default.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui/default.nix @@ -23,9 +23,9 @@ mkXfceDerivation { category = "xfce"; pname = "libxfce4ui"; - version = "4.20.0"; + version = "4.20.1"; - sha256 = "sha256-M+OapPHQ/WxlkUzHPx+ELstVyGoZanCxCL0N8hDWSN8="; + sha256 = "sha256-CY9KCCbKBAuoYAJtPHlQj04dUuCZAovnyJsBgjzzQkI="; nativeBuildInputs = [ From a483ac928d5188b9946b68e3786f4295265f5ad2 Mon Sep 17 00:00:00 2001 From: leoperegrino <55335068+leoperegrino@users.noreply.github.com> Date: Mon, 24 Mar 2025 17:27:10 -0300 Subject: [PATCH 14/61] docker-compose: fix `rm` command argument `e2e` package is actually under the `pkg` directory --- pkgs/applications/virtualization/docker/compose.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 392171eb58bb..a72c1c7524c9 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -13,7 +13,7 @@ buildGoModule rec { postPatch = '' # entirely separate package that breaks the build - rm -rf e2e/ + rm -rf pkg/e2e/ ''; vendorHash = "sha256-ISX+PpjapST9d/rFP0SPlFYyPb5NcwwQT6mhb1H1qEE="; From 57fd55a65d1f05d55998caba1e6d01314e4bf776 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 24 Mar 2025 23:37:49 +0200 Subject: [PATCH 15/61] bluespec: Fix `check-smoke` and `check-suite` --- pkgs/by-name/bl/bluespec/package.nix | 185 +++++++++++++++++++++------ 1 file changed, 147 insertions(+), 38 deletions(-) diff --git a/pkgs/by-name/bl/bluespec/package.nix b/pkgs/by-name/bl/bluespec/package.nix index 8a617c992502..766bc20cfdaf 100644 --- a/pkgs/by-name/bl/bluespec/package.nix +++ b/pkgs/by-name/bl/bluespec/package.nix @@ -22,11 +22,23 @@ asciidoctor, texliveFull, which, + makeWrapper, + cctools, + targetPackages, # install -m 644 lib/libstp.dylib /private/tmp/nix-build-bluespec-2024.07.drv-5/source/inst/lib/SAT # install: cannot stat 'lib/libstp.dylib': No such file or directory # https://github.com/B-Lang-org/bsc/pull/600 might fix it stubStp ? !stdenv.hostPlatform.isDarwin, withDocs ? true, + # With 23 core parallel 10 mins on r9 5900x + # Broken on darwin currently + withSuiteCheck ? false, + gnugrep, + time, + dejagnu, + systemc, + glibcLocales, + buildPackages, }: let @@ -76,22 +88,56 @@ stdenv.mkDerivation rec { chmod -R +rwX $sourceRoot/src/vendor/yices/v2.6/yices2 ''; + postPatch = + '' + patchShebangs \ + src/vendor/stp/src/AST/genkinds.pl \ + src/Verilog/copy_module.pl \ + src/comp/update-build-version.sh \ + src/comp/update-build-system.sh \ + src/comp/wrapper.sh + + substituteInPlace src/comp/Makefile \ + --replace-fail 'install-bsc install-bluetcl' 'install-bsc install-bluetcl $(UTILEXES) $(SHOWRULESEXES) install-utils install-showrules' + + # For darwin + # ld: library not found for -ltcl8.5 + substituteInPlace ./platform.sh \ + --replace-fail 'TCLSH=/usr/bin/tclsh' 'TCLSH=`which tclsh`' + '' + + lib.optionalString withSuiteCheck '' + substituteInPlace testsuite/bsc.options/verilog-e/verilog-e.exp \ + --replace-fail "/bin/echo" "${lib.getExe' buildPackages.coreutils "echo"}" + + substituteInPlace testsuite/test_list.sh testsuite/findfailures.csh \ + --replace-fail "bin/csh" "${lib.getExe buildPackages.tcsh}" + + patchShebangs \ + testsuite/test_list.sh \ + testsuite/findfailures.csh \ + scripts/tool-find.sh \ + testsuite/bsc.bluetcl/packages/expandPorts/compareOutput.pl \ + testsuite/bsc.bsv_examples/AES/funcit.pl \ + testsuite/bsc.bsv_examples/AES/makeVecs.pl \ + testsuite/bsc.bsv_examples/AES/makeVecs192.pl \ + testsuite/bsc.bsv_examples/AES/makeVecs256.pl \ + testsuite/bsc.if/split/canonicalize.pl \ + testsuite/bsc.interra/operators/Arith/generate/gen.pl \ + testsuite/bsc.interra/operators/Arith/generate/sort.pl \ + testsuite/bsc.interra/operators/BitSel/generate/gen.pl \ + testsuite/bsc.interra/operators/BitSel/generate/sort.pl \ + testsuite/bsc.interra/operators/Logic/generate/gen.pl \ + testsuite/bsc.interra/operators/Logic/generate/sort.pl \ + testsuite/bsc.preprocessor/ifdef/iftestcase-perl.pl \ + testsuite/bsc.verilog/filter/basicinout.pl \ + testsuite/scripts/collapse.pl \ + testsuite/scripts/double-directory.pl \ + testsuite/scripts/process-summary-file.pl \ + testsuite/scripts/sort-by-time.pl \ + testsuite/scripts/times-by-directory.pl + ''; + preBuild = '' - patchShebangs \ - src/vendor/stp/src/AST/genkinds.pl \ - src/Verilog/copy_module.pl \ - src/comp/update-build-version.sh \ - src/comp/update-build-system.sh \ - src/comp/wrapper.sh - - substituteInPlace src/comp/Makefile \ - --replace-fail 'install-bsc install-bluetcl' 'install-bsc install-bluetcl $(UTILEXES) $(SHOWRULESEXES) install-utils install-showrules' - - # For darwin - # ld: library not found for -ltcl8.5 - substituteInPlace ./platform.sh \ - --replace-fail 'TCLSH=/usr/bin/tclsh' 'TCLSH=`which tclsh`' - # allow running bsc to bootstrap export LD_LIBRARY_PATH=$PWD/inst/lib/SAT @@ -110,18 +156,26 @@ stdenv.mkDerivation rec { zlib ]; - nativeBuildInputs = [ - automake - autoconf - asciidoctor - bison - flex - ghcWithPackages - perl - pkg-config - texliveFull - tcl - ]; + nativeBuildInputs = + [ + automake + autoconf + asciidoctor + bison + flex + ghcWithPackages + perl + pkg-config + texliveFull + tcl + makeWrapper + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # https://github.com/B-Lang-org/bsc/blob/main/src/comp/bsc.hs#L1838 + # /nix/store/7y0vlsf6l8lr3vjsbrirqrsbx4mwqiwf-cctools-binutils-darwin-1010.6/bin/strip: error: unknown argument '-u' + # make[1]: *** [Makefile:97: smoke_test_bluesim] Error 1 + cctools + ]; env.NIX_CFLAGS_COMPILE = toString ( lib.optionals (stdenv.cc.isClang) [ @@ -141,17 +195,6 @@ stdenv.mkDerivation rec { "STP_STUB=1" # uses yices as a SMT solver and stub out STP ]; - doCheck = true; - - nativeCheckInputs = [ - gmp-static - iverilog - ]; - - # /nix/store/7y0vlsf6l8lr3vjsbrirqrsbx4mwqiwf-cctools-binutils-darwin-1010.6/bin/strip: error: unknown argument '-u' - # make[1]: *** [Makefile:97: smoke_test_bluesim] Error 1 - checkTarget = lib.optionalString (!stdenv.hostPlatform.isDarwin) "check-smoke"; # this is the shortest check but "check-suite" tests much more - installPhase = '' mkdir -p $out @@ -167,6 +210,72 @@ stdenv.mkDerivation rec { mv inst/doc/*.pdf $doc/share/doc/bsc ''; + postFixup = '' + # https://github.com/B-Lang-org/bsc/blob/65e3a87a17f6b9cf38cbb7b6ad7a4473f025c098/src/comp/bsc.hs#L1839 + wrapProgram $out/bin/bsc --prefix PATH : ${ + lib.makeBinPath (if stdenv.hostPlatform.isDarwin then [ cctools ] else [ targetPackages.stdenv.cc ]) + } + ''; + + doCheck = true; + + # TODO To fix check-suite: + # On darwin + # ``` + # FAIL: `Cpreprocess_line.bsv.bsc-out' differs from `Cpreprocess_line.bsv.bsc-out.expected' + + # FAIL: `sysGCD.bsc-vcomp-out.filtered' differs from `empty.expected' + + # FAIL: module `' in `ImpArgConnect3.bsv' should compile to Verilog + # Caught error in sed: sed: can't read mkArgImpConnect3.v: No such file or directory + # FAIL: `mkArgImpConnect3.v.filtered' differs from `mkArgImpConnect3.v.expected.filtered' + # ``` + + checkTarget = if withSuiteCheck then "checkparallel" else "check-smoke"; # this is the shortest check but "check-suite" tests much more + + # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) + LOCALE_ARCHIVE = lib.optionalString ( + withSuiteCheck && stdenv.hostPlatform.isLinux + ) "${glibcLocales}/lib/locale/locale-archive"; + + nativeCheckInputs = + [ + gmp-static + iverilog + ] + ++ lib.optionals withSuiteCheck [ + time + dejagnu # for `/bin/runtest` in `check-suite` + gnugrep # `testsuite/bsc.interra/operators/Arith/arith.exp` and more + ]; + + checkInputs = lib.optionals withSuiteCheck [ + systemc + ]; + + checkPhase = lib.optionalString withSuiteCheck '' + ( + cd testsuite + set +e # disable exit on error + make -j $NIX_BUILD_CORES $checkTarget + test_exit_code=$? + set -e + failures=$(./findfailures.csh) + echo "$failures" + for failure in $failures; do + logpath="''${failure/%sum/log}" + echo "\nFAILURE LOG: $logpath" + cat "$logpath" + echo "END LOG: $logpath" + done + + if [[ "$test_exit_code" != "0" || -n "$failures" ]]; then + echo "Some tests failed or the makefile failed to run" + exit 1 + fi + ) + ''; + meta = { description = "Toolchain for the Bluespec Hardware Definition Language"; homepage = "https://github.com/B-Lang-org/bsc"; From c97a591de443b02deb4b61404b982e551a75cb12 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 24 Mar 2025 17:57:11 -0400 Subject: [PATCH 16/61] asymptote: 2.95 -> 3.01 --- pkgs/tools/graphics/asymptote/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 5caee29bf15d..a5574cf8303d 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -36,7 +36,7 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "2.95"; + version = "3.01"; pname = "asymptote"; outputs = [ @@ -49,15 +49,9 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://sourceforge/asymptote/${finalAttrs.version}/asymptote-${finalAttrs.version}.src.tgz"; - hash = "sha256-FWBP0Cy23bxbgHUp0ub8YXyCWhhN0Ne3E5DFZ66seOc="; + hash = "sha256-egUACsP2vwYx2uvSCZ8H/jLU9f17Siz8gFWwCNSXsIQ="; }; - # https://github.com/vectorgraphics/asymptote/issues/513 - postConfigure = lib.optionalString (stdenv.hostPlatform.isLinux) '' - substituteInPlace Makefile \ - --replace-fail 'glew.o -lGLX' 'glew.o' - ''; - # override with TeX Live containers to avoid building sty, docs from source texContainer = null; texdocContainer = null; From 5f653f9640bfca969938055b4009294456ead815 Mon Sep 17 00:00:00 2001 From: BeatLink Date: Mon, 24 Mar 2025 18:17:53 -0500 Subject: [PATCH 17/61] nemo-preview: init at 6.4.0, xreader: enable introspection --- pkgs/by-name/ne/nemo-preview/package.nix | 63 ++++++++++++++++++++++++ pkgs/by-name/xr/xreader/package.nix | 1 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/by-name/ne/nemo-preview/package.nix diff --git a/pkgs/by-name/ne/nemo-preview/package.nix b/pkgs/by-name/ne/nemo-preview/package.nix new file mode 100644 index 000000000000..93ded54859fd --- /dev/null +++ b/pkgs/by-name/ne/nemo-preview/package.nix @@ -0,0 +1,63 @@ +{ + stdenv, + lib, + fetchFromGitHub, + meson, + pkg-config, + ninja, + glib, + gtk3, + cjs, + gtksourceview4, + gobject-introspection, + libmusicbrainz5, + webkitgtk_4_1, + clutter-gtk, + clutter-gst, + wrapGAppsHook3, + nemo, + xreader, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "nemo-preview"; + version = "6.4.0"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = "nemo-extensions"; + tag = finalAttrs.version; + hash = "sha256-39hWA4SNuEeaPA6D5mWMHjJDs4hYK7/ZdPkTyskvm5Y="; + }; + + sourceRoot = "${finalAttrs.src.name}/nemo-preview"; + + nativeBuildInputs = [ + wrapGAppsHook3 + gobject-introspection + meson + pkg-config + glib + ninja + ]; + + buildInputs = [ + gtk3 + cjs + gtksourceview4 + libmusicbrainz5 + webkitgtk_4_1 + clutter-gtk + clutter-gst + nemo + xreader + ]; + + meta = { + homepage = "https://github.com/linuxmint/nemo-extensions/tree/master/nemo-preview"; + description = "Quick previewer for Nemo, the Cinnamon desktop file manager"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.cinnamon.members; + }; +}) diff --git a/pkgs/by-name/xr/xreader/package.nix b/pkgs/by-name/xr/xreader/package.nix index cd6e4632d370..d39cdd541b85 100644 --- a/pkgs/by-name/xr/xreader/package.nix +++ b/pkgs/by-name/xr/xreader/package.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dmathjax-directory=${nodePackages.mathjax}" + "-Dintrospection=true" ] ++ (map (x: "-D${x}=true") backends); buildInputs = [ From 060d42bb41fb7b980c4d35cb4cb422d525f2ac3b Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 23 Mar 2025 12:24:13 -0500 Subject: [PATCH 18/61] vimPlugins: move extras to separate files per source Make it more obvious where certain plugins come from. --- .../editors/vim/plugins/default.nix | 12 +- .../editors/vim/plugins/extras.nix | 104 ------------------ .../editors/vim/plugins/luaPackagePlugins.nix | 45 ++++++++ .../vim/plugins/nodePackagePlugins.nix | 58 ++++++++++ 4 files changed, 111 insertions(+), 108 deletions(-) delete mode 100644 pkgs/applications/editors/vim/plugins/extras.nix create mode 100644 pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix create mode 100644 pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix diff --git a/pkgs/applications/editors/vim/plugins/default.nix b/pkgs/applications/editors/vim/plugins/default.nix index eb7c70db0e5d..b699c66b47c8 100644 --- a/pkgs/applications/editors/vim/plugins/default.nix +++ b/pkgs/applications/editors/vim/plugins/default.nix @@ -19,12 +19,15 @@ let initialPackages = self: { }; - plugins = callPackage ./generated.nix { - inherit buildVimPlugin; + luaPackagePlugins = callPackage ./luaPackagePlugins.nix { inherit (neovimUtils) buildNeovimPlugin; }; - extras = callPackage ./extras.nix { + nodePackagePlugins = callPackage ./nodePackagePlugins.nix { + inherit buildVimPlugin; + }; + + plugins = callPackage ./generated.nix { inherit buildVimPlugin; inherit (neovimUtils) buildNeovimPlugin; }; @@ -44,7 +47,8 @@ let in lib.pipe initialPackages [ (extends plugins) - (extends extras) + (extends luaPackagePlugins) + (extends nodePackagePlugins) (extends overrides) (extends aliases) lib.makeExtensible diff --git a/pkgs/applications/editors/vim/plugins/extras.nix b/pkgs/applications/editors/vim/plugins/extras.nix deleted file mode 100644 index a5fbf0acb77e..000000000000 --- a/pkgs/applications/editors/vim/plugins/extras.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ - lib, - buildVimPlugin, - buildNeovimPlugin, - nodePackages, - neovim-unwrapped, -}: -let - luaPackages = neovim-unwrapped.lua.pkgs; -in -self: super: -( - let - nodePackageNames = [ - "coc-cmake" - "coc-docker" - "coc-emmet" - "coc-eslint" - "coc-explorer" - "coc-flutter" - "coc-git" - "coc-go" - "coc-haxe" - "coc-highlight" - "coc-html" - "coc-java" - "coc-jest" - "coc-json" - "coc-lists" - "coc-ltex" - "coc-markdownlint" - "coc-pairs" - "coc-prettier" - "coc-r-lsp" - "coc-rls" - "coc-rust-analyzer" - "coc-sh" - "coc-smartf" - "coc-snippets" - "coc-solargraph" - "coc-spell-checker" - "coc-sqlfluff" - "coc-stylelint" - "coc-sumneko-lua" - "coc-tabnine" - "coc-texlab" - "coc-tsserver" - "coc-ultisnips" - "coc-vetur" - "coc-vimlsp" - "coc-vimtex" - "coc-wxml" - "coc-yaml" - "coc-yank" - ]; - nodePackage2VimPackage = - name: - buildVimPlugin { - pname = name; - inherit (nodePackages.${name}) version meta; - src = "${nodePackages.${name}}/lib/node_modules/${name}"; - }; - in - lib.genAttrs nodePackageNames nodePackage2VimPackage -) -// ( - let - luarocksPackageNames = [ - "fidget-nvim" - "gitsigns-nvim" - "image-nvim" - "lsp-progress-nvim" - "lualine-nvim" - "luasnip" - "lush-nvim" - "lz-n" - "lze" - "lzextras" - "lzn-auto-require" - "middleclass" - "mini-test" - "neorg" - "neotest" - "nui-nvim" - "nvim-cmp" - "nvim-nio" - "nvim-web-devicons" - "oil-nvim" - "orgmode" - "papis-nvim" - "rest-nvim" - "rocks-config-nvim" - "rtp-nvim" - "telescope-manix" - "telescope-nvim" - ]; - toVimPackage = - name: - buildNeovimPlugin { - luaAttr = luaPackages.${name}; - }; - in - lib.genAttrs luarocksPackageNames toVimPackage -) diff --git a/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix b/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix new file mode 100644 index 000000000000..b8346defa922 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix @@ -0,0 +1,45 @@ +{ + lib, + buildNeovimPlugin, + neovim-unwrapped, +}: +final: prev: +let + luaPackages = neovim-unwrapped.lua.pkgs; + + luarocksPackageNames = [ + "fidget-nvim" + "gitsigns-nvim" + "image-nvim" + "lsp-progress-nvim" + "lualine-nvim" + "luasnip" + "lush-nvim" + "lz-n" + "lze" + "lzextras" + "lzn-auto-require" + "middleclass" + "mini-test" + "neorg" + "neotest" + "nui-nvim" + "nvim-cmp" + "nvim-nio" + "nvim-web-devicons" + "oil-nvim" + "orgmode" + "papis-nvim" + "rest-nvim" + "rocks-config-nvim" + "rtp-nvim" + "telescope-manix" + "telescope-nvim" + ]; +in +lib.genAttrs luarocksPackageNames ( + name: + buildNeovimPlugin { + luaAttr = luaPackages.${name}; + } +) diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix new file mode 100644 index 000000000000..3856a7be1958 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -0,0 +1,58 @@ +{ + lib, + buildVimPlugin, + nodePackages, +}: +final: prev: +let + nodePackageNames = [ + "coc-cmake" + "coc-docker" + "coc-emmet" + "coc-eslint" + "coc-explorer" + "coc-flutter" + "coc-git" + "coc-go" + "coc-haxe" + "coc-highlight" + "coc-html" + "coc-java" + "coc-jest" + "coc-json" + "coc-lists" + "coc-ltex" + "coc-markdownlint" + "coc-pairs" + "coc-prettier" + "coc-r-lsp" + "coc-rls" + "coc-rust-analyzer" + "coc-sh" + "coc-smartf" + "coc-snippets" + "coc-solargraph" + "coc-spell-checker" + "coc-sqlfluff" + "coc-stylelint" + "coc-sumneko-lua" + "coc-tabnine" + "coc-texlab" + "coc-tsserver" + "coc-ultisnips" + "coc-vetur" + "coc-vimlsp" + "coc-vimtex" + "coc-wxml" + "coc-yaml" + "coc-yank" + ]; +in +lib.genAttrs nodePackageNames ( + name: + buildVimPlugin { + pname = name; + inherit (nodePackages.${name}) version meta; + src = "${nodePackages.${name}}/lib/node_modules/${name}"; + } +) From 12baff07e59aec43c9a451e9bd2a9569949ac5eb Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 23 Mar 2025 13:05:28 -0500 Subject: [PATCH 19/61] vimUtils: move hooks to new directory Add some organization --- .../vim/plugins/{ => hooks}/neovim-require-check-hook.sh | 0 .../vim/plugins/{ => hooks}/vim-command-check-hook.sh | 0 .../editors/vim/plugins/{ => hooks}/vim-gen-doc-hook.sh | 0 pkgs/applications/editors/vim/plugins/vim-utils.nix | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/applications/editors/vim/plugins/{ => hooks}/neovim-require-check-hook.sh (100%) rename pkgs/applications/editors/vim/plugins/{ => hooks}/vim-command-check-hook.sh (100%) rename pkgs/applications/editors/vim/plugins/{ => hooks}/vim-gen-doc-hook.sh (100%) diff --git a/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh b/pkgs/applications/editors/vim/plugins/hooks/neovim-require-check-hook.sh similarity index 100% rename from pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh rename to pkgs/applications/editors/vim/plugins/hooks/neovim-require-check-hook.sh diff --git a/pkgs/applications/editors/vim/plugins/vim-command-check-hook.sh b/pkgs/applications/editors/vim/plugins/hooks/vim-command-check-hook.sh similarity index 100% rename from pkgs/applications/editors/vim/plugins/vim-command-check-hook.sh rename to pkgs/applications/editors/vim/plugins/hooks/vim-command-check-hook.sh diff --git a/pkgs/applications/editors/vim/plugins/vim-gen-doc-hook.sh b/pkgs/applications/editors/vim/plugins/hooks/vim-gen-doc-hook.sh similarity index 100% rename from pkgs/applications/editors/vim/plugins/vim-gen-doc-hook.sh rename to pkgs/applications/editors/vim/plugins/hooks/vim-gen-doc-hook.sh diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index 288fc44ba55f..820ca3d1ff91 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -423,7 +423,7 @@ rec { vimBinary = "${vim}/bin/vim"; inherit rtpPath; }; - } ./vim-gen-doc-hook.sh + } ./hooks/vim-gen-doc-hook.sh ) { }; vimCommandCheckHook = callPackage ( @@ -435,7 +435,7 @@ rec { vimBinary = "${neovim-unwrapped}/bin/nvim"; inherit rtpPath; }; - } ./vim-command-check-hook.sh + } ./hooks/vim-command-check-hook.sh ) { }; neovimRequireCheckHook = callPackage ( @@ -447,7 +447,7 @@ rec { nvimBinary = "${neovim-unwrapped}/bin/nvim"; inherit rtpPath; }; - } ./neovim-require-check-hook.sh + } ./hooks/neovim-require-check-hook.sh ) { }; inherit From 49024a44f4186cb9299a01e61a75a6593ea73109 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Mar 2025 03:16:56 +0000 Subject: [PATCH 20/61] hexpatch: 1.10.0 -> 1.11.0 --- pkgs/by-name/he/hexpatch/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/he/hexpatch/package.nix b/pkgs/by-name/he/hexpatch/package.nix index 5dc99a54e173..337232a4c143 100644 --- a/pkgs/by-name/he/hexpatch/package.nix +++ b/pkgs/by-name/he/hexpatch/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "hexpatch"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "Etto48"; repo = "HexPatch"; tag = "v${version}"; - hash = "sha256-GzDrB0UJxBc2U/JXcJee7dMvlahD2Qqaen14677q+28="; + hash = "sha256-soiF4JCTOI/3SE53FdyLE0+qF80F0VVklMuUkCVps1g="; }; useFetchCargoVendor = true; - cargoHash = "sha256-G9Mm89nb9dJH+vl6YL9mlisD+/wrFiSYnuSuobBon9c="; + cargoHash = "sha256-3k0sQDO1wt16IB7Qx49S/Qxk4osw1SLv97cAffbgDZc="; nativeBuildInputs = [ cmake From 4c6e2a7bc8972f46d9532e0170b8ec85780ae678 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Mar 2025 09:51:42 +0000 Subject: [PATCH 21/61] avbroot: 3.13.0 -> 3.14.0 --- pkgs/by-name/av/avbroot/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/av/avbroot/package.nix b/pkgs/by-name/av/avbroot/package.nix index 236af3506be2..eedf43f8f5f1 100644 --- a/pkgs/by-name/av/avbroot/package.nix +++ b/pkgs/by-name/av/avbroot/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "avbroot"; - version = "3.13.0"; + version = "3.14.0"; src = fetchFromGitHub { owner = "chenxiaolong"; repo = "avbroot"; tag = "v${version}"; - hash = "sha256-ncgi/oQAvvNRX8Vf4RKlro6hV+uCCsdBdjdjVyVvTUg="; + hash = "sha256-d0sYOTM9o100XJ+5WzjSGM41Ax+l6LHlM0/Lbwz8gVc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-E4CcgUfuttKClqvofOvI2QJVzhsYrAw1yK0VR1miDVk="; + cargoHash = "sha256-LrjzDser5J7fIfviAGxeCmaoeu4XV/aG54ptiVI3Mn4="; nativeBuildInputs = [ pkg-config From d36362148a285183770f354a43f579ff169a950a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Mar 2025 10:02:57 +0000 Subject: [PATCH 22/61] oterm: 0.9.1 -> 0.9.3 --- pkgs/by-name/ot/oterm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix index 348e77d1d0c6..f9e678ccc439 100644 --- a/pkgs/by-name/ot/oterm/package.nix +++ b/pkgs/by-name/ot/oterm/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "oterm"; - version = "0.9.1"; + version = "0.9.3"; pyproject = true; src = fetchFromGitHub { owner = "ggozad"; repo = "oterm"; tag = version; - hash = "sha256-DsLse1EDxnkS4C0vwMEdY5//jIxerdDxzTrIsG3eSVI="; + hash = "sha256-2zzDVUZc+H2tBO5scRUjwz859uaQIbpvCaC0bm4B7NM="; }; pythonRelaxDeps = [ @@ -55,7 +55,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Text-based terminal client for Ollama"; homepage = "https://github.com/ggozad/oterm"; - changelog = "https://github.com/ggozad/oterm/releases/tag/${version}"; + changelog = "https://github.com/ggozad/oterm/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ gaelj ]; mainProgram = "oterm"; From 1b455d2b939b82d1ec56abbd5967a93b7c47be15 Mon Sep 17 00:00:00 2001 From: Michael Bednarek Date: Tue, 25 Mar 2025 06:57:19 -0400 Subject: [PATCH 23/61] hyprlandPlugins.hyprscroller: 0-unstable-2025-03-07 -> 0-unstable-2025-03-24 --- .../hyprwm/hyprland-plugins/hyprscroller.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix index b32093a6dc7b..83090727ed08 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix @@ -9,13 +9,13 @@ mkHyprlandPlugin hyprland { pluginName = "hyprscroller"; - version = "0-unstable-2025-03-07"; + version = "0-unstable-2025-03-24"; src = fetchFromGitHub { owner = "dawsers"; repo = "hyprscroller"; - rev = "fb3b2ec63c85f22a107bd635890fcb1afc30b01f"; - hash = "sha256-FErWOeUmyFWPNjE+EYWVvVwXGO7+4lVqZBwiapXa6Yw="; + rev = "5b62ca58790f8c2961da79af95efa458f6a814fe"; + hash = "sha256-monOoefLpK2cUAPBlJlVt9BkoSELQmYVysj81zJ74i0="; }; nativeBuildInputs = [ cmake ]; From bf80cd9a746a9151ac237dfba8d5afd2d4699bc7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Mar 2025 11:34:41 +0000 Subject: [PATCH 24/61] glab: 1.54.0 -> 1.55.0 --- pkgs/by-name/gl/glab/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix index ecc7126929d0..cabeb20d2543 100644 --- a/pkgs/by-name/gl/glab/package.nix +++ b/pkgs/by-name/gl/glab/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "glab"; - version = "1.54.0"; + version = "1.55.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - hash = "sha256-CtzTZ4PryY2zDCvoAp/cf0E0jpFPGH7SzFDaCwf48gg="; + hash = "sha256-K1zjb4QCLBp7GwT2580DXYKx3yTaIyNytKObMbzjvlQ="; }; - vendorHash = "sha256-r9HRDKf4EOjAeHo9rT69+nAf8zGZFWtXVo9nHuBOgaQ="; + vendorHash = "sha256-ODTyWArYcCxsWbN9fuppAcRYtKGxcadeRPIwfPiAuOE="; ldflags = [ "-s" From fcd39211acca4e243d3e533f355e7f50524abbd9 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Tue, 25 Mar 2025 11:40:37 +0000 Subject: [PATCH 25/61] forgejo: 10.0.2 -> 10.0.3 https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/10.0.3.md https://codeberg.org/forgejo/forgejo/releases/tag/v10.0.3 --- pkgs/by-name/fo/forgejo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index 23f9dcd54ef8..f2cc87fe1fe3 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -1,8 +1,8 @@ import ./generic.nix { - version = "10.0.2"; - hash = "sha256-UxjhJA6o1LS/7/s0BzcaTSkXSsnKfjIMIjL6ASSot6k="; + version = "10.0.3"; + hash = "sha256-bt1lgp6UiZeiZiIN3vZZbUygHVX1lEE5uOkPXrjk68o="; npmDepsHash = "sha256-e3SE6cu1xCBdoMRqp2Gcjcay/EwjF+bTdPOlpL1STvw="; - vendorHash = "sha256-ceV73QmxYEthjsA50ylojwC4dcTYAbE2UgxuxFqvi24="; + vendorHash = "sha256-b3+zxsKRylgfdW0Yiz0QryObMKdtiMCt0hB3DtAGFrQ="; lts = false; nixUpdateExtraArgs = [ "--override-filename" From 628ad9a59ff829cb51804b98d9c8e21bb96daed6 Mon Sep 17 00:00:00 2001 From: Stefan Visser Date: Tue, 25 Mar 2025 12:58:40 +0100 Subject: [PATCH 26/61] python3Packages.minify-html: 0.15.0 -> 0.16.4 Diff: https://github.com/wilsonzlin/minify-html/compare/v0.15.0...v0.16.4 Changelog: https://github.com/wilsonzlin/minify-html/blob/v0.16.4/CHANGELOG.md --- pkgs/development/python-modules/minify-html/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/minify-html/default.nix b/pkgs/development/python-modules/minify-html/default.nix index 4d3c20ef6232..d2e9eba7cf2f 100644 --- a/pkgs/development/python-modules/minify-html/default.nix +++ b/pkgs/development/python-modules/minify-html/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "minify-html"; - version = "0.15.0"; + version = "0.16.4"; pyproject = true; @@ -15,13 +15,13 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "minify_html"; - hash = "sha256-z0w2tvmvOwkBvSoKKds7CcDN8MONPd4o5oNbzg9gXTc="; + hash = "sha256-3UjI/5ZhoQNHYkAqdBGzFohnqXP4/Hiwn2foGCC2TSI="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-f93gKKQRkjxQJ49EK/0UI+BzFEa6iSfDX/0gNysSDmc="; + hash = "sha256-NLPei6ajR55mLyFhsjzUpXB/TsqqeDvP8yKE74t0ufk="; }; nativeBuildInputs = with rustPlatform; [ From d7e1e832c9272ade37fbdcccd4b55aa146360a58 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Mar 2025 12:33:16 +0000 Subject: [PATCH 27/61] cfdg: 3.4.1 -> 3.4.2 --- pkgs/by-name/cf/cfdg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cf/cfdg/package.nix b/pkgs/by-name/cf/cfdg/package.nix index 77077e01acb9..c6f66b123d13 100644 --- a/pkgs/by-name/cf/cfdg/package.nix +++ b/pkgs/by-name/cf/cfdg/package.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { pname = "cfdg"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "MtnViewJohn"; repo = "context-free"; rev = "Version${version}"; - sha256 = "sha256-f2VMb0TM50afKf/lGdZBP2z13UrCVgG4/IYi5gnD+ow="; + sha256 = "sha256-PtkvhX5PIeN/5UDpAaVwBwfp8ykjsjfH+8iGdbNQOfI="; }; nativeBuildInputs = [ From bbd237d27cd15abe14930b8e20c198c151aa77d4 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Tue, 25 Mar 2025 08:34:41 -0400 Subject: [PATCH 28/61] hickory-dns: 0.25.0-alpha.5 -> 0.25.1 https://github.com/hickory-dns/hickory-dns/releases/tag/v0.25.0 https://github.com/hickory-dns/hickory-dns/releases/tag/v0.25.1 --- pkgs/by-name/hi/hickory-dns/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hi/hickory-dns/package.nix b/pkgs/by-name/hi/hickory-dns/package.nix index 18f5e033c648..4082da2edbf3 100644 --- a/pkgs/by-name/hi/hickory-dns/package.nix +++ b/pkgs/by-name/hi/hickory-dns/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hickory-dns"; - version = "0.25.0-alpha.5"; + version = "0.25.1"; src = fetchFromGitHub { owner = "hickory-dns"; repo = "hickory-dns"; tag = "v${finalAttrs.version}"; - hash = "sha256-dbtdTvwm1DiV/nQzTAZJ7CD5raId9+bGNLrS88OocxI="; + hash = "sha256-H8wJozmuXtJ6d96DMgQ/Uw2sp3sa+UKMXT9vf5azcyc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-lBxCGR4/PrUJ0JLqBn/VzJY47Yp8M4TRsYfCsZN17Ek="; + cargoHash = "sha256-nuT2WUejpIhfI8WVTupAgdo7iav9YL1ipHu/PR4S2Hg="; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; From 4d69e40329be19ca7cf397106c95c6d204860c83 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Mar 2025 11:19:29 +0000 Subject: [PATCH 29/61] obs-do: 0.1.7 -> 0.1.8 --- pkgs/by-name/ob/obs-do/package.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ob/obs-do/package.nix b/pkgs/by-name/ob/obs-do/package.nix index d6524a6da9c5..f23258a3348f 100644 --- a/pkgs/by-name/ob/obs-do/package.nix +++ b/pkgs/by-name/ob/obs-do/package.nix @@ -5,24 +5,22 @@ versionCheckHook, nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "obs-do"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "jonhoo"; repo = "obs-do"; - tag = "v${version}"; - hash = "sha256-aeFUgwbB1sGD6n+WT4GJpQURk/xKvL0w+6DtF1VQsCM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-mYxOjUVjICVqFFw1SX7TsVkbnvhilVmj+8LSZTNBbFE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-uiQnWe/yni++czOwHXbXjQTdg2nOdI3FxUag+aKP69c="; + cargoHash = "sha256-OgSEJOY0m3wfccPfhIon11xyC/ywYaTBjGYLkRr/y/Q="; - nativeInstallCheckInputs = [ - versionCheckHook - ]; - versionCheckProgramArg = [ "--version" ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { @@ -39,4 +37,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ GaetanLepage ]; mainProgram = "obs-do"; }; -} +}) From 2e76f1b474f0c35adeb2768eebcbdda39fc68d15 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Mon, 24 Mar 2025 16:02:09 -0300 Subject: [PATCH 30/61] shell.nix: include gh in the default shell GitHub's CLI is now used by nixpkgs-review to fetch Nixpkgs evaluation results from GitHub Actions. Including it in the default shell will allow all contributors to easily log-in to GitHub when nixpkgs-review tries to fetch evaluation results. Signed-off-by: Fernando Rodrigues --- shell.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shell.nix b/shell.nix index ecb444e75ec0..d8235f187559 100644 --- a/shell.nix +++ b/shell.nix @@ -35,5 +35,8 @@ curPkgs # Helper to review Nixpkgs PRs # See CONTRIBUTING.md nixpkgs-review + # Command-line utility for working with GitHub + # Used by nixpkgs-review to fetch eval results + gh ]; } From bd2eb2d6f5054a6cf1b0286d647dd8dcd3b1263f Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Tue, 25 Mar 2025 14:07:16 +0100 Subject: [PATCH 31/61] system-syzygy: 1.0.1 -> 1.0.2, use fetchCargoVendor --- pkgs/by-name/sy/system-syzygy/Cargo.lock | 325 ---------------------- pkgs/by-name/sy/system-syzygy/package.nix | 17 +- 2 files changed, 5 insertions(+), 337 deletions(-) delete mode 100644 pkgs/by-name/sy/system-syzygy/Cargo.lock diff --git a/pkgs/by-name/sy/system-syzygy/Cargo.lock b/pkgs/by-name/sy/system-syzygy/Cargo.lock deleted file mode 100644 index 9c08a1c193dc..000000000000 --- a/pkgs/by-name/sy/system-syzygy/Cargo.lock +++ /dev/null @@ -1,325 +0,0 @@ -[[package]] -name = "adler32" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "ahi" -version = "0.1.0" -source = "git+https://github.com/mdsteele/ahi?tag=v0.1.0#8dfd2b39ba35d77a3260d95d53369c149e875ecf" - -[[package]] -name = "app_dirs" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "shell32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "xdg 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "bitflags" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "bitflags" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "byteorder" -version = "1.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "cfg-if" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "deflate" -version = "0.7.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "gcc" -version = "0.3.54" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "getopts" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "glob" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "ico" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "png 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "inflate" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "itersynth" -version = "0.1.0" -source = "git+https://github.com/mdsteele/itersynth?tag=v0.1.0#bc1e3ffe726c80e3a931bf9e58f4a98f213c2bf5" - -[[package]] -name = "lazy_static" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "libc" -version = "0.2.40" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "num" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", - "num-iter 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "num-integer" -version = "0.1.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "num-traits 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "num-iter" -version = "0.1.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "num-traits" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "ole32-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "png" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "deflate 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", - "inflate 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "num-iter 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rand" -version = "0.3.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rand" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "sdl2" -version = "0.31.0" -source = "git+https://github.com/mdsteele/rust-sdl2?branch=hash#f277981d55f68be33a64c33871b23c4c405e0763" -dependencies = [ - "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", - "num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)", - "sdl2-sys 0.31.0 (git+https://github.com/mdsteele/rust-sdl2?branch=hash)", -] - -[[package]] -name = "sdl2-sys" -version = "0.31.0" -source = "git+https://github.com/mdsteele/rust-sdl2?branch=hash#f277981d55f68be33a64c33871b23c4c405e0763" -dependencies = [ - "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "serde" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "shell32-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "syzygy" -version = "1.0.1" -dependencies = [ - "ahi 0.1.0 (git+https://github.com/mdsteele/ahi?tag=v0.1.0)", - "app_dirs 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)", - "getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", - "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "ico 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "itersynth 0.1.0 (git+https://github.com/mdsteele/itersynth?tag=v0.1.0)", - "num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "sdl2 0.31.0 (git+https://github.com/mdsteele/rust-sdl2?branch=hash)", - "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", - "winres 0.1.6 (git+https://github.com/mdsteele/winres?branch=escape)", -] - -[[package]] -name = "toml" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "serde 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "winapi" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "winres" -version = "0.1.6" -source = "git+https://github.com/mdsteele/winres?branch=escape#d88139c3e1c2592bf14d1a4323c18103a21fe190" -dependencies = [ - "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "xdg" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[metadata] -"checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c" -"checksum ahi 0.1.0 (git+https://github.com/mdsteele/ahi?tag=v0.1.0)" = "" -"checksum app_dirs 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e73a24bad9bd6a94d6395382a6c69fe071708ae4409f763c5475e14ee896313d" -"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" -"checksum bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf" -"checksum byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "90492c5858dd7d2e78691cfb89f90d273a2800fc11d98f60786e5d87e2f83781" -"checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de" -"checksum deflate 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)" = "8a6abb26e16e8d419b5c78662aa9f82857c2386a073da266840e474d5055ec86" -"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" -"checksum gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)" = "5e33ec290da0d127825013597dbdfc28bee4964690c7ce1166cbc2a7bd08b1bb" -"checksum getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "b900c08c1939860ce8b54dc6a89e26e00c04c380fd0e09796799bd7f12861e05" -"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" -"checksum ico 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6a4b3331534254a9b64095ae60d3dc2a8225a7a70229cd5888be127cdc1f6804" -"checksum inflate 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f5f9f47468e9a76a6452271efadc88fe865a82be91fe75e6c0c57b87ccea59d4" -"checksum itersynth 0.1.0 (git+https://github.com/mdsteele/itersynth?tag=v0.1.0)" = "" -"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" -"checksum libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "6fd41f331ac7c5b8ac259b8bf82c75c0fb2e469bbf37d2becbba9a6a2221965b" -"checksum num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" -"checksum num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f8d26da319fb45674985c78f1d1caf99aa4941f785d384a2ae36d0740bc3e2fe" -"checksum num-iter 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "4b226df12c5a59b63569dd57fafb926d91b385dfce33d8074a412411b689d593" -"checksum num-traits 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dee092fcdf725aee04dd7da1d21debff559237d49ef1cb3e69bcb8ece44c7364" -"checksum ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2c49021782e5233cd243168edfa8037574afed4eba4bbaf538b3d8d1789d8c" -"checksum png 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f0b0cabbbd20c2d7f06dbf015e06aad59b6ca3d9ed14848783e98af9aaf19925" -"checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1" -"checksum rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5" -"checksum sdl2 0.31.0 (git+https://github.com/mdsteele/rust-sdl2?branch=hash)" = "" -"checksum sdl2-sys 0.31.0 (git+https://github.com/mdsteele/rust-sdl2?branch=hash)" = "" -"checksum serde 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)" = "c70142ae874a42c70e03c63c6a49abe2ea0079b090bf6e136e99252fc1974bd6" -"checksum shell32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ee04b46101f57121c9da2b151988283b6beb79b34f5bb29a58ee48cb695122c" -"checksum toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a7540f4ffc193e0d3c94121edb19b055670d369f77d5804db11ae053a45b6e7e" -"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" -"checksum winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "04e3bd221fcbe8a271359c04f21a76db7d0c6028862d1bb5512d85e1e2eb5bb3" -"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" -"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -"checksum winres 0.1.6 (git+https://github.com/mdsteele/winres?branch=escape)" = "" -"checksum xdg 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a66b7c2281ebde13cf4391d70d4c7e5946c3c25e72a7b859ca8f677dcd0b0c61" diff --git a/pkgs/by-name/sy/system-syzygy/package.nix b/pkgs/by-name/sy/system-syzygy/package.nix index 1d1dffb6875a..7636ccf7ab82 100644 --- a/pkgs/by-name/sy/system-syzygy/package.nix +++ b/pkgs/by-name/sy/system-syzygy/package.nix @@ -19,27 +19,20 @@ let in rustPlatform.buildRustPackage rec { pname = "system-syzygy"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "mdsteele"; repo = "syzygy"; - rev = "5ba148fed7aae14bf35108d7303e4194e8ffe5e8"; - sha256 = "07mzwx8ql33q865snnw4gm3dgf0mnm60lnq1f5fgas2yjy9g9vwa"; + tag = "v${version}"; + hash = "sha256-wxe9+r3tWRXiznvjvxsmTgUC7YVKgbt+I3Q8A/WtcN0="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ SDL2 ]; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "ahi-0.1.0" = "sha256-EliAObznLP1wkk8r3c3hhB300HYnEd9N6CJW+xG6bxE="; - "itersynth-0.1.0" = "sha256-dXQ+uBFchcnOjKF/CcS+AwhzFzejk2JCvvKMfS64RRQ="; - "sdl2-0.31.0" = "sha256-wTam0hwiajdw/ub2yM6q7+50Y3AueStcK5HLa65Y2XQ="; - "winres-0.1.6" = "sha256-7jYrgc3BV2UmzfACc/xyYsTkaXBPfn+bLmwdrcBe1O0="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-H/iG6vsmtpBGYBBqNQG5EpyZaUtfXfVaHv4fkxwqrD0="; postInstall = '' mkdir -p $out/share/syzygy/ From cb00c3ba6ca900bdf27314001fc59e44bbd1fcd4 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 23 Mar 2025 13:09:38 -0500 Subject: [PATCH 32/61] vimUtils: move to utils directory Add some organization --- doc/languages-frameworks/vim.section.md | 4 ++-- .../editors/vim/plugins/{ => utils}/build-vim-plugin.nix | 0 .../editors/vim/plugins/{ => utils}/get-plugins.nix | 0 pkgs/applications/editors/vim/plugins/{ => utils}/update.py | 2 +- .../editors/vim/plugins/{ => utils}/updater.nix | 2 +- .../editors/vim/plugins/{ => utils}/vim-utils.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) rename pkgs/applications/editors/vim/plugins/{ => utils}/build-vim-plugin.nix (100%) rename pkgs/applications/editors/vim/plugins/{ => utils}/get-plugins.nix (100%) rename pkgs/applications/editors/vim/plugins/{ => utils}/update.py (98%) rename pkgs/applications/editors/vim/plugins/{ => utils}/updater.nix (92%) rename pkgs/applications/editors/vim/plugins/{ => utils}/vim-utils.nix (99%) diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 9a591bd0129a..da139623a25c 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -139,9 +139,9 @@ Note: this is not possible anymore for Neovim. ## Adding new plugins to nixpkgs {#adding-new-plugins-to-nixpkgs} -Nix expressions for Vim plugins are stored in [pkgs/applications/editors/vim/plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/editors/vim/plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`nix-shell -p vimPluginsUpdater --run vim-plugins-updater`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/updater.nix). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-plugin-names). +Nix expressions for Vim plugins are stored in [pkgs/applications/editors/vim/plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/editors/vim/plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`nix-shell -p vimPluginsUpdater --run vim-plugins-updater`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/utils/updater.nix). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-plugin-names). -When the vim updater detects an nvim-treesitter update, it also runs [`nvim-treesitter/update.py $(nix-build -A vimPlugins.nvim-treesitter)`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/update.py) to update the tree sitter grammars for `nvim-treesitter`. +When the vim updater detects an nvim-treesitter update, it also runs [`nvim-treesitter/update.py $(nix-build -A vimPlugins.nvim-treesitter)`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/utils/update.py) to update the tree sitter grammars for `nvim-treesitter`. Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added: diff --git a/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix b/pkgs/applications/editors/vim/plugins/utils/build-vim-plugin.nix similarity index 100% rename from pkgs/applications/editors/vim/plugins/build-vim-plugin.nix rename to pkgs/applications/editors/vim/plugins/utils/build-vim-plugin.nix diff --git a/pkgs/applications/editors/vim/plugins/get-plugins.nix b/pkgs/applications/editors/vim/plugins/utils/get-plugins.nix similarity index 100% rename from pkgs/applications/editors/vim/plugins/get-plugins.nix rename to pkgs/applications/editors/vim/plugins/utils/get-plugins.nix diff --git a/pkgs/applications/editors/vim/plugins/update.py b/pkgs/applications/editors/vim/plugins/utils/update.py similarity index 98% rename from pkgs/applications/editors/vim/plugins/update.py rename to pkgs/applications/editors/vim/plugins/utils/update.py index a973a1919eff..369b90de4a3a 100755 --- a/pkgs/applications/editors/vim/plugins/update.py +++ b/pkgs/applications/editors/vim/plugins/utils/update.py @@ -40,7 +40,7 @@ treesitter = importlib.import_module("nvim-treesitter.update") HEADER = ( - "# GENERATED by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!" + "# GENERATED by ./pkgs/applications/editors/vim/plugins/utils/update.py. Do not edit!" ) NIXPKGS_NVIMTREESITTER_FOLDER = "pkgs/applications/editors/vim/plugins/nvim-treesitter" diff --git a/pkgs/applications/editors/vim/plugins/updater.nix b/pkgs/applications/editors/vim/plugins/utils/updater.nix similarity index 92% rename from pkgs/applications/editors/vim/plugins/updater.nix rename to pkgs/applications/editors/vim/plugins/utils/updater.nix index 6ea8e60448d5..b2dbdf9fca41 100644 --- a/pkgs/applications/editors/vim/plugins/updater.nix +++ b/pkgs/applications/editors/vim/plugins/utils/updater.nix @@ -42,7 +42,7 @@ buildPythonApplication { neovim-unwrapped nurl ] - }" --prefix PYTHONPATH : "${./.}:${../../../../../maintainers/scripts/pluginupdate-py}" ) + }" --prefix PYTHONPATH : "${./.}:${../../../../../../maintainers/scripts/pluginupdate-py}" ) wrapPythonPrograms ''; diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix similarity index 99% rename from pkgs/applications/editors/vim/plugins/vim-utils.nix rename to pkgs/applications/editors/vim/plugins/utils/vim-utils.nix index 820ca3d1ff91..dd12f9a442e6 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix @@ -423,7 +423,7 @@ rec { vimBinary = "${vim}/bin/vim"; inherit rtpPath; }; - } ./hooks/vim-gen-doc-hook.sh + } ../hooks/vim-gen-doc-hook.sh ) { }; vimCommandCheckHook = callPackage ( @@ -435,7 +435,7 @@ rec { vimBinary = "${neovim-unwrapped}/bin/nvim"; inherit rtpPath; }; - } ./hooks/vim-command-check-hook.sh + } ../hooks/vim-command-check-hook.sh ) { }; neovimRequireCheckHook = callPackage ( @@ -447,7 +447,7 @@ rec { nvimBinary = "${neovim-unwrapped}/bin/nvim"; inherit rtpPath; }; - } ./hooks/neovim-require-check-hook.sh + } ../hooks/neovim-require-check-hook.sh ) { }; inherit diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83b12ea5784e..475fec9547bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -123,7 +123,7 @@ with pkgs; common-updater-scripts = callPackage ../common-updater/scripts.nix { }; - vimPluginsUpdater = callPackage ../applications/editors/vim/plugins/updater.nix { + vimPluginsUpdater = callPackage ../applications/editors/vim/plugins/utils/updater.nix { inherit (python3Packages) buildPythonApplication ; }; @@ -17783,7 +17783,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Security; }; - vimUtils = callPackage ../applications/editors/vim/plugins/vim-utils.nix { }; + vimUtils = callPackage ../applications/editors/vim/plugins/utils/vim-utils.nix { }; vimPlugins = recurseIntoAttrs (callPackage ../applications/editors/vim/plugins { }); From 944f6a9e57ac3258a22928b619ba06bc2da6ef68 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 23 Mar 2025 13:33:32 -0500 Subject: [PATCH 33/61] vimPlugins.markdown-preview-nvim: move supporting files to patches --- pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++-- .../{ => patches}/markdown-preview-nvim/fix-node-paths.patch | 0 .../plugins/{ => patches}/markdown-preview-nvim/package.json | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/applications/editors/vim/plugins/{ => patches}/markdown-preview-nvim/fix-node-paths.patch (100%) rename pkgs/applications/editors/vim/plugins/{ => patches}/markdown-preview-nvim/package.json (100%) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 4254136fef87..2f1eeab649f0 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1757,7 +1757,7 @@ in # We only need its dependencies `node-modules`. nodeDep = mkYarnModules rec { inherit (super.markdown-preview-nvim) pname version; - packageJSON = ./markdown-preview-nvim/package.json; + packageJSON = ./patches/markdown-preview-nvim/package.json; yarnLock = "${super.markdown-preview-nvim.src}/yarn.lock"; offlineCache = fetchYarnDeps { inherit yarnLock; @@ -1767,7 +1767,7 @@ in in super.markdown-preview-nvim.overrideAttrs { patches = [ - (replaceVars ./markdown-preview-nvim/fix-node-paths.patch { + (replaceVars ./patches/markdown-preview-nvim/fix-node-paths.patch { node = "${nodejs}/bin/node"; }) ]; diff --git a/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch b/pkgs/applications/editors/vim/plugins/patches/markdown-preview-nvim/fix-node-paths.patch similarity index 100% rename from pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch rename to pkgs/applications/editors/vim/plugins/patches/markdown-preview-nvim/fix-node-paths.patch diff --git a/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/package.json b/pkgs/applications/editors/vim/plugins/patches/markdown-preview-nvim/package.json similarity index 100% rename from pkgs/applications/editors/vim/plugins/markdown-preview-nvim/package.json rename to pkgs/applications/editors/vim/plugins/patches/markdown-preview-nvim/package.json From eec836cd7d1e6c44de63f569ecc5efd5591d491c Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 23 Mar 2025 18:57:02 -0500 Subject: [PATCH 34/61] vimPlugins: automate non-generated plugin calls Move the non-generated plugins to using a function call that iterates over the folders in the non-generated directory so we don't need them in overrides.nix --- .../editors/vim/plugins/default.nix | 7 ++++ .../editors/vim/plugins/overrides.nix | 42 ------------------- 2 files changed, 7 insertions(+), 42 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/default.nix b/pkgs/applications/editors/vim/plugins/default.nix index b699c66b47c8..d04632599e22 100644 --- a/pkgs/applications/editors/vim/plugins/default.nix +++ b/pkgs/applications/editors/vim/plugins/default.nix @@ -27,6 +27,12 @@ let inherit buildVimPlugin; }; + nonGeneratedPlugins = + self: super: + lib.mapAttrs (name: _: callPackage (./non-generated + "/${name}") { }) ( + lib.filterAttrs (name: type: type == "directory") (builtins.readDir ./non-generated) + ); + plugins = callPackage ./generated.nix { inherit buildVimPlugin; inherit (neovimUtils) buildNeovimPlugin; @@ -49,6 +55,7 @@ lib.pipe initialPackages [ (extends plugins) (extends luaPackagePlugins) (extends nodePackagePlugins) + (extends nonGeneratedPlugins) (extends overrides) (extends aliases) lib.makeExtensible diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 2f1eeab649f0..752e56823a81 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -229,8 +229,6 @@ in ]; }; - avante-nvim = callPackage ./non-generated/avante-nvim { }; - aw-watcher-vim = super.aw-watcher-vim.overrideAttrs { patches = [ (replaceVars ./patches/aw-watcher-vim/program_paths.patch { @@ -298,8 +296,6 @@ in meta.homepage = "https://github.com/sblumentritt/bitbake.vim/"; }; - blink-cmp = callPackage ./non-generated/blink-cmp { }; - blink-cmp-copilot = super.blink-cmp-copilot.overrideAttrs { dependencies = [ self.copilot-lua ]; }; @@ -320,8 +316,6 @@ in dependencies = [ self.blink-cmp ]; }; - blink-pairs = callPackage ./non-generated/blink-pairs { }; - bluloco-nvim = super.bluloco-nvim.overrideAttrs { dependencies = [ self.lush-nvim ]; }; @@ -378,8 +372,6 @@ in ]; }; - clangd_extensions-nvim = callPackage ./non-generated/clangd_extensions-nvim { }; - clang_complete = super.clang_complete.overrideAttrs { # In addition to the arguments you pass to your compiler, you also need to # specify the path of the C++ std header (if you are using C++). @@ -431,8 +423,6 @@ in ]; }; - cmp-async-path = callPackage ./non-generated/cmp-async-path { }; - cmp-beancount = super.cmp-beancount.overrideAttrs { checkInputs = [ self.nvim-cmp ]; }; @@ -753,8 +743,6 @@ in ''; }; - codesnap-nvim = callPackage ./non-generated/codesnap-nvim { }; - codewindow-nvim = super.codewindow-nvim.overrideAttrs { dependencies = [ self.nvim-treesitter ]; }; @@ -880,8 +868,6 @@ in ]; }; - cord-nvim = callPackage ./non-generated/cord-nvim { }; - cornelis = super.cornelis.overrideAttrs { dependencies = [ self.vim-textobj-user ]; opt = [ self.vim-which-key ]; @@ -1289,8 +1275,6 @@ in configurePhase = "cd plugins/nvim"; }; - gitlab-vim = callPackage ./non-generated/gitlab-vim { }; - gitlinker-nvim = super.gitlinker-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; @@ -1373,8 +1357,6 @@ in ]; }; - hare-vim = callPackage ./non-generated/hare-vim { }; - harpoon = super.harpoon.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; @@ -1521,8 +1503,6 @@ in ''; }; - LanguageClient-neovim = callPackage ./non-generated/LanguageClient-neovim { }; - LazyVim = super.LazyVim.overrideAttrs { # Any other dependency is optional dependencies = [ self.lazy-nvim ]; @@ -1708,8 +1688,6 @@ in dependencies = [ self.plenary-nvim ]; }; - lsp_lines-nvim = callPackage ./non-generated/lsp_lines-nvim { }; - ltex_extra-nvim = super.ltex_extra-nvim.overrideAttrs { # Other modules require setup call first nvimRequireCheck = "ltex_extra"; @@ -1899,8 +1877,6 @@ in ]; }; - moveline-nvim = callPackage ./non-generated/moveline-nvim { }; - multicursors-nvim = super.multicursors-nvim.overrideAttrs { dependencies = with self; [ nvim-treesitter @@ -2360,8 +2336,6 @@ in dependencies = [ self.nvim-dap ]; }; - nvim-dbee = callPackage ./non-generated/nvim-dbee { }; - nvim-FeMaco-lua = super.nvim-FeMaco-lua.overrideAttrs { dependencies = [ self.nvim-treesitter ]; }; @@ -2426,8 +2400,6 @@ in dependencies = [ self.nvim-java-core ]; }; - nvim-julia-autotest = callPackage ./non-generated/nvim-julia-autotest { }; - nvim-lsp-file-operations = super.nvim-lsp-file-operations.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; @@ -2502,8 +2474,6 @@ in nvimSkipModule = "snippets.utils.cmp"; }; - nvim-spectre = callPackage ./non-generated/nvim-spectre { }; - nvim-surround = super.nvim-surround.overrideAttrs { # Optional treesitter integration nvimSkipModule = "nvim-surround.queries"; @@ -2824,8 +2794,6 @@ in quicker-nvim = super.quicker-nvim.overrideAttrs { }; - rainbow-delimiters-nvim = callPackage ./non-generated/rainbow-delimiters-nvim { }; - range-highlight-nvim = super.range-highlight-nvim.overrideAttrs { dependencies = [ self.cmd-parser-nvim ]; }; @@ -2927,8 +2895,6 @@ in dependencies = [ self.nui-nvim ]; }; - sg-nvim = callPackage ./non-generated/sg-nvim { }; - skim = buildVimPlugin { pname = "skim"; inherit (skim) version; @@ -3005,8 +2971,6 @@ in ]; }; - sniprun = callPackage ./non-generated/sniprun { }; - # The GitHub repository returns 404, which breaks the update script Spacegray-vim = buildVimPlugin { pname = "Spacegray.vim"; @@ -3639,8 +3603,6 @@ in passthru.python3Dependencies = ps: with ps; [ beancount ]; }; - vim-clap = callPackage ./non-generated/vim-clap { }; - vim-codefmt = super.vim-codefmt.overrideAttrs { dependencies = [ self.vim-maktaba ]; }; @@ -3771,8 +3733,6 @@ in ''; }; - vim-markdown-composer = callPackage ./non-generated/vim-markdown-composer { }; - vim-matchup = super.vim-matchup.overrideAttrs { # Optional treesitter integration nvimSkipModule = "treesitter-matchup.third-party.query"; @@ -3818,8 +3778,6 @@ in dependencies = [ self.vim-repeat ]; }; - vim-stationeers-ic10-syntax = callPackage ./non-generated/vim-stationeers-ic10-syntax { }; - vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: { postPatch = old.postPatch or "" From baa373b985069a77d4fb0c043eb5743bc800f773 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 23 Mar 2025 13:32:29 -0500 Subject: [PATCH 35/61] vimPlugins.vim2nix: move to non-generated --- .../vim/plugins/non-generated/vim2nix/default.nix | 10 ++++++++++ .../{vim2nix => non-generated/vim2nix/src}/README.txt | 0 .../vim2nix/src}/addon-info.json | 0 .../vim2nix/src}/autoload/nix.vim | 0 pkgs/applications/editors/vim/plugins/overrides.nix | 7 ------- 5 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/vim2nix/default.nix rename pkgs/applications/editors/vim/plugins/{vim2nix => non-generated/vim2nix/src}/README.txt (100%) rename pkgs/applications/editors/vim/plugins/{vim2nix => non-generated/vim2nix/src}/addon-info.json (100%) rename pkgs/applications/editors/vim/plugins/{vim2nix => non-generated/vim2nix/src}/autoload/nix.vim (100%) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/vim2nix/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/vim2nix/default.nix new file mode 100644 index 000000000000..bd7c55a15d6a --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/vim2nix/default.nix @@ -0,0 +1,10 @@ +{ + vimPlugins, + vimUtils, +}: +vimUtils.buildVimPlugin { + pname = "vim2nix"; + version = "1.0"; + src = ./src; + dependencies = [ vimPlugins.vim-addon-manager ]; +} diff --git a/pkgs/applications/editors/vim/plugins/vim2nix/README.txt b/pkgs/applications/editors/vim/plugins/non-generated/vim2nix/src/README.txt similarity index 100% rename from pkgs/applications/editors/vim/plugins/vim2nix/README.txt rename to pkgs/applications/editors/vim/plugins/non-generated/vim2nix/src/README.txt diff --git a/pkgs/applications/editors/vim/plugins/vim2nix/addon-info.json b/pkgs/applications/editors/vim/plugins/non-generated/vim2nix/src/addon-info.json similarity index 100% rename from pkgs/applications/editors/vim/plugins/vim2nix/addon-info.json rename to pkgs/applications/editors/vim/plugins/non-generated/vim2nix/src/addon-info.json diff --git a/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim b/pkgs/applications/editors/vim/plugins/non-generated/vim2nix/src/autoload/nix.vim similarity index 100% rename from pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim rename to pkgs/applications/editors/vim/plugins/non-generated/vim2nix/src/autoload/nix.vim diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 752e56823a81..2e9996c6c1b4 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3480,13 +3480,6 @@ in meta.homepage = "https://github.com/ackyshake/VimCompletesMe/"; }; - vim2nix = buildVimPlugin { - pname = "vim2nix"; - version = "1.0"; - src = ./vim2nix; - dependencies = [ self.vim-addon-manager ]; - }; - vimsence = super.vimsence.overrideAttrs { meta = with lib; { description = "Discord rich presence for Vim"; From dc7b6a574ce85aae87700303c03ffa0435007519 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 23 Mar 2025 19:08:05 -0500 Subject: [PATCH 36/61] vimPlugins.Spacegray-vim: drop package --- pkgs/applications/editors/vim/plugins/aliases.nix | 1 + pkgs/applications/editors/vim/plugins/overrides.nix | 13 ------------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix index 572ba29d2681..80d7196a1b51 100644 --- a/pkgs/applications/editors/vim/plugins/aliases.nix +++ b/pkgs/applications/editors/vim/plugins/aliases.nix @@ -116,6 +116,7 @@ mapAliases ( snipmate = vim-snipmate; sourcemap = sourcemap-vim; "sourcemap.vim" = sourcemap-vim; + Spacegray-vim = throw "Spacegray-vim has been removed: abandoned by upstream"; # Added 2025-03-24 surround = vim-surround; sleuth = vim-sleuth; solidity = vim-solidity; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 2e9996c6c1b4..20bc175bce8e 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2971,19 +2971,6 @@ in ]; }; - # The GitHub repository returns 404, which breaks the update script - Spacegray-vim = buildVimPlugin { - pname = "Spacegray.vim"; - version = "2021-07-06"; - src = fetchFromGitHub { - owner = "ackyshake"; - repo = "Spacegray.vim"; - rev = "c699ca10ed421c462bd1c87a158faaa570dc8e28"; - sha256 = "0ma8w6p5jh6llka49x5j5ql8fmhv0bx5hhsn5b2phak79yqg1k61"; - }; - meta.homepage = "https://github.com/ackyshake/Spacegray.vim/"; - }; - spaceman-nvim = super.spaceman-nvim.overrideAttrs { # Optional telescope integration nvimSkipModule = "spaceman.adapters.telescope"; From f11e01af917cf1a5bb44bfd48866abbe1f85a060 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 24 Mar 2025 16:38:22 -0500 Subject: [PATCH 37/61] vimPlugins.VimCompletesMe: migrate to active repo Old repo referenced was removed, referencing currently active repo. --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 13 ------------- .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 4928f5c7b88e..96ffd74e62be 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -458,6 +458,19 @@ final: prev: meta.hydraPlatforms = [ ]; }; + VimCompletesMe = buildVimPlugin { + pname = "VimCompletesMe"; + version = "2015-04-20"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "VimCompletesMe"; + rev = "b915ac2c081dd5aec69b561b04a8ac1778d2277c"; + sha256 = "0mal1raflzzmahb4skc01dwp9vasvwcyh9mpw3r75gfrfzbyjrlk"; + }; + meta.homepage = "https://github.com/vim-scripts/VimCompletesMe/"; + meta.hydraPlatforms = [ ]; + }; + VimOrganizer = buildVimPlugin { pname = "VimOrganizer"; version = "2020-12-15"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 20bc175bce8e..e13a536e67ef 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3454,19 +3454,6 @@ in ]; }; - # The GitHub repository returns 404, which breaks the update script - VimCompletesMe = buildVimPlugin { - pname = "VimCompletesMe"; - version = "2022-02-18"; - src = fetchFromGitHub { - owner = "ackyshake"; - repo = "VimCompletesMe"; - rev = "9adf692d7ae6424038458a89d4a411f0a27d1388"; - sha256 = "1sndgb3291dyifaa8adri2mb8cgbinbar3nw1fnf67k9ahwycaz0"; - }; - meta.homepage = "https://github.com/ackyshake/VimCompletesMe/"; - }; - vimsence = super.vimsence.overrideAttrs { meta = with lib; { description = "Discord rich presence for Vim"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index c8dcabe943a0..fd84e57e0d23 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -34,6 +34,7 @@ https://github.com/tmhedberg/SimpylFold/,, https://github.com/vim-scripts/SmartCase/,, https://github.com/jaredgorski/SpaceCamp/,, https://github.com/chrisbra/SudoEdit.vim/,, +https://github.com/vim-scripts/VimCompletesMe/,HEAD, https://github.com/hsitz/VimOrganizer/,, https://github.com/VundleVim/Vundle.vim/,, https://github.com/esneider/YUNOcommit.vim/,, From 0c4d4290a6e55baa9d94a0e0b444bcecf8107cb5 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 23 Mar 2025 19:11:33 -0500 Subject: [PATCH 38/61] vimPlugins.vim-pony: redirect to active repo --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 13 ------------- .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 96ffd74e62be..bec0b2d4272c 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -18731,6 +18731,19 @@ final: prev: meta.hydraPlatforms = [ ]; }; + vim-pony = buildVimPlugin { + pname = "vim-pony"; + version = "2018-06-24"; + src = fetchFromGitHub { + owner = "jmcomets"; + repo = "vim-pony"; + rev = "cd0949971c485fd23de62bb78ca39e5bbe8b915a"; + sha256 = "0sassx3mkkd543mljycfmvgwcnw36zbpanm41mf3bavxvsk0azx6"; + }; + meta.homepage = "https://github.com/jmcomets/vim-pony/"; + meta.hydraPlatforms = [ ]; + }; + vim-poweryank = buildVimPlugin { pname = "vim-poweryank"; version = "2017-08-13"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index e13a536e67ef..51ac498251f1 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3717,19 +3717,6 @@ in dependencies = [ self.denops-vim ]; }; - # The GitHub repository returns 404, which breaks the update script - vim-pony = buildVimPlugin { - pname = "vim-pony"; - version = "2018-07-27"; - src = fetchFromGitHub { - owner = "jakwings"; - repo = "vim-pony"; - rev = "b26f01a869000b73b80dceabd725d91bfe175b75"; - sha256 = "0if8g94m3xmpda80byfxs649w2is9ah1k8v3028nblan73zlc8x8"; - }; - meta.homepage = "https://github.com/jakwings/vim-pony/"; - }; - vim-sensible = super.vim-sensible.overrideAttrs { patches = [ ./patches/vim-sensible/fix-nix-store-path-regex.patch ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index fd84e57e0d23..41db400cd1ee 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1437,6 +1437,7 @@ https://github.com/junegunn/vim-plug/,, https://github.com/powerman/vim-plugin-AnsiEsc/,, https://github.com/hasundue/vim-pluto/,HEAD, https://github.com/sheerun/vim-polyglot/,, +https://github.com/jmcomets/vim-pony/,HEAD, https://github.com/haya14busa/vim-poweryank/,, https://github.com/prettier/vim-prettier/,, https://github.com/thinca/vim-prettyprint/,, From 9cc633bc97d92e4dcb7d0ecfe221324a8c41788b Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 23 Mar 2025 21:03:03 -0500 Subject: [PATCH 39/61] vimplugins.coc-nginx: move overrides into nodePackagePlugins --- .../editors/vim/plugins/nodePackagePlugins.nix | 11 +++++++++-- pkgs/applications/editors/vim/plugins/overrides.nix | 7 ------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index 3856a7be1958..6abe5ab246df 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -46,13 +46,20 @@ let "coc-wxml" "coc-yaml" "coc-yank" + "coc-nginx" ]; + + packageNameOverrides = { + "coc-nginx" = "@yaegassy/coc-nginx"; + }; + + getPackageName = name: packageNameOverrides.${name} or name; in lib.genAttrs nodePackageNames ( name: buildVimPlugin { pname = name; - inherit (nodePackages.${name}) version meta; - src = "${nodePackages.${name}}/lib/node_modules/${name}"; + inherit (nodePackages.${getPackageName name}) version meta; + src = "${nodePackages.${getPackageName name}}/lib/node_modules/${getPackageName name}"; } ) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 51ac498251f1..b29f7da51709 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -37,7 +37,6 @@ meson, neovim-unwrapped, nim1, - nodePackages, nodejs, notmuch, openscad, @@ -633,12 +632,6 @@ in src = "${coc-pyright}/lib/node_modules/coc-pyright"; }; - coc-nginx = buildVimPlugin { - pname = "coc-nginx"; - inherit (nodePackages."@yaegassy/coc-nginx") version meta; - src = "${nodePackages."@yaegassy/coc-nginx"}/lib/node_modules/@yaegassy/coc-nginx"; - }; - coc-toml = buildVimPlugin { pname = "coc-toml"; inherit (coc-toml) version meta; From db2eef5af63a8ba16608819d79441c371b53392b Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 23 Mar 2025 21:10:55 -0500 Subject: [PATCH 40/61] vimplugins.coc-*: move into cocPlugins coc is breaking out packages into top-level, but I don't know if we really need separate folders for each of these. Can just create another set to merge in. --- .../editors/vim/plugins/cocPlugins.nix | 36 +++++++++++++++++++ .../editors/vim/plugins/default.nix | 5 +++ .../editors/vim/plugins/overrides.nix | 32 ----------------- 3 files changed, 41 insertions(+), 32 deletions(-) create mode 100644 pkgs/applications/editors/vim/plugins/cocPlugins.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix new file mode 100644 index 000000000000..508f0452724b --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -0,0 +1,36 @@ +{ + buildVimPlugin, + coc-clangd, + coc-css, + coc-diagnostic, + coc-pyright, + coc-toml, +}: +final: prev: { + coc-clangd = buildVimPlugin { + inherit (coc-clangd) pname version meta; + src = "${coc-clangd}/lib/node_modules/coc-clangd"; + }; + + coc-css = buildVimPlugin { + inherit (coc-css) pname version meta; + src = "${coc-css}/lib/node_modules/coc-css"; + }; + + coc-diagnostic = buildVimPlugin { + inherit (coc-diagnostic) pname version meta; + src = "${coc-diagnostic}/lib/node_modules/coc-diagnostic"; + }; + + coc-pyright = buildVimPlugin { + pname = "coc-pyright"; + inherit (coc-pyright) version meta; + src = "${coc-pyright}/lib/node_modules/coc-pyright"; + }; + + coc-toml = buildVimPlugin { + pname = "coc-toml"; + inherit (coc-toml) version meta; + src = "${coc-toml}/lib/node_modules/coc-toml"; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/default.nix b/pkgs/applications/editors/vim/plugins/default.nix index d04632599e22..89bd49f36cc0 100644 --- a/pkgs/applications/editors/vim/plugins/default.nix +++ b/pkgs/applications/editors/vim/plugins/default.nix @@ -19,6 +19,10 @@ let initialPackages = self: { }; + cocPlugins = callPackage ./cocPlugins.nix { + inherit buildVimPlugin; + }; + luaPackagePlugins = callPackage ./luaPackagePlugins.nix { inherit (neovimUtils) buildNeovimPlugin; }; @@ -53,6 +57,7 @@ let in lib.pipe initialPackages [ (extends plugins) + (extends cocPlugins) (extends luaPackagePlugins) (extends nodePackagePlugins) (extends nonGeneratedPlugins) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index b29f7da51709..5a5a60e95d24 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -16,11 +16,6 @@ mkYarnModules, python3, # Misc dependencies - coc-clangd, - coc-css, - coc-diagnostic, - coc-pyright, - coc-toml, code-minimap, dasht, deno, @@ -611,33 +606,6 @@ in ]; }; - coc-clangd = buildVimPlugin { - inherit (coc-clangd) pname version meta; - src = "${coc-clangd}/lib/node_modules/coc-clangd"; - }; - - coc-css = buildVimPlugin { - inherit (coc-css) pname version meta; - src = "${coc-css}/lib/node_modules/coc-css"; - }; - - coc-diagnostic = buildVimPlugin { - inherit (coc-diagnostic) pname version meta; - src = "${coc-diagnostic}/lib/node_modules/coc-diagnostic"; - }; - - coc-pyright = buildVimPlugin { - pname = "coc-pyright"; - inherit (coc-pyright) version meta; - src = "${coc-pyright}/lib/node_modules/coc-pyright"; - }; - - coc-toml = buildVimPlugin { - pname = "coc-toml"; - inherit (coc-toml) version meta; - src = "${coc-toml}/lib/node_modules/coc-toml"; - }; - codecompanion-nvim = super.codecompanion-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; nvimSkipModule = [ From c7e23358d400b3405e0b3852f33273adbbed0375 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 23 Mar 2025 21:17:17 -0500 Subject: [PATCH 41/61] vimPlugins: drop luaPackage overrides Attempt to remove overrides that provide dependencies that should be handled from the luaPackages derivation and buildNeovimPlugin. --- .../editors/vim/plugins/overrides.nix | 53 ------------------- 1 file changed, 53 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 5a5a60e95d24..ee3494b9962c 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1240,11 +1240,6 @@ in dependencies = [ self.plenary-nvim ]; }; - # NOTE: this overrides a luaPackages-based plugin - gitsigns-nvim = super.gitsigns-nvim.overrideAttrs { - dependencies = [ self.plenary-nvim ]; - }; - git-conflict-nvim = super.git-conflict-nvim.overrideAttrs { # TODO: Remove after next fixed version # https://github.com/akinsho/git-conflict.nvim/issues/103 @@ -1391,24 +1386,6 @@ in doInstallCheck = true; }; - # NOTE: this overrides a luaPackages-based plugin - image-nvim = super.image-nvim.overrideAttrs { - dependencies = with self; [ - nvim-treesitter - nvim-treesitter-parsers.markdown_inline - nvim-treesitter-parsers.norg - ]; - - # Add magick to package.path - patches = [ ./patches/image-nvim/magick.patch ]; - - postPatch = '' - substituteInPlace lua/image/magick.lua \ - --replace-fail @nix_magick@ ${luajitPackages.magick} - ''; - - }; - indent-blankline-nvim = super.indent-blankline-nvim.overrideAttrs { # Meta file nvimSkipModule = "ibl.config.types"; @@ -1658,11 +1635,6 @@ in dependencies = [ self.lualine-nvim ]; }; - # NOTE: this overrides a luaPackages-based plugin - luasnip = super.luasnip.overrideAttrs { - dependencies = [ luaPackages.jsregexp ]; - }; - luasnip-latex-snippets-nvim = super.luasnip-latex-snippets-nvim.overrideAttrs { dependencies = [ self.luasnip ]; # E5108: /luasnip-latex-snippets/luasnippets/tex/utils/init.lua:3: module 'luasnip-latex-snippets.luasnippets.utils.conditions' not found: @@ -1911,14 +1883,6 @@ in ]; }; - # NOTE: this overrides a luaPackages-based plugin - neotest = super.neotest.overrideAttrs { - dependencies = with self; [ - nvim-nio - plenary-nvim - ]; - }; - neotest-bash = super.neotest-bash.overrideAttrs { dependencies = with self; [ neotest @@ -2802,18 +2766,6 @@ in dependencies = [ self.plenary-nvim ]; }; - # needs "http" and "json" treesitter grammars too - # NOTE: this overrides a luaPackages-based plugin - rest-nvim = super.rest-nvim.overrideAttrs { - dependencies = with self; [ - plenary-nvim - (nvim-treesitter.withPlugins (p: [ - p.http - p.json - ])) - ]; - }; - rocks-nvim = (neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rocks-nvim; @@ -3189,11 +3141,6 @@ in dependencies = [ self.plenary-nvim ]; }; - # NOTE: this overrides a luaPackages-based plugin - telescope-nvim = super.telescope-nvim.overrideAttrs { - dependencies = [ self.plenary-nvim ]; - }; - telescope-smart-history-nvim = super.telescope-smart-history-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim From f9af047fc043b3ffd0b12c3eab20b2c04a41b812 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 23 Mar 2025 21:19:39 -0500 Subject: [PATCH 42/61] vimPlugins.plenary-nvim: migrate to luaPackagePlugins --- pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix | 1 + pkgs/applications/editors/vim/plugins/overrides.nix | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix b/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix index b8346defa922..b130c56caa88 100644 --- a/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix @@ -30,6 +30,7 @@ let "oil-nvim" "orgmode" "papis-nvim" + "plenary-nvim" "rest-nvim" "rocks-config-nvim" "rtp-nvim" diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index ee3494b9962c..3828f15ababd 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2664,11 +2664,6 @@ in ]; }; - plenary-nvim = neovimUtils.buildNeovimPlugin { - luaAttr = luaPackages.plenary-nvim; - runtimeDeps = [ curl ]; - }; - poimandres-nvim = super.poimandres-nvim.overrideAttrs { # Optional treesitter support nvimSkipModule = "poimandres.highlights"; From 06422e6363c21dd5cf37edf273aab10af6f5f41f Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 24 Mar 2025 21:44:50 -0500 Subject: [PATCH 43/61] vimPlugins.bitbake-vim: migrate to new repo and move Move to actively maintained repo and move to non-generated since plugin updater can't handle sub directories. --- .../non-generated/bitbake-vim/default.nix | 22 +++++++++++++++++++ .../editors/vim/plugins/overrides.nix | 13 ----------- 2 files changed, 22 insertions(+), 13 deletions(-) create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/bitbake-vim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/non-generated/bitbake-vim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/bitbake-vim/default.nix new file mode 100644 index 000000000000..f9691b378df8 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/bitbake-vim/default.nix @@ -0,0 +1,22 @@ +{ + vimUtils, + fetchFromGitHub, + nix-update-script, +}: +vimUtils.buildVimPlugin { + pname = "bitbake-vim"; + version = "2025-03-24"; + + src = fetchFromGitHub { + owner = "openembedded"; + repo = "bitbake"; + rev = "8cc976e2792fdde3900729f3b09dd18ab640b5e8"; + sha256 = "12k48zhd9bh3b8xjpang2xj14nhyla2p55r1is3m25wkqys10p9c"; + }; + + sourceRoot = "source/contrib/vim"; + + meta.homepage = "https://github.com/openembedded/bitbake/"; + + passthru.updateScript = nix-update-script { }; +} diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 3828f15ababd..4c4790a6c249 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -277,19 +277,6 @@ in ]; }; - # The GitHub repository returns 404, which breaks the update script - bitbake-vim = buildVimPlugin { - pname = "bitbake.vim"; - version = "2021-02-06"; - src = fetchFromGitHub { - owner = "sblumentritt"; - repo = "bitbake.vim"; - rev = "faddca1e8768b10c80ee85221fb51a560df5ba45"; - sha256 = "1hfly2vxhhvjdiwgfz58hr3523kf9z71i78vk168n3kdqp5vkwrp"; - }; - meta.homepage = "https://github.com/sblumentritt/bitbake.vim/"; - }; - blink-cmp-copilot = super.blink-cmp-copilot.overrideAttrs { dependencies = [ self.copilot-lua ]; }; From fb5e34fb3976a8a3dbef502e2863c23619a1f596 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Thu, 9 Jan 2025 20:10:24 +0900 Subject: [PATCH 44/61] nixos/cryptpad: fix service with nodejs 22.11 (for real) The previous fix had only been tested locally through a runtime edit of the service, and the order in which @chown had been re-added was different so commit cf498c1a61b3 ("nixos/cryptpad: fix service with nodejs 22.11") did not actually fix the issue. This properly orders @chown after @privileged so the rule is respected, and also properly denies with EPERM instead of allowing the chown family of syscalls: this will properly prevent seccomp from killing nodejs while still disallowing fchown() Fixes https://github.com/NixOS/nixpkgs/issues/370717 --- nixos/modules/services/web-apps/cryptpad.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/cryptpad.nix b/nixos/modules/services/web-apps/cryptpad.nix index a5f142553495..0ec6df1419bb 100644 --- a/nixos/modules/services/web-apps/cryptpad.nix +++ b/nixos/modules/services/web-apps/cryptpad.nix @@ -195,10 +195,12 @@ in SystemCallFilter = [ "@pkey" "@system-service" - "@chown" + # /!\ order matters: @privileged contains @chown, so we need + # @privileged negated before we re-list @chown for libuv copy + "~@privileged" + "~@chown:EPERM" "~@keyring" "~@memlock" - "~@privileged" "~@resources" "~@setuid" "~@timer" From f079f3e1d895f186b97acd86ee1abc4446c09ed5 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Tue, 25 Mar 2025 14:37:57 +0100 Subject: [PATCH 45/61] lipl: 0.1.3 -> 0.1.3-unstable-2022-08-23, use fetchCargoVendor --- pkgs/by-name/li/lipl/Cargo.lock | 308 ------------------------------- pkgs/by-name/li/lipl/package.nix | 16 +- 2 files changed, 6 insertions(+), 318 deletions(-) delete mode 100644 pkgs/by-name/li/lipl/Cargo.lock diff --git a/pkgs/by-name/li/lipl/Cargo.lock b/pkgs/by-name/li/lipl/Cargo.lock deleted file mode 100644 index f87ac4ead5c8..000000000000 --- a/pkgs/by-name/li/lipl/Cargo.lock +++ /dev/null @@ -1,308 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "atty" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "autocfg" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "cassowary" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "clap" -version = "2.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "cmd_lib" -version = "0.7.8" -source = "git+https://github.com/rust-shell-script/rust_cmd_lib?rev=9f9cba4b36cdff5f7d7495d998923f1b378cb9c2#9f9cba4b36cdff5f7d7495d998923f1b378cb9c2" - -[[package]] -name = "either" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "heck" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "itertools" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "libc" -version = "0.2.65" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "linreg" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "lipl" -version = "0.1.0" -dependencies = [ - "cmd_lib 0.7.8 (git+https://github.com/rust-shell-script/rust_cmd_lib?rev=9f9cba4b36cdff5f7d7495d998923f1b378cb9c2)", - "linreg 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "structopt 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "termion 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "tui 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "log" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "num-traits" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "numtoa" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "proc-macro-error" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "proc-macro2" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "quote" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "redox_syscall" -version = "0.1.56" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "redox_termios" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "structopt" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "structopt-derive 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "structopt-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "syn" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "termion" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "tui" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cassowary 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "itertools 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "termion 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "unicode-segmentation" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "unicode-width" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "unicode-xid" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "vec_map" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "winapi" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[metadata] -"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" -"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" -"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -"checksum cassowary 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" -"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" -"checksum cmd_lib 0.7.8 (git+https://github.com/rust-shell-script/rust_cmd_lib?rev=9f9cba4b36cdff5f7d7495d998923f1b378cb9c2)" = "" -"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" -"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" -"checksum itertools 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "87fa75c9dea7b07be3138c49abbb83fd4bea199b5cdc76f9804458edc5da0d6e" -"checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8" -"checksum linreg 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d85303c06c6c77a71a07c50c98e8fceda7ec120d6b2ee9e050876dc59e2e3dbe" -"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -"checksum num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c81ffc11c212fa327657cb19dd85eb7419e163b5b076bede2bdb5c974c07e4" -"checksum numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" -"checksum proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aeccfe4d5d8ea175d5f0e4a2ad0637e0f4121d63bd99d356fb1f39ab2e7c6097" -"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" -"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" -"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" -"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" -"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -"checksum structopt 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d4f66a4c0ddf7aee4677995697366de0749b0139057342eccbb609b12d0affc" -"checksum structopt-derive 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8fe0c13e476b4e21ff7f5c4ace3818b6d7bdc16897c31c73862471bc1663acae" -"checksum syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0e7bedb3320d0f3035594b0b723c8a28d7d336a3eda3881db79e61d676fb644c" -"checksum termion 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a8fb22f7cde82c8220e5aeacb3258ed7ce996142c77cba193f203515e26c330" -"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -"checksum tui 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "73b422ff4986065d33272b587907654f918a3fe8702786a8110bf68dede0d8ee" -"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" -"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20" -"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" -"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" -"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" -"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/by-name/li/lipl/package.nix b/pkgs/by-name/li/lipl/package.nix index c039056cf498..cca2898cc70a 100644 --- a/pkgs/by-name/li/lipl/package.nix +++ b/pkgs/by-name/li/lipl/package.nix @@ -4,23 +4,19 @@ fetchFromGitHub, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "lipl"; - version = "0.1.3"; + version = "0.1.3-unstable-2022-08-23"; src = fetchFromGitHub { owner = "yxdunc"; repo = "lipl"; - rev = "v${version}"; - hash = "sha256-ZeYz9g06vMsOk3YDmy0I+8e6BtLfweXqVH5uRt+mtes="; + rev = "6999da6de05abb5c9c4f6875debff6e3fd71ee79"; + hash = "sha256-KN0yKhtDtlzELNUzR9fmP2mDPBJe1N+tawzI4FX/HSU="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "cmd_lib-0.7.8" = "sha256-FyJZkxhKwHyGEmeLZfcvLe1D6h7XY5tvsHbANQk+D+4="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-TA/EP2CJceKNzPBV8K24Pyly1oj3tyIkpdPZJ9Zh81E="; meta = with lib; { description = "Command line tool to analyse the output over time of custom shell commands"; From a4006e4970b3476eb02c5ce36343d144da4fe34b Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 25 Mar 2025 14:58:02 +0100 Subject: [PATCH 46/61] Revert "nixos/postgresql: add docs about procedural languages" This reverts commit 0bc099abd6989a3053b930c5657494329c048749. --- nixos/doc/manual/redirects.json | 3 -- .../modules/services/databases/postgresql.md | 31 ------------------- 2 files changed, 34 deletions(-) diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index 11c6c5813114..29f7f9d51996 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -1253,9 +1253,6 @@ "module-services-postgres-plugins": [ "index.html#module-services-postgres-plugins" ], - "module-services-postgres-pls": [ - "index.html#module-services-postgres-pls" - ], "module-services-postgres-jit": [ "index.html#module-services-postgres-jit" ], diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md index 957c5e40a628..08461547a367 100644 --- a/nixos/modules/services/databases/postgresql.md +++ b/nixos/modules/services/databases/postgresql.md @@ -327,37 +327,6 @@ self: super: { } ``` -## Procedural Languages {#module-services-postgres-pls} - -PostgreSQL ships the additional procedural languages PL/Perl, PL/Python and PL/Tcl as extensions. -They are packaged as plugins and can be made available in the same way as external extensions: -```nix -{ - services.postgresql.extensions = ps: with ps; [ - plperl - plpython3 - pltcl - ]; -} -``` - -Each procedural language plugin provides a `.withPackages` helper to make language specific packages available at run-time. - -For example, to make `python3Packages.base58` available: -```nix -{ - services.postgresql.extensions = pgps: with pgps; [ - (plpython3.withPackages (pyps: with pyps; [ base58 ])) - ]; -} -``` - -This currently works for: -- `plperl` by re-using `perl.withPackages` -- `plpython3` by re-using `python3.withPackages` -- `plr` by exposing `rPackages` -- `pltcl` by exposing `tclPackages` - ## JIT (Just-In-Time compilation) {#module-services-postgres-jit} [JIT](https://www.postgresql.org/docs/current/jit-reason.html)-support in the PostgreSQL package From 2aacebcef3a7340793d298621acb1ac942c0da06 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 25 Mar 2025 09:41:00 -0500 Subject: [PATCH 47/61] catppuccin-sddm-corners: 0-unstable-2024-05-07 -> 0-unstable-2025-03-25 --- .../ca/catppuccin-sddm-corners/package.nix | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ca/catppuccin-sddm-corners/package.nix b/pkgs/by-name/ca/catppuccin-sddm-corners/package.nix index 1665eeffc02e..826b9b8c9d20 100644 --- a/pkgs/by-name/ca/catppuccin-sddm-corners/package.nix +++ b/pkgs/by-name/ca/catppuccin-sddm-corners/package.nix @@ -2,38 +2,32 @@ lib, stdenvNoCC, fetchFromGitHub, - libsForQt5, unstableGitUpdater, + qt6, }: stdenvNoCC.mkDerivation { pname = "catppuccin-sddm-corners"; - version = "0-unstable-2024-05-07"; + version = "0-unstable-2025-03-25"; src = fetchFromGitHub { owner = "khaneliman"; repo = "catppuccin-sddm-corners"; - rev = "aca5af5ce0c9dff56e947938697dec40ea101e3e"; - hash = "sha256-xtcNcjNQSG7SwlNw/EkAU93wFaku+cE1/r6c8c4FrBg="; + rev = "10831dea7298bd1c3262a7f48417b5af1b92ed99"; + hash = "sha256-nQImL5eDMENNDCXEqgrL2eszWXtBpbVlzjMxNdpxZlQ="; }; dontConfigure = true; dontBuild = true; dontWrapQtApps = true; - propagatedBuildInputs = with libsForQt5.qt5; [ - qtgraphicaleffects - qtquickcontrols2 + propagatedUserEnvPkgs = with qt6; [ + qt5compat + qtwayland + qtquick3d qtsvg ]; - postFixup = '' - mkdir -p $out/nix-support - echo ${libsForQt5.qt5.qtgraphicaleffects} >> $out/nix-support/propagated-user-env-packages - echo ${libsForQt5.qt5.qtquickcontrols2} >> $out/nix-support/propagated-user-env-packages - echo ${libsForQt5.qt5.qtsvg} >> $out/nix-support/propagated-user-env-packages - ''; - installPhase = '' runHook preInstall From e80d25108b85ca574bdd81d81ae7f9d5c31871cc Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 25 Mar 2025 09:43:08 -0500 Subject: [PATCH 48/61] catppuccin-sddm-corners: unstableGitUpdater -> nix-update-script --- pkgs/by-name/ca/catppuccin-sddm-corners/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/catppuccin-sddm-corners/package.nix b/pkgs/by-name/ca/catppuccin-sddm-corners/package.nix index 826b9b8c9d20..0b8550de939f 100644 --- a/pkgs/by-name/ca/catppuccin-sddm-corners/package.nix +++ b/pkgs/by-name/ca/catppuccin-sddm-corners/package.nix @@ -2,7 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, - unstableGitUpdater, + nix-update-script, qt6, }: @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation { runHook postInstall ''; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; meta = { description = "Soothing pastel theme for SDDM based on corners theme"; From 214346fdfad2f0929ca0c95ce7cf17c9602b913a Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 25 Mar 2025 18:11:07 +0300 Subject: [PATCH 49/61] home-assistant-custom-components.yassi: drop It doesn't work with latest pysmartthings, and upstream will have native support for these devices in 2025.4. --- .../custom-components/yassi/package.nix | 29 ------------------- 1 file changed, 29 deletions(-) delete mode 100644 pkgs/servers/home-assistant/custom-components/yassi/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/yassi/package.nix b/pkgs/servers/home-assistant/custom-components/yassi/package.nix deleted file mode 100644 index 50a81b463dbc..000000000000 --- a/pkgs/servers/home-assistant/custom-components/yassi/package.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - lib, - buildHomeAssistantComponent, - fetchFromGitHub, - pysmartthings, -}: - -buildHomeAssistantComponent rec { - owner = "samuelspagl"; - domain = "samsung_soundbar"; - version = "0.4.1"; - - src = fetchFromGitHub { - inherit owner; - repo = "ha_samsung_soundbar"; - rev = version; - hash = "sha256-uhyUQebAx4g1PT/urbyx8EZNFE9vIY0bUAKmgCwY3aQ="; - }; - - dependencies = [ pysmartthings ]; - - meta = with lib; { - description = "HomeAssistant integration for Samsung Soundbars"; - homepage = "https://ha-samsung-soundbar.vercel.app/"; - changelog = "https://github.com/samuelspagl/ha_samsung_soundbar/releases/tag/${version}"; - maintainers = with maintainers; [ k900 ]; - license = licenses.mit; - }; -} From 7ccc496e49013a5633746e5f6744b96b5b61e9a8 Mon Sep 17 00:00:00 2001 From: Masum Reza <50095635+JohnRTitor@users.noreply.github.com> Date: Tue, 25 Mar 2025 20:54:45 +0530 Subject: [PATCH 50/61] =?UTF-8?q?Revert=20"vscode-extensions.ms-python.pyt?= =?UTF-8?q?hon:=202025.3.2025031001=20->=202024.15.2024=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b763e93a9510c2d511e0f1c2550907a3fa985607. --- .../editors/vscode/extensions/ms-python.python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix index 19f8a59e37ec..df96b37116c9 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix @@ -21,8 +21,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2024.15.2024091301"; - hash = "sha256-MB8Vq2rjO37yW3Zh+f8ek/yz0qT+ZYHn/JnF5ZA6CXQ="; + version = "2025.3.2025031001"; + hash = "sha256-uYz0WgFqbLohCEmT8ewYgvlFrVLuZr9OAiKnrbNup7U="; }; buildInputs = [ icu ]; From faa3ba8c02f82c036c7c8ec50cbb7b0e567d69e5 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 25 Mar 2025 09:05:40 -0500 Subject: [PATCH 51/61] bindle: Migrate to by-name --- .../bindle/default.nix => by-name/bi/bindle/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{servers/bindle/default.nix => by-name/bi/bindle/package.nix} (100%) diff --git a/pkgs/servers/bindle/default.nix b/pkgs/by-name/bi/bindle/package.nix similarity index 100% rename from pkgs/servers/bindle/default.nix rename to pkgs/by-name/bi/bindle/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69b69cea9e58..5abb40e15acb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -199,8 +199,6 @@ with pkgs; appimageupdate-qt = appimageupdate.override { withQtUI = true; }; - bindle = callPackage ../servers/bindle { }; - stripJavaArchivesHook = makeSetupHook { name = "strip-java-archives-hook"; propagatedBuildInputs = [ strip-nondeterminism ]; From 950324a23eafb1b9787cfed00b030d57f061573e Mon Sep 17 00:00:00 2001 From: Nathan Fish Date: Wed, 14 Jun 2023 17:25:23 +0200 Subject: [PATCH 52/61] nixos/ipfs-cluster: init Co-authored-by: Sorki --- .../manual/release-notes/rl-2505.section.md | 2 + nixos/modules/module-list.nix | 1 + .../network-filesystems/ipfs-cluster.nix | 126 ++++++++++++++++++ 3 files changed, 129 insertions(+) create mode 100644 nixos/modules/services/network-filesystems/ipfs-cluster.nix diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index f9cc4337af7e..55d6f658eea4 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -204,6 +204,8 @@ - [Pareto Security](https://paretosecurity.com/) is an alternative to corporate compliance solutions for companies that care about security but know it doesn't have to be invasive. Available as [services.paretosecurity](#opt-services.paretosecurity.enable) +- [ipfs-cluster](https://ipfscluster.io/), Pinset orchestration for IPFS. Available as [services.ipfs-cluster](#opt-services.ipfs-cluster.enable) + ## Backward Incompatibilities {#sec-release-25.05-incompatibilities} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 133ca8ef8d98..8ae97b71a986 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1018,6 +1018,7 @@ ./services/network-filesystems/kubo.nix ./services/network-filesystems/litestream/default.nix ./services/network-filesystems/moosefs.nix + ./services/network-filesystems/ipfs-cluster.nix ./services/network-filesystems/netatalk.nix ./services/network-filesystems/nfsd.nix ./services/network-filesystems/openafs/client.nix diff --git a/nixos/modules/services/network-filesystems/ipfs-cluster.nix b/nixos/modules/services/network-filesystems/ipfs-cluster.nix new file mode 100644 index 000000000000..4e7db74930cb --- /dev/null +++ b/nixos/modules/services/network-filesystems/ipfs-cluster.nix @@ -0,0 +1,126 @@ +{ + config, + lib, + pkgs, + options, + ... +}: +let + cfg = config.services.ipfs-cluster; + + # secret is by envvar, not flag + initFlags = toString [ + (lib.optionalString (cfg.initPeers != [ ]) "--peers") + (lib.strings.concatStringsSep "," cfg.initPeers) + ]; +in +{ + options = { + + services.ipfs-cluster = { + + enable = lib.mkEnableOption "Pinset orchestration for IPFS - requires ipfs daemon to be useful"; + + consensus = lib.mkOption { + type = lib.types.enum [ + "raft" + "crdt" + ]; + description = "Consensus protocol - 'raft' or 'crdt'. https://cluster.ipfs.io/documentation/guides/consensus/"; + }; + + dataDir = lib.mkOption { + type = lib.types.str; + default = "/var/lib/ipfs-cluster"; + description = "The data dir for ipfs-cluster."; + }; + + initPeers = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = "Peer addresses to initialize with on first run."; + }; + + openSwarmPort = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Open swarm port, secured by the cluster secret. This does not expose the API or proxy. https://cluster.ipfs.io/documentation/guides/security/"; + }; + + secretFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = '' + File containing the cluster secret in the format of EnvironmentFile as described by + {manpage}`systemd.exec(5)`. For example: + + CLUSTER_SECRET=... + + + If null, a new secret will be generated on first run and stored in the data directory. + A secret in the correct format can also be generated by: `openssl rand -hex 32` + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = cfg.enable -> config.services.kubo.enable; + message = "ipfs-cluster requires ipfs - configure and enable services.kubo"; + } + ]; + + environment.systemPackages = [ pkgs.ipfs-cluster ]; + + systemd.tmpfiles.rules = [ + "d '${cfg.dataDir}' - ${config.services.kubo.user} ${config.services.kubo.group} - -" + ]; + + systemd.services.ipfs-cluster-init = { + path = [ + "/run/wrappers" + pkgs.ipfs-cluster + ]; + environment.IPFS_CLUSTER_PATH = cfg.dataDir; + wantedBy = [ "default.target" ]; + + serviceConfig = { + ExecStart = [ + "${lib.getExe' pkgs.ipfs-cluster "ipfs-cluster-service"} init --consensus ${cfg.consensus} ${initFlags}" + ]; + Type = "oneshot"; + RemainAfterExit = true; + User = config.services.kubo.user; + Group = config.services.kubo.group; + EnvironmentFile = lib.mkIf (cfg.secretFile != null) cfg.secretFile; + }; + # only run once (= when the data directory is empty) + unitConfig.ConditionDirectoryNotEmpty = "!${cfg.dataDir}"; + }; + + systemd.services.ipfs-cluster = { + environment.IPFS_CLUSTER_PATH = cfg.dataDir; + wantedBy = [ "multi-user.target" ]; + + wants = [ "ipfs-cluster-init.service" ]; + after = [ "ipfs-cluster-init.service" ]; + + serviceConfig = { + Type = "notify"; + ExecStart = [ "${lib.getExe' pkgs.ipfs-cluster "ipfs-cluster-service"} daemon" ]; + User = config.services.kubo.user; + Group = config.services.kubo.group; + }; + }; + + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openSwarmPort [ 9096 ]; + }; + + meta = { + maintainers = with lib.maintainers; [ + sorki + ]; + }; +} From 7d30c40939dc11b8e93407cdb94c13f4d21d771a Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 25 Mar 2025 17:00:45 +0100 Subject: [PATCH 53/61] treewide: migrate packages to pkgs/by-name, again --- .../86box => by-name/_8/_86Box}/darwin.patch | 0 .../_8/_86Box/package.nix} | 0 .../86box => by-name/_8/_86Box}/update.sh | 0 .../af/afsctool/package.nix} | 0 .../an/anime-downloader/package.nix} | 0 .../an}/anime-downloader/update.sh | 0 .../aw/awsbck/package.nix} | 0 .../az/azure-static-sites-client/package.nix} | 0 .../az}/azure-static-sites-client/update.sh | 0 .../azure-static-sites-client/versions.json | 0 .../bi}/binserve/Cargo.lock | 0 .../bi/binserve/package.nix} | 0 .../ca/cacert/package.nix} | 0 .../misc => by-name/ca}/cacert/setup-hook.sh | 0 .../ca}/cacert/test-cert-file.crt | 0 .../misc => by-name/ca}/cacert/update.sh | 0 .../ca/cargo-cache/package.nix} | 0 .../ca/cargo-outdated/package.nix} | 0 .../ca/cargo-zigbuild/package.nix} | 0 .../cc/ccls/package.nix} | 0 .../cc}/ccls/wrapper | 0 .../cd/cdparanoiaIII}/configure.patch | 0 .../cdparanoiaIII}/fix_private_keyword.patch | 0 .../cd/cdparanoiaIII/package.nix} | 0 .../cd/cdparanoiaIII}/utils.patch | 0 .../CGAL => by-name/cg/cgal}/cgal_path.patch | 0 .../cg/cgal/package.nix} | 0 .../cr/crosvm/package.nix} | 0 .../cy/cypress/package.nix} | 0 .../web => by-name/cy}/cypress/update.sh | 0 .../di/didyoumean/package.nix} | 0 .../do}/dovecot/load-extended-modules.patch | 0 .../do/dovecot/package.nix} | 0 .../do}/dovecot/timespec.patch | 0 .../du/duckdb/package.nix} | 0 .../libraries => by-name/du}/duckdb/update.sh | 0 .../du}/duckdb/versions.json | 0 .../du}/duti/buildConfigure.patch | 0 .../du/duti/package.nix} | 0 .../dy/dynein/package.nix} | 0 .../misc => by-name/es}/esphome/dashboard.nix | 0 .../es/esphome/package.nix} | 0 .../misc => by-name/es}/esphome/update.nix | 0 .../evolution-ews/hardcode-gsettings.patch | 0 .../ev/evolution-ews/package.nix} | 0 .../fa/fable/package.nix} | 0 .../fn/fnm/package.nix} | 0 .../ge/genpass/package.nix} | 0 .../gf/gfold/package.nix} | 0 .../gh/gh-cal/package.nix} | 0 .../gi/git-absorb/package.nix} | 0 .../gi/git-branchless/package.nix} | 0 .../gi/git-cinnabar/package.nix} | 0 .../gi/git-cliff/package.nix} | 0 .../gi/git-credential-keepassxc/package.nix} | 0 .../gi/git-remote-codecommit/package.nix} | 0 .../gi/git-trim/package.nix} | 0 .../gi/gitoxide/package.nix} | 0 .../gp/gpac/package.nix} | 0 .../gp}/gpt2tc/0001-add-python-shebang.patch | 0 .../gp/gpt2tc/package.nix} | 0 .../gr/gretl/package.nix} | 0 .../default.nix => by-name/gx/gx/package.nix} | 0 .../gy}/gyroflow/gyroflow-mime.xml | 0 .../gy}/gyroflow/gyroflow-open.sh | 0 .../gy/gyroflow/package.nix} | 0 .../ho/honggfuzz/package.nix} | 0 .../hp/hpx/package.nix} | 0 .../ht/http-prompt/package.nix} | 0 .../ir/irssi/package.nix} | 0 .../is/ispc/package.nix} | 0 .../jb/jboss/package.nix} | 0 .../ji/jibri/package.nix} | 0 pkgs/{servers => by-name/ji}/jibri/update.sh | 0 .../ji}/jicofo/logging.properties-journal | 0 .../ji/jicofo/package.nix} | 0 pkgs/{servers => by-name/ji}/jicofo/update.sh | 0 .../ji/jitsi-meet-prosody/package.nix} | 0 .../ji}/jitsi-meet-prosody/update.sh | 0 .../ji/jitsi-meet/package.nix} | 0 .../ji}/jitsi-meet/update.sh | 0 .../logging.properties-journal | 0 .../ji/jitsi-videobridge/package.nix} | 0 .../ji}/jitsi-videobridge/update.sh | 0 .../js/jsonwatch/package.nix} | 0 .../li/libgcrypt/package.nix} | 0 .../li}/libnma/hardcode-gsettings.patch | 0 .../li/libnma/package.nix} | 0 .../li/libopenmpt/package.nix} | 0 .../audio => by-name/li}/libopenmpt/update.sh | 0 .../li}/libproxy/hardcode-gsettings.patch | 0 .../li/libproxy/package.nix} | 0 .../libproxy/skip-gsettings-detection.patch | 0 .../li/lightburn/package.nix} | 0 .../li/linux-firmware/package.nix} | 0 .../li}/linux-firmware/update.sh | 0 .../ly/lychee/package.nix} | 0 .../ly}/lychee/tests/fail-emptyDirectory.nix | 0 .../ly}/lychee/tests/fail.nix | 0 .../ly}/lychee/tests/network.nix | 0 .../ly}/lychee/tests/ok.nix | 0 .../ma/maigret/package.nix} | 0 .../tools => by-name/ma}/marksman/deps.json | 0 .../ma/marksman/package.nix} | 0 .../tools => by-name/ma}/marksman/update.sh | 0 .../matrix-appservice-discord/package.json | 0 .../ma/matrix-appservice-discord/package.nix} | 0 .../ma}/matrix-appservice-discord/pin.json | 0 .../ma}/matrix-appservice-discord/update.sh | 0 .../ma}/matrix-sdk-crypto-nodejs/Cargo.lock | 0 .../ma/matrix-sdk-crypto-nodejs/package.nix} | 0 .../me}/meilisearch/Cargo.lock | 0 .../me/meilisearch/package.nix} | 0 .../mi/minecraft/package.nix} | 0 .../{games => by-name/mi}/minecraft/update.sh | 0 .../mt}/mtools/UNUSED-darwin.patch | 0 .../mt/mtools/package.nix} | 0 .../mt}/mtools/update.sh | 0 .../mx/mxnet/package.nix} | 0 .../na/nano/package.nix} | 0 .../na}/nano/test-with-expect.nix | 0 .../nb/nbstripout/package.nix} | 0 .../nd/ndi/package.nix} | 0 .../libraries => by-name/nd}/ndi/update.py | 0 .../libraries => by-name/nd}/ndi/version.json | 0 .../ne/netpbm/package.nix} | 0 .../graphics => by-name/ne}/netpbm/update.sh | 0 .../nix-output-monitor/generated-package.nix | 0 .../ni/nix-output-monitor/package.nix} | 0 .../ni}/nix-output-monitor/update.sh | 0 .../no/nominatim/package.nix} | 0 .../nt/ntfy/package.nix} | 0 .../misc => by-name/nt}/ntfy/webpush.nix | 0 .../on/onetun/package.nix} | 0 .../audio => by-name/op}/openutau/deps.json | 0 .../op/openutau/package.nix} | 0 .../audio => by-name/op}/openutau/update.sh | 0 .../os}/osquery/Remove-git-reset.patch | 0 .../system => by-name/os}/osquery/info.json | 0 .../os/osquery/package.nix} | 0 .../os}/osquery/toolchain-bin.nix | 0 .../system => by-name/os}/osquery/update.py | 0 .../pe/perseus-cli/package.nix} | 0 .../po/portaudio/package.nix} | 0 .../pr/prisma-engines/package.nix} | 0 .../pr/protoc-gen-dart/package.nix} | 0 .../pr}/protoc-gen-dart/pubspec.lock.json | 0 .../pr}/protoc-gen-dart/update.sh | 0 .../py/pymol/package.nix} | 0 .../py}/pymol/script-already-exists.patch | 0 .../qt/qtox/package.nix} | 0 .../ru/ruplacer/package.nix} | 0 .../libraries => by-name/ru}/rure/Cargo.lock | 0 .../ru/rure/package.nix} | 0 .../libraries => by-name/ru}/rure/pin.json | 0 .../libraries => by-name/ru}/rure/update.sh | 0 .../sa/sauce-connect/package.nix} | 0 .../sa}/sauce-connect/update.sh | 0 .../sc/scala-cli/package.nix} | 0 .../sc}/scala-cli/sources.json | 0 .../sc}/scala-cli/update.nix | 0 .../sh/shadowsocks-rust/package.nix} | 0 .../sh/sharedown/package.nix} | 0 .../misc => by-name/sh}/sharedown/update.sh | 0 .../misc => by-name/sh}/sharedown/yarn.lock | 0 .../sp}/space-station-14-launcher/deps.json | 0 .../sp/space-station-14-launcher/package.nix} | 0 .../space-station-14-launcher.nix | 0 .../sp}/space-station-14-launcher/update.sh | 0 .../ss/ssdfs-utils/package.nix} | 0 .../ss}/ssdfs-utils/update.sh | 0 .../st/standardnotes/package.nix} | 0 .../st}/standardnotes/src.json | 0 .../st}/standardnotes/update.nix | 0 .../st/stargazer/package.nix} | 0 .../ta/tabnine/package.nix} | 0 .../tools => by-name/ta}/tabnine/sources.json | 0 .../tools => by-name/ta}/tabnine/update.sh | 0 .../ta}/tandoor-recipes/common.nix | 0 .../ta}/tandoor-recipes/frontend.nix | 0 .../ta/tandoor-recipes/package.nix} | 0 .../ta}/tandoor-recipes/pytest-xdist.patch | 0 .../ta}/tandoor-recipes/update.sh | 0 .../ti}/tinygo/0001-GNUmakefile.patch | 0 .../ti/tinygo/package.nix} | 0 .../to/touchosc/package.nix} | 0 .../audio => by-name/to}/touchosc/update.sh | 0 .../tr/trackma/package.nix} | 0 .../misc => by-name/tr}/trackma/update.sh | 0 .../tr/treesheets/package.nix} | 0 .../tr/tremotesf/package.nix} | 0 .../tr/trenchbroom/package.nix} | 0 .../tt/tt-rss/package.nix} | 0 .../ty/typesense/package.nix} | 0 .../ty}/typesense/sources.json | 0 .../search => by-name/ty}/typesense/update.sh | 0 .../uh}/uhd/no-adapter-tests.patch | 0 .../uh/uhd/package.nix} | 0 .../radio => by-name/uh}/uhd/update.sh | 0 .../un/unstructured-api/package.nix} | 0 .../vm/vmware-horizon-client/package.nix} | 0 .../vm}/vmware-horizon-client/update.sh | 0 .../vr/vrc-get/package.nix} | 0 .../vu/vulkan-cts/package.nix} | 0 .../vu}/vulkan-cts/sources.nix | 0 .../vu}/vulkan-cts/update.sh | 0 .../vu}/vulkan-cts/vk-cts-sources.py | 0 .../vu/vulkan-headers/package.nix} | 0 .../vu}/vulkan-headers/update.sh | 0 .../wi/wiki-js/package.nix} | 0 .../web-apps => by-name/wi}/wiki-js/update.sh | 0 .../wi/wireguard-tools/package.nix} | 0 .../wi}/wireguard-tools/update.sh | 0 .../wo/worker-build/package.nix} | 0 .../xa/xaos/package.nix} | 0 .../xd}/xdp-tools/emacs-30.patch | 0 .../xd/xdp-tools/package.nix} | 0 .../xr}/xrdp/dynamic_config.patch | 0 .../xr/xrdp/package.nix} | 0 .../xt/xtreemfs/package.nix} | 0 .../ya}/yarn-lock-converter/package-lock.json | 0 .../ya/yarn-lock-converter/package.nix} | 0 .../ya}/yarn-lock-converter/source.json | 0 .../ya}/yarn-lock-converter/update.sh | 0 .../zs/zsh/package.nix} | 0 .../zs}/zsh/tz_completion.patch | 0 pkgs/top-level/all-packages.nix | 229 ------------------ 227 files changed, 229 deletions(-) rename pkgs/{applications/emulators/86box => by-name/_8/_86Box}/darwin.patch (100%) rename pkgs/{applications/emulators/86box/default.nix => by-name/_8/_86Box/package.nix} (100%) rename pkgs/{applications/emulators/86box => by-name/_8/_86Box}/update.sh (100%) rename pkgs/{tools/filesystems/afsctool/default.nix => by-name/af/afsctool/package.nix} (100%) rename pkgs/{applications/video/anime-downloader/default.nix => by-name/an/anime-downloader/package.nix} (100%) rename pkgs/{applications/video => by-name/an}/anime-downloader/update.sh (100%) rename pkgs/{tools/backup/awsbck/default.nix => by-name/aw/awsbck/package.nix} (100%) rename pkgs/{development/tools/azure-static-sites-client/default.nix => by-name/az/azure-static-sites-client/package.nix} (100%) rename pkgs/{development/tools => by-name/az}/azure-static-sites-client/update.sh (100%) rename pkgs/{development/tools => by-name/az}/azure-static-sites-client/versions.json (100%) rename pkgs/{servers => by-name/bi}/binserve/Cargo.lock (100%) rename pkgs/{servers/binserve/default.nix => by-name/bi/binserve/package.nix} (100%) rename pkgs/{data/misc/cacert/default.nix => by-name/ca/cacert/package.nix} (100%) rename pkgs/{data/misc => by-name/ca}/cacert/setup-hook.sh (100%) rename pkgs/{data/misc => by-name/ca}/cacert/test-cert-file.crt (100%) rename pkgs/{data/misc => by-name/ca}/cacert/update.sh (100%) rename pkgs/{development/tools/rust/cargo-cache/default.nix => by-name/ca/cargo-cache/package.nix} (100%) rename pkgs/{development/tools/rust/cargo-outdated/default.nix => by-name/ca/cargo-outdated/package.nix} (100%) rename pkgs/{development/tools/rust/cargo-zigbuild/default.nix => by-name/ca/cargo-zigbuild/package.nix} (100%) rename pkgs/{development/tools/language-servers/ccls/default.nix => by-name/cc/ccls/package.nix} (100%) rename pkgs/{development/tools/language-servers => by-name/cc}/ccls/wrapper (100%) rename pkgs/{applications/audio/cdparanoia => by-name/cd/cdparanoiaIII}/configure.patch (100%) rename pkgs/{applications/audio/cdparanoia => by-name/cd/cdparanoiaIII}/fix_private_keyword.patch (100%) rename pkgs/{applications/audio/cdparanoia/default.nix => by-name/cd/cdparanoiaIII/package.nix} (100%) rename pkgs/{applications/audio/cdparanoia => by-name/cd/cdparanoiaIII}/utils.patch (100%) rename pkgs/{development/libraries/CGAL => by-name/cg/cgal}/cgal_path.patch (100%) rename pkgs/{development/libraries/CGAL/default.nix => by-name/cg/cgal/package.nix} (100%) rename pkgs/{applications/virtualization/crosvm/default.nix => by-name/cr/crosvm/package.nix} (100%) rename pkgs/{development/web/cypress/default.nix => by-name/cy/cypress/package.nix} (100%) rename pkgs/{development/web => by-name/cy}/cypress/update.sh (100%) rename pkgs/{tools/misc/didyoumean/default.nix => by-name/di/didyoumean/package.nix} (100%) rename pkgs/{servers/mail => by-name/do}/dovecot/load-extended-modules.patch (100%) rename pkgs/{servers/mail/dovecot/default.nix => by-name/do/dovecot/package.nix} (100%) rename pkgs/{servers/mail => by-name/do}/dovecot/timespec.patch (100%) rename pkgs/{development/libraries/duckdb/default.nix => by-name/du/duckdb/package.nix} (100%) rename pkgs/{development/libraries => by-name/du}/duckdb/update.sh (100%) rename pkgs/{development/libraries => by-name/du}/duckdb/versions.json (100%) rename pkgs/{os-specific/darwin => by-name/du}/duti/buildConfigure.patch (100%) rename pkgs/{os-specific/darwin/duti/default.nix => by-name/du/duti/package.nix} (100%) rename pkgs/{development/tools/database/dynein/default.nix => by-name/dy/dynein/package.nix} (100%) rename pkgs/{tools/misc => by-name/es}/esphome/dashboard.nix (100%) rename pkgs/{tools/misc/esphome/default.nix => by-name/es/esphome/package.nix} (100%) rename pkgs/{tools/misc => by-name/es}/esphome/update.nix (100%) rename pkgs/{applications/networking/mailreaders/evolution => by-name/ev}/evolution-ews/hardcode-gsettings.patch (100%) rename pkgs/{applications/networking/mailreaders/evolution/evolution-ews/default.nix => by-name/ev/evolution-ews/package.nix} (100%) rename pkgs/{development/tools/fable/default.nix => by-name/fa/fable/package.nix} (100%) rename pkgs/{development/tools/fnm/default.nix => by-name/fn/fnm/package.nix} (100%) rename pkgs/{tools/security/genpass/default.nix => by-name/ge/genpass/package.nix} (100%) rename pkgs/{applications/version-management/gfold/default.nix => by-name/gf/gfold/package.nix} (100%) rename pkgs/{tools/misc/gh-cal/default.nix => by-name/gh/gh-cal/package.nix} (100%) rename pkgs/{applications/version-management/git-absorb/default.nix => by-name/gi/git-absorb/package.nix} (100%) rename pkgs/{applications/version-management/git-branchless/default.nix => by-name/gi/git-branchless/package.nix} (100%) rename pkgs/{applications/version-management/git-cinnabar/default.nix => by-name/gi/git-cinnabar/package.nix} (100%) rename pkgs/{applications/version-management/git-cliff/default.nix => by-name/gi/git-cliff/package.nix} (100%) rename pkgs/{applications/version-management/git-credential-keepassxc/default.nix => by-name/gi/git-credential-keepassxc/package.nix} (100%) rename pkgs/{applications/version-management/git-remote-codecommit/default.nix => by-name/gi/git-remote-codecommit/package.nix} (100%) rename pkgs/{applications/version-management/git-trim/default.nix => by-name/gi/git-trim/package.nix} (100%) rename pkgs/{applications/version-management/gitoxide/default.nix => by-name/gi/gitoxide/package.nix} (100%) rename pkgs/{applications/video/gpac/default.nix => by-name/gp/gpac/package.nix} (100%) rename pkgs/{tools/text => by-name/gp}/gpt2tc/0001-add-python-shebang.patch (100%) rename pkgs/{tools/text/gpt2tc/default.nix => by-name/gp/gpt2tc/package.nix} (100%) rename pkgs/{applications/science/math/gretl/default.nix => by-name/gr/gretl/package.nix} (100%) rename pkgs/{tools/package-management/gx/default.nix => by-name/gx/gx/package.nix} (100%) rename pkgs/{applications/video => by-name/gy}/gyroflow/gyroflow-mime.xml (100%) rename pkgs/{applications/video => by-name/gy}/gyroflow/gyroflow-open.sh (100%) rename pkgs/{applications/video/gyroflow/default.nix => by-name/gy/gyroflow/package.nix} (100%) rename pkgs/{tools/security/honggfuzz/default.nix => by-name/ho/honggfuzz/package.nix} (100%) rename pkgs/{development/libraries/hpx/default.nix => by-name/hp/hpx/package.nix} (100%) rename pkgs/{tools/networking/http-prompt/default.nix => by-name/ht/http-prompt/package.nix} (100%) rename pkgs/{applications/networking/irc/irssi/default.nix => by-name/ir/irssi/package.nix} (100%) rename pkgs/{development/compilers/ispc/default.nix => by-name/is/ispc/package.nix} (100%) rename pkgs/{servers/http/jboss/default.nix => by-name/jb/jboss/package.nix} (100%) rename pkgs/{servers/jibri/default.nix => by-name/ji/jibri/package.nix} (100%) rename pkgs/{servers => by-name/ji}/jibri/update.sh (100%) rename pkgs/{servers => by-name/ji}/jicofo/logging.properties-journal (100%) rename pkgs/{servers/jicofo/default.nix => by-name/ji/jicofo/package.nix} (100%) rename pkgs/{servers => by-name/ji}/jicofo/update.sh (100%) rename pkgs/{misc/jitsi-meet-prosody/default.nix => by-name/ji/jitsi-meet-prosody/package.nix} (100%) rename pkgs/{misc => by-name/ji}/jitsi-meet-prosody/update.sh (100%) rename pkgs/{servers/web-apps/jitsi-meet/default.nix => by-name/ji/jitsi-meet/package.nix} (100%) rename pkgs/{servers/web-apps => by-name/ji}/jitsi-meet/update.sh (100%) rename pkgs/{servers => by-name/ji}/jitsi-videobridge/logging.properties-journal (100%) rename pkgs/{servers/jitsi-videobridge/default.nix => by-name/ji/jitsi-videobridge/package.nix} (100%) rename pkgs/{servers => by-name/ji}/jitsi-videobridge/update.sh (100%) rename pkgs/{tools/misc/jsonwatch/default.nix => by-name/js/jsonwatch/package.nix} (100%) rename pkgs/{development/libraries/libgcrypt/default.nix => by-name/li/libgcrypt/package.nix} (100%) rename pkgs/{tools/networking/networkmanager => by-name/li}/libnma/hardcode-gsettings.patch (100%) rename pkgs/{tools/networking/networkmanager/libnma/default.nix => by-name/li/libnma/package.nix} (100%) rename pkgs/{development/libraries/audio/libopenmpt/default.nix => by-name/li/libopenmpt/package.nix} (100%) rename pkgs/{development/libraries/audio => by-name/li}/libopenmpt/update.sh (100%) rename pkgs/{development/libraries => by-name/li}/libproxy/hardcode-gsettings.patch (100%) rename pkgs/{development/libraries/libproxy/default.nix => by-name/li/libproxy/package.nix} (100%) rename pkgs/{development/libraries => by-name/li}/libproxy/skip-gsettings-detection.patch (100%) rename pkgs/{applications/graphics/lightburn/default.nix => by-name/li/lightburn/package.nix} (100%) rename pkgs/{os-specific/linux/firmware/linux-firmware/default.nix => by-name/li/linux-firmware/package.nix} (100%) rename pkgs/{os-specific/linux/firmware => by-name/li}/linux-firmware/update.sh (100%) rename pkgs/{tools/networking/lychee/default.nix => by-name/ly/lychee/package.nix} (100%) rename pkgs/{tools/networking => by-name/ly}/lychee/tests/fail-emptyDirectory.nix (100%) rename pkgs/{tools/networking => by-name/ly}/lychee/tests/fail.nix (100%) rename pkgs/{tools/networking => by-name/ly}/lychee/tests/network.nix (100%) rename pkgs/{tools/networking => by-name/ly}/lychee/tests/ok.nix (100%) rename pkgs/{tools/security/maigret/default.nix => by-name/ma/maigret/package.nix} (100%) rename pkgs/{development/tools => by-name/ma}/marksman/deps.json (100%) rename pkgs/{development/tools/marksman/default.nix => by-name/ma/marksman/package.nix} (100%) rename pkgs/{development/tools => by-name/ma}/marksman/update.sh (100%) rename pkgs/{servers => by-name/ma}/matrix-appservice-discord/package.json (100%) rename pkgs/{servers/matrix-appservice-discord/default.nix => by-name/ma/matrix-appservice-discord/package.nix} (100%) rename pkgs/{servers => by-name/ma}/matrix-appservice-discord/pin.json (100%) rename pkgs/{servers => by-name/ma}/matrix-appservice-discord/update.sh (100%) rename pkgs/{development/libraries => by-name/ma}/matrix-sdk-crypto-nodejs/Cargo.lock (100%) rename pkgs/{development/libraries/matrix-sdk-crypto-nodejs/default.nix => by-name/ma/matrix-sdk-crypto-nodejs/package.nix} (100%) rename pkgs/{servers/search => by-name/me}/meilisearch/Cargo.lock (100%) rename pkgs/{servers/search/meilisearch/default.nix => by-name/me/meilisearch/package.nix} (100%) rename pkgs/{games/minecraft/default.nix => by-name/mi/minecraft/package.nix} (100%) rename pkgs/{games => by-name/mi}/minecraft/update.sh (100%) rename pkgs/{tools/filesystems => by-name/mt}/mtools/UNUSED-darwin.patch (100%) rename pkgs/{tools/filesystems/mtools/default.nix => by-name/mt/mtools/package.nix} (100%) rename pkgs/{tools/filesystems => by-name/mt}/mtools/update.sh (100%) rename pkgs/{applications/science/math/mxnet/default.nix => by-name/mx/mxnet/package.nix} (100%) rename pkgs/{applications/editors/nano/default.nix => by-name/na/nano/package.nix} (100%) rename pkgs/{applications/editors => by-name/na}/nano/test-with-expect.nix (100%) rename pkgs/{applications/version-management/nbstripout/default.nix => by-name/nb/nbstripout/package.nix} (100%) rename pkgs/{development/libraries/ndi/default.nix => by-name/nd/ndi/package.nix} (100%) rename pkgs/{development/libraries => by-name/nd}/ndi/update.py (100%) rename pkgs/{development/libraries => by-name/nd}/ndi/version.json (100%) rename pkgs/{tools/graphics/netpbm/default.nix => by-name/ne/netpbm/package.nix} (100%) rename pkgs/{tools/graphics => by-name/ne}/netpbm/update.sh (100%) rename pkgs/{tools/nix => by-name/ni}/nix-output-monitor/generated-package.nix (100%) rename pkgs/{tools/nix/nix-output-monitor/default.nix => by-name/ni/nix-output-monitor/package.nix} (100%) rename pkgs/{tools/nix => by-name/ni}/nix-output-monitor/update.sh (100%) rename pkgs/{servers/nominatim/default.nix => by-name/no/nominatim/package.nix} (100%) rename pkgs/{tools/misc/ntfy/default.nix => by-name/nt/ntfy/package.nix} (100%) rename pkgs/{tools/misc => by-name/nt}/ntfy/webpush.nix (100%) rename pkgs/{tools/networking/onetun/default.nix => by-name/on/onetun/package.nix} (100%) rename pkgs/{applications/audio => by-name/op}/openutau/deps.json (100%) rename pkgs/{applications/audio/openutau/default.nix => by-name/op/openutau/package.nix} (100%) rename pkgs/{applications/audio => by-name/op}/openutau/update.sh (100%) rename pkgs/{tools/system => by-name/os}/osquery/Remove-git-reset.patch (100%) rename pkgs/{tools/system => by-name/os}/osquery/info.json (100%) rename pkgs/{tools/system/osquery/default.nix => by-name/os/osquery/package.nix} (100%) rename pkgs/{tools/system => by-name/os}/osquery/toolchain-bin.nix (100%) rename pkgs/{tools/system => by-name/os}/osquery/update.py (100%) rename pkgs/{development/tools/perseus-cli/default.nix => by-name/pe/perseus-cli/package.nix} (100%) rename pkgs/{development/libraries/portaudio/default.nix => by-name/po/portaudio/package.nix} (100%) rename pkgs/{development/tools/database/prisma-engines/default.nix => by-name/pr/prisma-engines/package.nix} (100%) rename pkgs/{development/tools/protoc-gen-dart/default.nix => by-name/pr/protoc-gen-dart/package.nix} (100%) rename pkgs/{development/tools => by-name/pr}/protoc-gen-dart/pubspec.lock.json (100%) rename pkgs/{development/tools => by-name/pr}/protoc-gen-dart/update.sh (100%) rename pkgs/{applications/science/chemistry/pymol/default.nix => by-name/py/pymol/package.nix} (100%) rename pkgs/{applications/science/chemistry => by-name/py}/pymol/script-already-exists.patch (100%) rename pkgs/{applications/networking/instant-messengers/qtox/default.nix => by-name/qt/qtox/package.nix} (100%) rename pkgs/{tools/text/ruplacer/default.nix => by-name/ru/ruplacer/package.nix} (100%) rename pkgs/{development/libraries => by-name/ru}/rure/Cargo.lock (100%) rename pkgs/{development/libraries/rure/default.nix => by-name/ru/rure/package.nix} (100%) rename pkgs/{development/libraries => by-name/ru}/rure/pin.json (100%) rename pkgs/{development/libraries => by-name/ru}/rure/update.sh (100%) rename pkgs/{development/tools/sauce-connect/default.nix => by-name/sa/sauce-connect/package.nix} (100%) rename pkgs/{development/tools => by-name/sa}/sauce-connect/update.sh (100%) rename pkgs/{development/tools/build-managers/scala-cli/default.nix => by-name/sc/scala-cli/package.nix} (100%) rename pkgs/{development/tools/build-managers => by-name/sc}/scala-cli/sources.json (100%) rename pkgs/{development/tools/build-managers => by-name/sc}/scala-cli/update.nix (100%) rename pkgs/{tools/networking/shadowsocks-rust/default.nix => by-name/sh/shadowsocks-rust/package.nix} (100%) rename pkgs/{tools/misc/sharedown/default.nix => by-name/sh/sharedown/package.nix} (100%) rename pkgs/{tools/misc => by-name/sh}/sharedown/update.sh (100%) rename pkgs/{tools/misc => by-name/sh}/sharedown/yarn.lock (100%) rename pkgs/{games => by-name/sp}/space-station-14-launcher/deps.json (100%) rename pkgs/{games/space-station-14-launcher/default.nix => by-name/sp/space-station-14-launcher/package.nix} (100%) rename pkgs/{games => by-name/sp}/space-station-14-launcher/space-station-14-launcher.nix (100%) rename pkgs/{games => by-name/sp}/space-station-14-launcher/update.sh (100%) rename pkgs/{tools/filesystems/ssdfs-utils/default.nix => by-name/ss/ssdfs-utils/package.nix} (100%) rename pkgs/{tools/filesystems => by-name/ss}/ssdfs-utils/update.sh (100%) rename pkgs/{applications/editors/standardnotes/default.nix => by-name/st/standardnotes/package.nix} (100%) rename pkgs/{applications/editors => by-name/st}/standardnotes/src.json (100%) rename pkgs/{applications/editors => by-name/st}/standardnotes/update.nix (100%) rename pkgs/{servers/gemini/stargazer/default.nix => by-name/st/stargazer/package.nix} (100%) rename pkgs/{development/tools/tabnine/default.nix => by-name/ta/tabnine/package.nix} (100%) rename pkgs/{development/tools => by-name/ta}/tabnine/sources.json (100%) rename pkgs/{development/tools => by-name/ta}/tabnine/update.sh (100%) rename pkgs/{applications/misc => by-name/ta}/tandoor-recipes/common.nix (100%) rename pkgs/{applications/misc => by-name/ta}/tandoor-recipes/frontend.nix (100%) rename pkgs/{applications/misc/tandoor-recipes/default.nix => by-name/ta/tandoor-recipes/package.nix} (100%) rename pkgs/{applications/misc => by-name/ta}/tandoor-recipes/pytest-xdist.patch (100%) rename pkgs/{applications/misc => by-name/ta}/tandoor-recipes/update.sh (100%) rename pkgs/{development/compilers => by-name/ti}/tinygo/0001-GNUmakefile.patch (100%) rename pkgs/{development/compilers/tinygo/default.nix => by-name/ti/tinygo/package.nix} (100%) rename pkgs/{applications/audio/touchosc/default.nix => by-name/to/touchosc/package.nix} (100%) rename pkgs/{applications/audio => by-name/to}/touchosc/update.sh (100%) rename pkgs/{tools/misc/trackma/default.nix => by-name/tr/trackma/package.nix} (100%) rename pkgs/{tools/misc => by-name/tr}/trackma/update.sh (100%) rename pkgs/{applications/office/treesheets/default.nix => by-name/tr/treesheets/package.nix} (100%) rename pkgs/{applications/networking/p2p/tremotesf/default.nix => by-name/tr/tremotesf/package.nix} (100%) rename pkgs/{applications/misc/trenchbroom/default.nix => by-name/tr/trenchbroom/package.nix} (100%) rename pkgs/{servers/tt-rss/default.nix => by-name/tt/tt-rss/package.nix} (100%) rename pkgs/{servers/search/typesense/default.nix => by-name/ty/typesense/package.nix} (100%) rename pkgs/{servers/search => by-name/ty}/typesense/sources.json (100%) rename pkgs/{servers/search => by-name/ty}/typesense/update.sh (100%) rename pkgs/{applications/radio => by-name/uh}/uhd/no-adapter-tests.patch (100%) rename pkgs/{applications/radio/uhd/default.nix => by-name/uh/uhd/package.nix} (100%) rename pkgs/{applications/radio => by-name/uh}/uhd/update.sh (100%) rename pkgs/{servers/unstructured-api/default.nix => by-name/un/unstructured-api/package.nix} (100%) rename pkgs/{applications/networking/remote/vmware-horizon-client/default.nix => by-name/vm/vmware-horizon-client/package.nix} (100%) rename pkgs/{applications/networking/remote => by-name/vm}/vmware-horizon-client/update.sh (100%) rename pkgs/{tools/misc/vrc-get/default.nix => by-name/vr/vrc-get/package.nix} (100%) rename pkgs/{tools/graphics/vulkan-cts/default.nix => by-name/vu/vulkan-cts/package.nix} (100%) rename pkgs/{tools/graphics => by-name/vu}/vulkan-cts/sources.nix (100%) rename pkgs/{tools/graphics => by-name/vu}/vulkan-cts/update.sh (100%) rename pkgs/{tools/graphics => by-name/vu}/vulkan-cts/vk-cts-sources.py (100%) rename pkgs/{development/libraries/vulkan-headers/default.nix => by-name/vu/vulkan-headers/package.nix} (100%) rename pkgs/{development/libraries => by-name/vu}/vulkan-headers/update.sh (100%) rename pkgs/{servers/web-apps/wiki-js/default.nix => by-name/wi/wiki-js/package.nix} (100%) rename pkgs/{servers/web-apps => by-name/wi}/wiki-js/update.sh (100%) rename pkgs/{tools/networking/wireguard-tools/default.nix => by-name/wi/wireguard-tools/package.nix} (100%) rename pkgs/{tools/networking => by-name/wi}/wireguard-tools/update.sh (100%) rename pkgs/{development/tools/worker-build/default.nix => by-name/wo/worker-build/package.nix} (100%) rename pkgs/{applications/graphics/xaos/default.nix => by-name/xa/xaos/package.nix} (100%) rename pkgs/{tools/networking => by-name/xd}/xdp-tools/emacs-30.patch (100%) rename pkgs/{tools/networking/xdp-tools/default.nix => by-name/xd/xdp-tools/package.nix} (100%) rename pkgs/{applications/networking/remote => by-name/xr}/xrdp/dynamic_config.patch (100%) rename pkgs/{applications/networking/remote/xrdp/default.nix => by-name/xr/xrdp/package.nix} (100%) rename pkgs/{tools/filesystems/xtreemfs/default.nix => by-name/xt/xtreemfs/package.nix} (100%) rename pkgs/{tools/package-management => by-name/ya}/yarn-lock-converter/package-lock.json (100%) rename pkgs/{tools/package-management/yarn-lock-converter/default.nix => by-name/ya/yarn-lock-converter/package.nix} (100%) rename pkgs/{tools/package-management => by-name/ya}/yarn-lock-converter/source.json (100%) rename pkgs/{tools/package-management => by-name/ya}/yarn-lock-converter/update.sh (100%) rename pkgs/{shells/zsh/default.nix => by-name/zs/zsh/package.nix} (100%) rename pkgs/{shells => by-name/zs}/zsh/tz_completion.patch (100%) diff --git a/pkgs/applications/emulators/86box/darwin.patch b/pkgs/by-name/_8/_86Box/darwin.patch similarity index 100% rename from pkgs/applications/emulators/86box/darwin.patch rename to pkgs/by-name/_8/_86Box/darwin.patch diff --git a/pkgs/applications/emulators/86box/default.nix b/pkgs/by-name/_8/_86Box/package.nix similarity index 100% rename from pkgs/applications/emulators/86box/default.nix rename to pkgs/by-name/_8/_86Box/package.nix diff --git a/pkgs/applications/emulators/86box/update.sh b/pkgs/by-name/_8/_86Box/update.sh similarity index 100% rename from pkgs/applications/emulators/86box/update.sh rename to pkgs/by-name/_8/_86Box/update.sh diff --git a/pkgs/tools/filesystems/afsctool/default.nix b/pkgs/by-name/af/afsctool/package.nix similarity index 100% rename from pkgs/tools/filesystems/afsctool/default.nix rename to pkgs/by-name/af/afsctool/package.nix diff --git a/pkgs/applications/video/anime-downloader/default.nix b/pkgs/by-name/an/anime-downloader/package.nix similarity index 100% rename from pkgs/applications/video/anime-downloader/default.nix rename to pkgs/by-name/an/anime-downloader/package.nix diff --git a/pkgs/applications/video/anime-downloader/update.sh b/pkgs/by-name/an/anime-downloader/update.sh similarity index 100% rename from pkgs/applications/video/anime-downloader/update.sh rename to pkgs/by-name/an/anime-downloader/update.sh diff --git a/pkgs/tools/backup/awsbck/default.nix b/pkgs/by-name/aw/awsbck/package.nix similarity index 100% rename from pkgs/tools/backup/awsbck/default.nix rename to pkgs/by-name/aw/awsbck/package.nix diff --git a/pkgs/development/tools/azure-static-sites-client/default.nix b/pkgs/by-name/az/azure-static-sites-client/package.nix similarity index 100% rename from pkgs/development/tools/azure-static-sites-client/default.nix rename to pkgs/by-name/az/azure-static-sites-client/package.nix diff --git a/pkgs/development/tools/azure-static-sites-client/update.sh b/pkgs/by-name/az/azure-static-sites-client/update.sh similarity index 100% rename from pkgs/development/tools/azure-static-sites-client/update.sh rename to pkgs/by-name/az/azure-static-sites-client/update.sh diff --git a/pkgs/development/tools/azure-static-sites-client/versions.json b/pkgs/by-name/az/azure-static-sites-client/versions.json similarity index 100% rename from pkgs/development/tools/azure-static-sites-client/versions.json rename to pkgs/by-name/az/azure-static-sites-client/versions.json diff --git a/pkgs/servers/binserve/Cargo.lock b/pkgs/by-name/bi/binserve/Cargo.lock similarity index 100% rename from pkgs/servers/binserve/Cargo.lock rename to pkgs/by-name/bi/binserve/Cargo.lock diff --git a/pkgs/servers/binserve/default.nix b/pkgs/by-name/bi/binserve/package.nix similarity index 100% rename from pkgs/servers/binserve/default.nix rename to pkgs/by-name/bi/binserve/package.nix diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/by-name/ca/cacert/package.nix similarity index 100% rename from pkgs/data/misc/cacert/default.nix rename to pkgs/by-name/ca/cacert/package.nix diff --git a/pkgs/data/misc/cacert/setup-hook.sh b/pkgs/by-name/ca/cacert/setup-hook.sh similarity index 100% rename from pkgs/data/misc/cacert/setup-hook.sh rename to pkgs/by-name/ca/cacert/setup-hook.sh diff --git a/pkgs/data/misc/cacert/test-cert-file.crt b/pkgs/by-name/ca/cacert/test-cert-file.crt similarity index 100% rename from pkgs/data/misc/cacert/test-cert-file.crt rename to pkgs/by-name/ca/cacert/test-cert-file.crt diff --git a/pkgs/data/misc/cacert/update.sh b/pkgs/by-name/ca/cacert/update.sh similarity index 100% rename from pkgs/data/misc/cacert/update.sh rename to pkgs/by-name/ca/cacert/update.sh diff --git a/pkgs/development/tools/rust/cargo-cache/default.nix b/pkgs/by-name/ca/cargo-cache/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-cache/default.nix rename to pkgs/by-name/ca/cargo-cache/package.nix diff --git a/pkgs/development/tools/rust/cargo-outdated/default.nix b/pkgs/by-name/ca/cargo-outdated/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-outdated/default.nix rename to pkgs/by-name/ca/cargo-outdated/package.nix diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/by-name/ca/cargo-zigbuild/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-zigbuild/default.nix rename to pkgs/by-name/ca/cargo-zigbuild/package.nix diff --git a/pkgs/development/tools/language-servers/ccls/default.nix b/pkgs/by-name/cc/ccls/package.nix similarity index 100% rename from pkgs/development/tools/language-servers/ccls/default.nix rename to pkgs/by-name/cc/ccls/package.nix diff --git a/pkgs/development/tools/language-servers/ccls/wrapper b/pkgs/by-name/cc/ccls/wrapper similarity index 100% rename from pkgs/development/tools/language-servers/ccls/wrapper rename to pkgs/by-name/cc/ccls/wrapper diff --git a/pkgs/applications/audio/cdparanoia/configure.patch b/pkgs/by-name/cd/cdparanoiaIII/configure.patch similarity index 100% rename from pkgs/applications/audio/cdparanoia/configure.patch rename to pkgs/by-name/cd/cdparanoiaIII/configure.patch diff --git a/pkgs/applications/audio/cdparanoia/fix_private_keyword.patch b/pkgs/by-name/cd/cdparanoiaIII/fix_private_keyword.patch similarity index 100% rename from pkgs/applications/audio/cdparanoia/fix_private_keyword.patch rename to pkgs/by-name/cd/cdparanoiaIII/fix_private_keyword.patch diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/by-name/cd/cdparanoiaIII/package.nix similarity index 100% rename from pkgs/applications/audio/cdparanoia/default.nix rename to pkgs/by-name/cd/cdparanoiaIII/package.nix diff --git a/pkgs/applications/audio/cdparanoia/utils.patch b/pkgs/by-name/cd/cdparanoiaIII/utils.patch similarity index 100% rename from pkgs/applications/audio/cdparanoia/utils.patch rename to pkgs/by-name/cd/cdparanoiaIII/utils.patch diff --git a/pkgs/development/libraries/CGAL/cgal_path.patch b/pkgs/by-name/cg/cgal/cgal_path.patch similarity index 100% rename from pkgs/development/libraries/CGAL/cgal_path.patch rename to pkgs/by-name/cg/cgal/cgal_path.patch diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/by-name/cg/cgal/package.nix similarity index 100% rename from pkgs/development/libraries/CGAL/default.nix rename to pkgs/by-name/cg/cgal/package.nix diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/by-name/cr/crosvm/package.nix similarity index 100% rename from pkgs/applications/virtualization/crosvm/default.nix rename to pkgs/by-name/cr/crosvm/package.nix diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/by-name/cy/cypress/package.nix similarity index 100% rename from pkgs/development/web/cypress/default.nix rename to pkgs/by-name/cy/cypress/package.nix diff --git a/pkgs/development/web/cypress/update.sh b/pkgs/by-name/cy/cypress/update.sh similarity index 100% rename from pkgs/development/web/cypress/update.sh rename to pkgs/by-name/cy/cypress/update.sh diff --git a/pkgs/tools/misc/didyoumean/default.nix b/pkgs/by-name/di/didyoumean/package.nix similarity index 100% rename from pkgs/tools/misc/didyoumean/default.nix rename to pkgs/by-name/di/didyoumean/package.nix diff --git a/pkgs/servers/mail/dovecot/load-extended-modules.patch b/pkgs/by-name/do/dovecot/load-extended-modules.patch similarity index 100% rename from pkgs/servers/mail/dovecot/load-extended-modules.patch rename to pkgs/by-name/do/dovecot/load-extended-modules.patch diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/by-name/do/dovecot/package.nix similarity index 100% rename from pkgs/servers/mail/dovecot/default.nix rename to pkgs/by-name/do/dovecot/package.nix diff --git a/pkgs/servers/mail/dovecot/timespec.patch b/pkgs/by-name/do/dovecot/timespec.patch similarity index 100% rename from pkgs/servers/mail/dovecot/timespec.patch rename to pkgs/by-name/do/dovecot/timespec.patch diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/by-name/du/duckdb/package.nix similarity index 100% rename from pkgs/development/libraries/duckdb/default.nix rename to pkgs/by-name/du/duckdb/package.nix diff --git a/pkgs/development/libraries/duckdb/update.sh b/pkgs/by-name/du/duckdb/update.sh similarity index 100% rename from pkgs/development/libraries/duckdb/update.sh rename to pkgs/by-name/du/duckdb/update.sh diff --git a/pkgs/development/libraries/duckdb/versions.json b/pkgs/by-name/du/duckdb/versions.json similarity index 100% rename from pkgs/development/libraries/duckdb/versions.json rename to pkgs/by-name/du/duckdb/versions.json diff --git a/pkgs/os-specific/darwin/duti/buildConfigure.patch b/pkgs/by-name/du/duti/buildConfigure.patch similarity index 100% rename from pkgs/os-specific/darwin/duti/buildConfigure.patch rename to pkgs/by-name/du/duti/buildConfigure.patch diff --git a/pkgs/os-specific/darwin/duti/default.nix b/pkgs/by-name/du/duti/package.nix similarity index 100% rename from pkgs/os-specific/darwin/duti/default.nix rename to pkgs/by-name/du/duti/package.nix diff --git a/pkgs/development/tools/database/dynein/default.nix b/pkgs/by-name/dy/dynein/package.nix similarity index 100% rename from pkgs/development/tools/database/dynein/default.nix rename to pkgs/by-name/dy/dynein/package.nix diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/by-name/es/esphome/dashboard.nix similarity index 100% rename from pkgs/tools/misc/esphome/dashboard.nix rename to pkgs/by-name/es/esphome/dashboard.nix diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/by-name/es/esphome/package.nix similarity index 100% rename from pkgs/tools/misc/esphome/default.nix rename to pkgs/by-name/es/esphome/package.nix diff --git a/pkgs/tools/misc/esphome/update.nix b/pkgs/by-name/es/esphome/update.nix similarity index 100% rename from pkgs/tools/misc/esphome/update.nix rename to pkgs/by-name/es/esphome/update.nix diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch b/pkgs/by-name/ev/evolution-ews/hardcode-gsettings.patch similarity index 100% rename from pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch rename to pkgs/by-name/ev/evolution-ews/hardcode-gsettings.patch diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/by-name/ev/evolution-ews/package.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix rename to pkgs/by-name/ev/evolution-ews/package.nix diff --git a/pkgs/development/tools/fable/default.nix b/pkgs/by-name/fa/fable/package.nix similarity index 100% rename from pkgs/development/tools/fable/default.nix rename to pkgs/by-name/fa/fable/package.nix diff --git a/pkgs/development/tools/fnm/default.nix b/pkgs/by-name/fn/fnm/package.nix similarity index 100% rename from pkgs/development/tools/fnm/default.nix rename to pkgs/by-name/fn/fnm/package.nix diff --git a/pkgs/tools/security/genpass/default.nix b/pkgs/by-name/ge/genpass/package.nix similarity index 100% rename from pkgs/tools/security/genpass/default.nix rename to pkgs/by-name/ge/genpass/package.nix diff --git a/pkgs/applications/version-management/gfold/default.nix b/pkgs/by-name/gf/gfold/package.nix similarity index 100% rename from pkgs/applications/version-management/gfold/default.nix rename to pkgs/by-name/gf/gfold/package.nix diff --git a/pkgs/tools/misc/gh-cal/default.nix b/pkgs/by-name/gh/gh-cal/package.nix similarity index 100% rename from pkgs/tools/misc/gh-cal/default.nix rename to pkgs/by-name/gh/gh-cal/package.nix diff --git a/pkgs/applications/version-management/git-absorb/default.nix b/pkgs/by-name/gi/git-absorb/package.nix similarity index 100% rename from pkgs/applications/version-management/git-absorb/default.nix rename to pkgs/by-name/gi/git-absorb/package.nix diff --git a/pkgs/applications/version-management/git-branchless/default.nix b/pkgs/by-name/gi/git-branchless/package.nix similarity index 100% rename from pkgs/applications/version-management/git-branchless/default.nix rename to pkgs/by-name/gi/git-branchless/package.nix diff --git a/pkgs/applications/version-management/git-cinnabar/default.nix b/pkgs/by-name/gi/git-cinnabar/package.nix similarity index 100% rename from pkgs/applications/version-management/git-cinnabar/default.nix rename to pkgs/by-name/gi/git-cinnabar/package.nix diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/by-name/gi/git-cliff/package.nix similarity index 100% rename from pkgs/applications/version-management/git-cliff/default.nix rename to pkgs/by-name/gi/git-cliff/package.nix diff --git a/pkgs/applications/version-management/git-credential-keepassxc/default.nix b/pkgs/by-name/gi/git-credential-keepassxc/package.nix similarity index 100% rename from pkgs/applications/version-management/git-credential-keepassxc/default.nix rename to pkgs/by-name/gi/git-credential-keepassxc/package.nix diff --git a/pkgs/applications/version-management/git-remote-codecommit/default.nix b/pkgs/by-name/gi/git-remote-codecommit/package.nix similarity index 100% rename from pkgs/applications/version-management/git-remote-codecommit/default.nix rename to pkgs/by-name/gi/git-remote-codecommit/package.nix diff --git a/pkgs/applications/version-management/git-trim/default.nix b/pkgs/by-name/gi/git-trim/package.nix similarity index 100% rename from pkgs/applications/version-management/git-trim/default.nix rename to pkgs/by-name/gi/git-trim/package.nix diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/by-name/gi/gitoxide/package.nix similarity index 100% rename from pkgs/applications/version-management/gitoxide/default.nix rename to pkgs/by-name/gi/gitoxide/package.nix diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/by-name/gp/gpac/package.nix similarity index 100% rename from pkgs/applications/video/gpac/default.nix rename to pkgs/by-name/gp/gpac/package.nix diff --git a/pkgs/tools/text/gpt2tc/0001-add-python-shebang.patch b/pkgs/by-name/gp/gpt2tc/0001-add-python-shebang.patch similarity index 100% rename from pkgs/tools/text/gpt2tc/0001-add-python-shebang.patch rename to pkgs/by-name/gp/gpt2tc/0001-add-python-shebang.patch diff --git a/pkgs/tools/text/gpt2tc/default.nix b/pkgs/by-name/gp/gpt2tc/package.nix similarity index 100% rename from pkgs/tools/text/gpt2tc/default.nix rename to pkgs/by-name/gp/gpt2tc/package.nix diff --git a/pkgs/applications/science/math/gretl/default.nix b/pkgs/by-name/gr/gretl/package.nix similarity index 100% rename from pkgs/applications/science/math/gretl/default.nix rename to pkgs/by-name/gr/gretl/package.nix diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/by-name/gx/gx/package.nix similarity index 100% rename from pkgs/tools/package-management/gx/default.nix rename to pkgs/by-name/gx/gx/package.nix diff --git a/pkgs/applications/video/gyroflow/gyroflow-mime.xml b/pkgs/by-name/gy/gyroflow/gyroflow-mime.xml similarity index 100% rename from pkgs/applications/video/gyroflow/gyroflow-mime.xml rename to pkgs/by-name/gy/gyroflow/gyroflow-mime.xml diff --git a/pkgs/applications/video/gyroflow/gyroflow-open.sh b/pkgs/by-name/gy/gyroflow/gyroflow-open.sh similarity index 100% rename from pkgs/applications/video/gyroflow/gyroflow-open.sh rename to pkgs/by-name/gy/gyroflow/gyroflow-open.sh diff --git a/pkgs/applications/video/gyroflow/default.nix b/pkgs/by-name/gy/gyroflow/package.nix similarity index 100% rename from pkgs/applications/video/gyroflow/default.nix rename to pkgs/by-name/gy/gyroflow/package.nix diff --git a/pkgs/tools/security/honggfuzz/default.nix b/pkgs/by-name/ho/honggfuzz/package.nix similarity index 100% rename from pkgs/tools/security/honggfuzz/default.nix rename to pkgs/by-name/ho/honggfuzz/package.nix diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/by-name/hp/hpx/package.nix similarity index 100% rename from pkgs/development/libraries/hpx/default.nix rename to pkgs/by-name/hp/hpx/package.nix diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/by-name/ht/http-prompt/package.nix similarity index 100% rename from pkgs/tools/networking/http-prompt/default.nix rename to pkgs/by-name/ht/http-prompt/package.nix diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/by-name/ir/irssi/package.nix similarity index 100% rename from pkgs/applications/networking/irc/irssi/default.nix rename to pkgs/by-name/ir/irssi/package.nix diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/by-name/is/ispc/package.nix similarity index 100% rename from pkgs/development/compilers/ispc/default.nix rename to pkgs/by-name/is/ispc/package.nix diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/by-name/jb/jboss/package.nix similarity index 100% rename from pkgs/servers/http/jboss/default.nix rename to pkgs/by-name/jb/jboss/package.nix diff --git a/pkgs/servers/jibri/default.nix b/pkgs/by-name/ji/jibri/package.nix similarity index 100% rename from pkgs/servers/jibri/default.nix rename to pkgs/by-name/ji/jibri/package.nix diff --git a/pkgs/servers/jibri/update.sh b/pkgs/by-name/ji/jibri/update.sh similarity index 100% rename from pkgs/servers/jibri/update.sh rename to pkgs/by-name/ji/jibri/update.sh diff --git a/pkgs/servers/jicofo/logging.properties-journal b/pkgs/by-name/ji/jicofo/logging.properties-journal similarity index 100% rename from pkgs/servers/jicofo/logging.properties-journal rename to pkgs/by-name/ji/jicofo/logging.properties-journal diff --git a/pkgs/servers/jicofo/default.nix b/pkgs/by-name/ji/jicofo/package.nix similarity index 100% rename from pkgs/servers/jicofo/default.nix rename to pkgs/by-name/ji/jicofo/package.nix diff --git a/pkgs/servers/jicofo/update.sh b/pkgs/by-name/ji/jicofo/update.sh similarity index 100% rename from pkgs/servers/jicofo/update.sh rename to pkgs/by-name/ji/jicofo/update.sh diff --git a/pkgs/misc/jitsi-meet-prosody/default.nix b/pkgs/by-name/ji/jitsi-meet-prosody/package.nix similarity index 100% rename from pkgs/misc/jitsi-meet-prosody/default.nix rename to pkgs/by-name/ji/jitsi-meet-prosody/package.nix diff --git a/pkgs/misc/jitsi-meet-prosody/update.sh b/pkgs/by-name/ji/jitsi-meet-prosody/update.sh similarity index 100% rename from pkgs/misc/jitsi-meet-prosody/update.sh rename to pkgs/by-name/ji/jitsi-meet-prosody/update.sh diff --git a/pkgs/servers/web-apps/jitsi-meet/default.nix b/pkgs/by-name/ji/jitsi-meet/package.nix similarity index 100% rename from pkgs/servers/web-apps/jitsi-meet/default.nix rename to pkgs/by-name/ji/jitsi-meet/package.nix diff --git a/pkgs/servers/web-apps/jitsi-meet/update.sh b/pkgs/by-name/ji/jitsi-meet/update.sh similarity index 100% rename from pkgs/servers/web-apps/jitsi-meet/update.sh rename to pkgs/by-name/ji/jitsi-meet/update.sh diff --git a/pkgs/servers/jitsi-videobridge/logging.properties-journal b/pkgs/by-name/ji/jitsi-videobridge/logging.properties-journal similarity index 100% rename from pkgs/servers/jitsi-videobridge/logging.properties-journal rename to pkgs/by-name/ji/jitsi-videobridge/logging.properties-journal diff --git a/pkgs/servers/jitsi-videobridge/default.nix b/pkgs/by-name/ji/jitsi-videobridge/package.nix similarity index 100% rename from pkgs/servers/jitsi-videobridge/default.nix rename to pkgs/by-name/ji/jitsi-videobridge/package.nix diff --git a/pkgs/servers/jitsi-videobridge/update.sh b/pkgs/by-name/ji/jitsi-videobridge/update.sh similarity index 100% rename from pkgs/servers/jitsi-videobridge/update.sh rename to pkgs/by-name/ji/jitsi-videobridge/update.sh diff --git a/pkgs/tools/misc/jsonwatch/default.nix b/pkgs/by-name/js/jsonwatch/package.nix similarity index 100% rename from pkgs/tools/misc/jsonwatch/default.nix rename to pkgs/by-name/js/jsonwatch/package.nix diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/by-name/li/libgcrypt/package.nix similarity index 100% rename from pkgs/development/libraries/libgcrypt/default.nix rename to pkgs/by-name/li/libgcrypt/package.nix diff --git a/pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch b/pkgs/by-name/li/libnma/hardcode-gsettings.patch similarity index 100% rename from pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch rename to pkgs/by-name/li/libnma/hardcode-gsettings.patch diff --git a/pkgs/tools/networking/networkmanager/libnma/default.nix b/pkgs/by-name/li/libnma/package.nix similarity index 100% rename from pkgs/tools/networking/networkmanager/libnma/default.nix rename to pkgs/by-name/li/libnma/package.nix diff --git a/pkgs/development/libraries/audio/libopenmpt/default.nix b/pkgs/by-name/li/libopenmpt/package.nix similarity index 100% rename from pkgs/development/libraries/audio/libopenmpt/default.nix rename to pkgs/by-name/li/libopenmpt/package.nix diff --git a/pkgs/development/libraries/audio/libopenmpt/update.sh b/pkgs/by-name/li/libopenmpt/update.sh similarity index 100% rename from pkgs/development/libraries/audio/libopenmpt/update.sh rename to pkgs/by-name/li/libopenmpt/update.sh diff --git a/pkgs/development/libraries/libproxy/hardcode-gsettings.patch b/pkgs/by-name/li/libproxy/hardcode-gsettings.patch similarity index 100% rename from pkgs/development/libraries/libproxy/hardcode-gsettings.patch rename to pkgs/by-name/li/libproxy/hardcode-gsettings.patch diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/by-name/li/libproxy/package.nix similarity index 100% rename from pkgs/development/libraries/libproxy/default.nix rename to pkgs/by-name/li/libproxy/package.nix diff --git a/pkgs/development/libraries/libproxy/skip-gsettings-detection.patch b/pkgs/by-name/li/libproxy/skip-gsettings-detection.patch similarity index 100% rename from pkgs/development/libraries/libproxy/skip-gsettings-detection.patch rename to pkgs/by-name/li/libproxy/skip-gsettings-detection.patch diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/by-name/li/lightburn/package.nix similarity index 100% rename from pkgs/applications/graphics/lightburn/default.nix rename to pkgs/by-name/li/lightburn/package.nix diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/pkgs/by-name/li/linux-firmware/package.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/linux-firmware/default.nix rename to pkgs/by-name/li/linux-firmware/package.nix diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/update.sh b/pkgs/by-name/li/linux-firmware/update.sh similarity index 100% rename from pkgs/os-specific/linux/firmware/linux-firmware/update.sh rename to pkgs/by-name/li/linux-firmware/update.sh diff --git a/pkgs/tools/networking/lychee/default.nix b/pkgs/by-name/ly/lychee/package.nix similarity index 100% rename from pkgs/tools/networking/lychee/default.nix rename to pkgs/by-name/ly/lychee/package.nix diff --git a/pkgs/tools/networking/lychee/tests/fail-emptyDirectory.nix b/pkgs/by-name/ly/lychee/tests/fail-emptyDirectory.nix similarity index 100% rename from pkgs/tools/networking/lychee/tests/fail-emptyDirectory.nix rename to pkgs/by-name/ly/lychee/tests/fail-emptyDirectory.nix diff --git a/pkgs/tools/networking/lychee/tests/fail.nix b/pkgs/by-name/ly/lychee/tests/fail.nix similarity index 100% rename from pkgs/tools/networking/lychee/tests/fail.nix rename to pkgs/by-name/ly/lychee/tests/fail.nix diff --git a/pkgs/tools/networking/lychee/tests/network.nix b/pkgs/by-name/ly/lychee/tests/network.nix similarity index 100% rename from pkgs/tools/networking/lychee/tests/network.nix rename to pkgs/by-name/ly/lychee/tests/network.nix diff --git a/pkgs/tools/networking/lychee/tests/ok.nix b/pkgs/by-name/ly/lychee/tests/ok.nix similarity index 100% rename from pkgs/tools/networking/lychee/tests/ok.nix rename to pkgs/by-name/ly/lychee/tests/ok.nix diff --git a/pkgs/tools/security/maigret/default.nix b/pkgs/by-name/ma/maigret/package.nix similarity index 100% rename from pkgs/tools/security/maigret/default.nix rename to pkgs/by-name/ma/maigret/package.nix diff --git a/pkgs/development/tools/marksman/deps.json b/pkgs/by-name/ma/marksman/deps.json similarity index 100% rename from pkgs/development/tools/marksman/deps.json rename to pkgs/by-name/ma/marksman/deps.json diff --git a/pkgs/development/tools/marksman/default.nix b/pkgs/by-name/ma/marksman/package.nix similarity index 100% rename from pkgs/development/tools/marksman/default.nix rename to pkgs/by-name/ma/marksman/package.nix diff --git a/pkgs/development/tools/marksman/update.sh b/pkgs/by-name/ma/marksman/update.sh similarity index 100% rename from pkgs/development/tools/marksman/update.sh rename to pkgs/by-name/ma/marksman/update.sh diff --git a/pkgs/servers/matrix-appservice-discord/package.json b/pkgs/by-name/ma/matrix-appservice-discord/package.json similarity index 100% rename from pkgs/servers/matrix-appservice-discord/package.json rename to pkgs/by-name/ma/matrix-appservice-discord/package.json diff --git a/pkgs/servers/matrix-appservice-discord/default.nix b/pkgs/by-name/ma/matrix-appservice-discord/package.nix similarity index 100% rename from pkgs/servers/matrix-appservice-discord/default.nix rename to pkgs/by-name/ma/matrix-appservice-discord/package.nix diff --git a/pkgs/servers/matrix-appservice-discord/pin.json b/pkgs/by-name/ma/matrix-appservice-discord/pin.json similarity index 100% rename from pkgs/servers/matrix-appservice-discord/pin.json rename to pkgs/by-name/ma/matrix-appservice-discord/pin.json diff --git a/pkgs/servers/matrix-appservice-discord/update.sh b/pkgs/by-name/ma/matrix-appservice-discord/update.sh similarity index 100% rename from pkgs/servers/matrix-appservice-discord/update.sh rename to pkgs/by-name/ma/matrix-appservice-discord/update.sh diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo.lock b/pkgs/by-name/ma/matrix-sdk-crypto-nodejs/Cargo.lock similarity index 100% rename from pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo.lock rename to pkgs/by-name/ma/matrix-sdk-crypto-nodejs/Cargo.lock diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/default.nix b/pkgs/by-name/ma/matrix-sdk-crypto-nodejs/package.nix similarity index 100% rename from pkgs/development/libraries/matrix-sdk-crypto-nodejs/default.nix rename to pkgs/by-name/ma/matrix-sdk-crypto-nodejs/package.nix diff --git a/pkgs/servers/search/meilisearch/Cargo.lock b/pkgs/by-name/me/meilisearch/Cargo.lock similarity index 100% rename from pkgs/servers/search/meilisearch/Cargo.lock rename to pkgs/by-name/me/meilisearch/Cargo.lock diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/by-name/me/meilisearch/package.nix similarity index 100% rename from pkgs/servers/search/meilisearch/default.nix rename to pkgs/by-name/me/meilisearch/package.nix diff --git a/pkgs/games/minecraft/default.nix b/pkgs/by-name/mi/minecraft/package.nix similarity index 100% rename from pkgs/games/minecraft/default.nix rename to pkgs/by-name/mi/minecraft/package.nix diff --git a/pkgs/games/minecraft/update.sh b/pkgs/by-name/mi/minecraft/update.sh similarity index 100% rename from pkgs/games/minecraft/update.sh rename to pkgs/by-name/mi/minecraft/update.sh diff --git a/pkgs/tools/filesystems/mtools/UNUSED-darwin.patch b/pkgs/by-name/mt/mtools/UNUSED-darwin.patch similarity index 100% rename from pkgs/tools/filesystems/mtools/UNUSED-darwin.patch rename to pkgs/by-name/mt/mtools/UNUSED-darwin.patch diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/by-name/mt/mtools/package.nix similarity index 100% rename from pkgs/tools/filesystems/mtools/default.nix rename to pkgs/by-name/mt/mtools/package.nix diff --git a/pkgs/tools/filesystems/mtools/update.sh b/pkgs/by-name/mt/mtools/update.sh similarity index 100% rename from pkgs/tools/filesystems/mtools/update.sh rename to pkgs/by-name/mt/mtools/update.sh diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/by-name/mx/mxnet/package.nix similarity index 100% rename from pkgs/applications/science/math/mxnet/default.nix rename to pkgs/by-name/mx/mxnet/package.nix diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/by-name/na/nano/package.nix similarity index 100% rename from pkgs/applications/editors/nano/default.nix rename to pkgs/by-name/na/nano/package.nix diff --git a/pkgs/applications/editors/nano/test-with-expect.nix b/pkgs/by-name/na/nano/test-with-expect.nix similarity index 100% rename from pkgs/applications/editors/nano/test-with-expect.nix rename to pkgs/by-name/na/nano/test-with-expect.nix diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/by-name/nb/nbstripout/package.nix similarity index 100% rename from pkgs/applications/version-management/nbstripout/default.nix rename to pkgs/by-name/nb/nbstripout/package.nix diff --git a/pkgs/development/libraries/ndi/default.nix b/pkgs/by-name/nd/ndi/package.nix similarity index 100% rename from pkgs/development/libraries/ndi/default.nix rename to pkgs/by-name/nd/ndi/package.nix diff --git a/pkgs/development/libraries/ndi/update.py b/pkgs/by-name/nd/ndi/update.py similarity index 100% rename from pkgs/development/libraries/ndi/update.py rename to pkgs/by-name/nd/ndi/update.py diff --git a/pkgs/development/libraries/ndi/version.json b/pkgs/by-name/nd/ndi/version.json similarity index 100% rename from pkgs/development/libraries/ndi/version.json rename to pkgs/by-name/nd/ndi/version.json diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/by-name/ne/netpbm/package.nix similarity index 100% rename from pkgs/tools/graphics/netpbm/default.nix rename to pkgs/by-name/ne/netpbm/package.nix diff --git a/pkgs/tools/graphics/netpbm/update.sh b/pkgs/by-name/ne/netpbm/update.sh similarity index 100% rename from pkgs/tools/graphics/netpbm/update.sh rename to pkgs/by-name/ne/netpbm/update.sh diff --git a/pkgs/tools/nix/nix-output-monitor/generated-package.nix b/pkgs/by-name/ni/nix-output-monitor/generated-package.nix similarity index 100% rename from pkgs/tools/nix/nix-output-monitor/generated-package.nix rename to pkgs/by-name/ni/nix-output-monitor/generated-package.nix diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/by-name/ni/nix-output-monitor/package.nix similarity index 100% rename from pkgs/tools/nix/nix-output-monitor/default.nix rename to pkgs/by-name/ni/nix-output-monitor/package.nix diff --git a/pkgs/tools/nix/nix-output-monitor/update.sh b/pkgs/by-name/ni/nix-output-monitor/update.sh similarity index 100% rename from pkgs/tools/nix/nix-output-monitor/update.sh rename to pkgs/by-name/ni/nix-output-monitor/update.sh diff --git a/pkgs/servers/nominatim/default.nix b/pkgs/by-name/no/nominatim/package.nix similarity index 100% rename from pkgs/servers/nominatim/default.nix rename to pkgs/by-name/no/nominatim/package.nix diff --git a/pkgs/tools/misc/ntfy/default.nix b/pkgs/by-name/nt/ntfy/package.nix similarity index 100% rename from pkgs/tools/misc/ntfy/default.nix rename to pkgs/by-name/nt/ntfy/package.nix diff --git a/pkgs/tools/misc/ntfy/webpush.nix b/pkgs/by-name/nt/ntfy/webpush.nix similarity index 100% rename from pkgs/tools/misc/ntfy/webpush.nix rename to pkgs/by-name/nt/ntfy/webpush.nix diff --git a/pkgs/tools/networking/onetun/default.nix b/pkgs/by-name/on/onetun/package.nix similarity index 100% rename from pkgs/tools/networking/onetun/default.nix rename to pkgs/by-name/on/onetun/package.nix diff --git a/pkgs/applications/audio/openutau/deps.json b/pkgs/by-name/op/openutau/deps.json similarity index 100% rename from pkgs/applications/audio/openutau/deps.json rename to pkgs/by-name/op/openutau/deps.json diff --git a/pkgs/applications/audio/openutau/default.nix b/pkgs/by-name/op/openutau/package.nix similarity index 100% rename from pkgs/applications/audio/openutau/default.nix rename to pkgs/by-name/op/openutau/package.nix diff --git a/pkgs/applications/audio/openutau/update.sh b/pkgs/by-name/op/openutau/update.sh similarity index 100% rename from pkgs/applications/audio/openutau/update.sh rename to pkgs/by-name/op/openutau/update.sh diff --git a/pkgs/tools/system/osquery/Remove-git-reset.patch b/pkgs/by-name/os/osquery/Remove-git-reset.patch similarity index 100% rename from pkgs/tools/system/osquery/Remove-git-reset.patch rename to pkgs/by-name/os/osquery/Remove-git-reset.patch diff --git a/pkgs/tools/system/osquery/info.json b/pkgs/by-name/os/osquery/info.json similarity index 100% rename from pkgs/tools/system/osquery/info.json rename to pkgs/by-name/os/osquery/info.json diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/by-name/os/osquery/package.nix similarity index 100% rename from pkgs/tools/system/osquery/default.nix rename to pkgs/by-name/os/osquery/package.nix diff --git a/pkgs/tools/system/osquery/toolchain-bin.nix b/pkgs/by-name/os/osquery/toolchain-bin.nix similarity index 100% rename from pkgs/tools/system/osquery/toolchain-bin.nix rename to pkgs/by-name/os/osquery/toolchain-bin.nix diff --git a/pkgs/tools/system/osquery/update.py b/pkgs/by-name/os/osquery/update.py similarity index 100% rename from pkgs/tools/system/osquery/update.py rename to pkgs/by-name/os/osquery/update.py diff --git a/pkgs/development/tools/perseus-cli/default.nix b/pkgs/by-name/pe/perseus-cli/package.nix similarity index 100% rename from pkgs/development/tools/perseus-cli/default.nix rename to pkgs/by-name/pe/perseus-cli/package.nix diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/by-name/po/portaudio/package.nix similarity index 100% rename from pkgs/development/libraries/portaudio/default.nix rename to pkgs/by-name/po/portaudio/package.nix diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/by-name/pr/prisma-engines/package.nix similarity index 100% rename from pkgs/development/tools/database/prisma-engines/default.nix rename to pkgs/by-name/pr/prisma-engines/package.nix diff --git a/pkgs/development/tools/protoc-gen-dart/default.nix b/pkgs/by-name/pr/protoc-gen-dart/package.nix similarity index 100% rename from pkgs/development/tools/protoc-gen-dart/default.nix rename to pkgs/by-name/pr/protoc-gen-dart/package.nix diff --git a/pkgs/development/tools/protoc-gen-dart/pubspec.lock.json b/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json similarity index 100% rename from pkgs/development/tools/protoc-gen-dart/pubspec.lock.json rename to pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json diff --git a/pkgs/development/tools/protoc-gen-dart/update.sh b/pkgs/by-name/pr/protoc-gen-dart/update.sh similarity index 100% rename from pkgs/development/tools/protoc-gen-dart/update.sh rename to pkgs/by-name/pr/protoc-gen-dart/update.sh diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/by-name/py/pymol/package.nix similarity index 100% rename from pkgs/applications/science/chemistry/pymol/default.nix rename to pkgs/by-name/py/pymol/package.nix diff --git a/pkgs/applications/science/chemistry/pymol/script-already-exists.patch b/pkgs/by-name/py/pymol/script-already-exists.patch similarity index 100% rename from pkgs/applications/science/chemistry/pymol/script-already-exists.patch rename to pkgs/by-name/py/pymol/script-already-exists.patch diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/by-name/qt/qtox/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/qtox/default.nix rename to pkgs/by-name/qt/qtox/package.nix diff --git a/pkgs/tools/text/ruplacer/default.nix b/pkgs/by-name/ru/ruplacer/package.nix similarity index 100% rename from pkgs/tools/text/ruplacer/default.nix rename to pkgs/by-name/ru/ruplacer/package.nix diff --git a/pkgs/development/libraries/rure/Cargo.lock b/pkgs/by-name/ru/rure/Cargo.lock similarity index 100% rename from pkgs/development/libraries/rure/Cargo.lock rename to pkgs/by-name/ru/rure/Cargo.lock diff --git a/pkgs/development/libraries/rure/default.nix b/pkgs/by-name/ru/rure/package.nix similarity index 100% rename from pkgs/development/libraries/rure/default.nix rename to pkgs/by-name/ru/rure/package.nix diff --git a/pkgs/development/libraries/rure/pin.json b/pkgs/by-name/ru/rure/pin.json similarity index 100% rename from pkgs/development/libraries/rure/pin.json rename to pkgs/by-name/ru/rure/pin.json diff --git a/pkgs/development/libraries/rure/update.sh b/pkgs/by-name/ru/rure/update.sh similarity index 100% rename from pkgs/development/libraries/rure/update.sh rename to pkgs/by-name/ru/rure/update.sh diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/by-name/sa/sauce-connect/package.nix similarity index 100% rename from pkgs/development/tools/sauce-connect/default.nix rename to pkgs/by-name/sa/sauce-connect/package.nix diff --git a/pkgs/development/tools/sauce-connect/update.sh b/pkgs/by-name/sa/sauce-connect/update.sh similarity index 100% rename from pkgs/development/tools/sauce-connect/update.sh rename to pkgs/by-name/sa/sauce-connect/update.sh diff --git a/pkgs/development/tools/build-managers/scala-cli/default.nix b/pkgs/by-name/sc/scala-cli/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/scala-cli/default.nix rename to pkgs/by-name/sc/scala-cli/package.nix diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/by-name/sc/scala-cli/sources.json similarity index 100% rename from pkgs/development/tools/build-managers/scala-cli/sources.json rename to pkgs/by-name/sc/scala-cli/sources.json diff --git a/pkgs/development/tools/build-managers/scala-cli/update.nix b/pkgs/by-name/sc/scala-cli/update.nix similarity index 100% rename from pkgs/development/tools/build-managers/scala-cli/update.nix rename to pkgs/by-name/sc/scala-cli/update.nix diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/by-name/sh/shadowsocks-rust/package.nix similarity index 100% rename from pkgs/tools/networking/shadowsocks-rust/default.nix rename to pkgs/by-name/sh/shadowsocks-rust/package.nix diff --git a/pkgs/tools/misc/sharedown/default.nix b/pkgs/by-name/sh/sharedown/package.nix similarity index 100% rename from pkgs/tools/misc/sharedown/default.nix rename to pkgs/by-name/sh/sharedown/package.nix diff --git a/pkgs/tools/misc/sharedown/update.sh b/pkgs/by-name/sh/sharedown/update.sh similarity index 100% rename from pkgs/tools/misc/sharedown/update.sh rename to pkgs/by-name/sh/sharedown/update.sh diff --git a/pkgs/tools/misc/sharedown/yarn.lock b/pkgs/by-name/sh/sharedown/yarn.lock similarity index 100% rename from pkgs/tools/misc/sharedown/yarn.lock rename to pkgs/by-name/sh/sharedown/yarn.lock diff --git a/pkgs/games/space-station-14-launcher/deps.json b/pkgs/by-name/sp/space-station-14-launcher/deps.json similarity index 100% rename from pkgs/games/space-station-14-launcher/deps.json rename to pkgs/by-name/sp/space-station-14-launcher/deps.json diff --git a/pkgs/games/space-station-14-launcher/default.nix b/pkgs/by-name/sp/space-station-14-launcher/package.nix similarity index 100% rename from pkgs/games/space-station-14-launcher/default.nix rename to pkgs/by-name/sp/space-station-14-launcher/package.nix diff --git a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix b/pkgs/by-name/sp/space-station-14-launcher/space-station-14-launcher.nix similarity index 100% rename from pkgs/games/space-station-14-launcher/space-station-14-launcher.nix rename to pkgs/by-name/sp/space-station-14-launcher/space-station-14-launcher.nix diff --git a/pkgs/games/space-station-14-launcher/update.sh b/pkgs/by-name/sp/space-station-14-launcher/update.sh similarity index 100% rename from pkgs/games/space-station-14-launcher/update.sh rename to pkgs/by-name/sp/space-station-14-launcher/update.sh diff --git a/pkgs/tools/filesystems/ssdfs-utils/default.nix b/pkgs/by-name/ss/ssdfs-utils/package.nix similarity index 100% rename from pkgs/tools/filesystems/ssdfs-utils/default.nix rename to pkgs/by-name/ss/ssdfs-utils/package.nix diff --git a/pkgs/tools/filesystems/ssdfs-utils/update.sh b/pkgs/by-name/ss/ssdfs-utils/update.sh similarity index 100% rename from pkgs/tools/filesystems/ssdfs-utils/update.sh rename to pkgs/by-name/ss/ssdfs-utils/update.sh diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/by-name/st/standardnotes/package.nix similarity index 100% rename from pkgs/applications/editors/standardnotes/default.nix rename to pkgs/by-name/st/standardnotes/package.nix diff --git a/pkgs/applications/editors/standardnotes/src.json b/pkgs/by-name/st/standardnotes/src.json similarity index 100% rename from pkgs/applications/editors/standardnotes/src.json rename to pkgs/by-name/st/standardnotes/src.json diff --git a/pkgs/applications/editors/standardnotes/update.nix b/pkgs/by-name/st/standardnotes/update.nix similarity index 100% rename from pkgs/applications/editors/standardnotes/update.nix rename to pkgs/by-name/st/standardnotes/update.nix diff --git a/pkgs/servers/gemini/stargazer/default.nix b/pkgs/by-name/st/stargazer/package.nix similarity index 100% rename from pkgs/servers/gemini/stargazer/default.nix rename to pkgs/by-name/st/stargazer/package.nix diff --git a/pkgs/development/tools/tabnine/default.nix b/pkgs/by-name/ta/tabnine/package.nix similarity index 100% rename from pkgs/development/tools/tabnine/default.nix rename to pkgs/by-name/ta/tabnine/package.nix diff --git a/pkgs/development/tools/tabnine/sources.json b/pkgs/by-name/ta/tabnine/sources.json similarity index 100% rename from pkgs/development/tools/tabnine/sources.json rename to pkgs/by-name/ta/tabnine/sources.json diff --git a/pkgs/development/tools/tabnine/update.sh b/pkgs/by-name/ta/tabnine/update.sh similarity index 100% rename from pkgs/development/tools/tabnine/update.sh rename to pkgs/by-name/ta/tabnine/update.sh diff --git a/pkgs/applications/misc/tandoor-recipes/common.nix b/pkgs/by-name/ta/tandoor-recipes/common.nix similarity index 100% rename from pkgs/applications/misc/tandoor-recipes/common.nix rename to pkgs/by-name/ta/tandoor-recipes/common.nix diff --git a/pkgs/applications/misc/tandoor-recipes/frontend.nix b/pkgs/by-name/ta/tandoor-recipes/frontend.nix similarity index 100% rename from pkgs/applications/misc/tandoor-recipes/frontend.nix rename to pkgs/by-name/ta/tandoor-recipes/frontend.nix diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/by-name/ta/tandoor-recipes/package.nix similarity index 100% rename from pkgs/applications/misc/tandoor-recipes/default.nix rename to pkgs/by-name/ta/tandoor-recipes/package.nix diff --git a/pkgs/applications/misc/tandoor-recipes/pytest-xdist.patch b/pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch similarity index 100% rename from pkgs/applications/misc/tandoor-recipes/pytest-xdist.patch rename to pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch diff --git a/pkgs/applications/misc/tandoor-recipes/update.sh b/pkgs/by-name/ta/tandoor-recipes/update.sh similarity index 100% rename from pkgs/applications/misc/tandoor-recipes/update.sh rename to pkgs/by-name/ta/tandoor-recipes/update.sh diff --git a/pkgs/development/compilers/tinygo/0001-GNUmakefile.patch b/pkgs/by-name/ti/tinygo/0001-GNUmakefile.patch similarity index 100% rename from pkgs/development/compilers/tinygo/0001-GNUmakefile.patch rename to pkgs/by-name/ti/tinygo/0001-GNUmakefile.patch diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/by-name/ti/tinygo/package.nix similarity index 100% rename from pkgs/development/compilers/tinygo/default.nix rename to pkgs/by-name/ti/tinygo/package.nix diff --git a/pkgs/applications/audio/touchosc/default.nix b/pkgs/by-name/to/touchosc/package.nix similarity index 100% rename from pkgs/applications/audio/touchosc/default.nix rename to pkgs/by-name/to/touchosc/package.nix diff --git a/pkgs/applications/audio/touchosc/update.sh b/pkgs/by-name/to/touchosc/update.sh similarity index 100% rename from pkgs/applications/audio/touchosc/update.sh rename to pkgs/by-name/to/touchosc/update.sh diff --git a/pkgs/tools/misc/trackma/default.nix b/pkgs/by-name/tr/trackma/package.nix similarity index 100% rename from pkgs/tools/misc/trackma/default.nix rename to pkgs/by-name/tr/trackma/package.nix diff --git a/pkgs/tools/misc/trackma/update.sh b/pkgs/by-name/tr/trackma/update.sh similarity index 100% rename from pkgs/tools/misc/trackma/update.sh rename to pkgs/by-name/tr/trackma/update.sh diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/by-name/tr/treesheets/package.nix similarity index 100% rename from pkgs/applications/office/treesheets/default.nix rename to pkgs/by-name/tr/treesheets/package.nix diff --git a/pkgs/applications/networking/p2p/tremotesf/default.nix b/pkgs/by-name/tr/tremotesf/package.nix similarity index 100% rename from pkgs/applications/networking/p2p/tremotesf/default.nix rename to pkgs/by-name/tr/tremotesf/package.nix diff --git a/pkgs/applications/misc/trenchbroom/default.nix b/pkgs/by-name/tr/trenchbroom/package.nix similarity index 100% rename from pkgs/applications/misc/trenchbroom/default.nix rename to pkgs/by-name/tr/trenchbroom/package.nix diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/by-name/tt/tt-rss/package.nix similarity index 100% rename from pkgs/servers/tt-rss/default.nix rename to pkgs/by-name/tt/tt-rss/package.nix diff --git a/pkgs/servers/search/typesense/default.nix b/pkgs/by-name/ty/typesense/package.nix similarity index 100% rename from pkgs/servers/search/typesense/default.nix rename to pkgs/by-name/ty/typesense/package.nix diff --git a/pkgs/servers/search/typesense/sources.json b/pkgs/by-name/ty/typesense/sources.json similarity index 100% rename from pkgs/servers/search/typesense/sources.json rename to pkgs/by-name/ty/typesense/sources.json diff --git a/pkgs/servers/search/typesense/update.sh b/pkgs/by-name/ty/typesense/update.sh similarity index 100% rename from pkgs/servers/search/typesense/update.sh rename to pkgs/by-name/ty/typesense/update.sh diff --git a/pkgs/applications/radio/uhd/no-adapter-tests.patch b/pkgs/by-name/uh/uhd/no-adapter-tests.patch similarity index 100% rename from pkgs/applications/radio/uhd/no-adapter-tests.patch rename to pkgs/by-name/uh/uhd/no-adapter-tests.patch diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/by-name/uh/uhd/package.nix similarity index 100% rename from pkgs/applications/radio/uhd/default.nix rename to pkgs/by-name/uh/uhd/package.nix diff --git a/pkgs/applications/radio/uhd/update.sh b/pkgs/by-name/uh/uhd/update.sh similarity index 100% rename from pkgs/applications/radio/uhd/update.sh rename to pkgs/by-name/uh/uhd/update.sh diff --git a/pkgs/servers/unstructured-api/default.nix b/pkgs/by-name/un/unstructured-api/package.nix similarity index 100% rename from pkgs/servers/unstructured-api/default.nix rename to pkgs/by-name/un/unstructured-api/package.nix diff --git a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/pkgs/by-name/vm/vmware-horizon-client/package.nix similarity index 100% rename from pkgs/applications/networking/remote/vmware-horizon-client/default.nix rename to pkgs/by-name/vm/vmware-horizon-client/package.nix diff --git a/pkgs/applications/networking/remote/vmware-horizon-client/update.sh b/pkgs/by-name/vm/vmware-horizon-client/update.sh similarity index 100% rename from pkgs/applications/networking/remote/vmware-horizon-client/update.sh rename to pkgs/by-name/vm/vmware-horizon-client/update.sh diff --git a/pkgs/tools/misc/vrc-get/default.nix b/pkgs/by-name/vr/vrc-get/package.nix similarity index 100% rename from pkgs/tools/misc/vrc-get/default.nix rename to pkgs/by-name/vr/vrc-get/package.nix diff --git a/pkgs/tools/graphics/vulkan-cts/default.nix b/pkgs/by-name/vu/vulkan-cts/package.nix similarity index 100% rename from pkgs/tools/graphics/vulkan-cts/default.nix rename to pkgs/by-name/vu/vulkan-cts/package.nix diff --git a/pkgs/tools/graphics/vulkan-cts/sources.nix b/pkgs/by-name/vu/vulkan-cts/sources.nix similarity index 100% rename from pkgs/tools/graphics/vulkan-cts/sources.nix rename to pkgs/by-name/vu/vulkan-cts/sources.nix diff --git a/pkgs/tools/graphics/vulkan-cts/update.sh b/pkgs/by-name/vu/vulkan-cts/update.sh similarity index 100% rename from pkgs/tools/graphics/vulkan-cts/update.sh rename to pkgs/by-name/vu/vulkan-cts/update.sh diff --git a/pkgs/tools/graphics/vulkan-cts/vk-cts-sources.py b/pkgs/by-name/vu/vulkan-cts/vk-cts-sources.py similarity index 100% rename from pkgs/tools/graphics/vulkan-cts/vk-cts-sources.py rename to pkgs/by-name/vu/vulkan-cts/vk-cts-sources.py diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/by-name/vu/vulkan-headers/package.nix similarity index 100% rename from pkgs/development/libraries/vulkan-headers/default.nix rename to pkgs/by-name/vu/vulkan-headers/package.nix diff --git a/pkgs/development/libraries/vulkan-headers/update.sh b/pkgs/by-name/vu/vulkan-headers/update.sh similarity index 100% rename from pkgs/development/libraries/vulkan-headers/update.sh rename to pkgs/by-name/vu/vulkan-headers/update.sh diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/by-name/wi/wiki-js/package.nix similarity index 100% rename from pkgs/servers/web-apps/wiki-js/default.nix rename to pkgs/by-name/wi/wiki-js/package.nix diff --git a/pkgs/servers/web-apps/wiki-js/update.sh b/pkgs/by-name/wi/wiki-js/update.sh similarity index 100% rename from pkgs/servers/web-apps/wiki-js/update.sh rename to pkgs/by-name/wi/wiki-js/update.sh diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/by-name/wi/wireguard-tools/package.nix similarity index 100% rename from pkgs/tools/networking/wireguard-tools/default.nix rename to pkgs/by-name/wi/wireguard-tools/package.nix diff --git a/pkgs/tools/networking/wireguard-tools/update.sh b/pkgs/by-name/wi/wireguard-tools/update.sh similarity index 100% rename from pkgs/tools/networking/wireguard-tools/update.sh rename to pkgs/by-name/wi/wireguard-tools/update.sh diff --git a/pkgs/development/tools/worker-build/default.nix b/pkgs/by-name/wo/worker-build/package.nix similarity index 100% rename from pkgs/development/tools/worker-build/default.nix rename to pkgs/by-name/wo/worker-build/package.nix diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/by-name/xa/xaos/package.nix similarity index 100% rename from pkgs/applications/graphics/xaos/default.nix rename to pkgs/by-name/xa/xaos/package.nix diff --git a/pkgs/tools/networking/xdp-tools/emacs-30.patch b/pkgs/by-name/xd/xdp-tools/emacs-30.patch similarity index 100% rename from pkgs/tools/networking/xdp-tools/emacs-30.patch rename to pkgs/by-name/xd/xdp-tools/emacs-30.patch diff --git a/pkgs/tools/networking/xdp-tools/default.nix b/pkgs/by-name/xd/xdp-tools/package.nix similarity index 100% rename from pkgs/tools/networking/xdp-tools/default.nix rename to pkgs/by-name/xd/xdp-tools/package.nix diff --git a/pkgs/applications/networking/remote/xrdp/dynamic_config.patch b/pkgs/by-name/xr/xrdp/dynamic_config.patch similarity index 100% rename from pkgs/applications/networking/remote/xrdp/dynamic_config.patch rename to pkgs/by-name/xr/xrdp/dynamic_config.patch diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/by-name/xr/xrdp/package.nix similarity index 100% rename from pkgs/applications/networking/remote/xrdp/default.nix rename to pkgs/by-name/xr/xrdp/package.nix diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/by-name/xt/xtreemfs/package.nix similarity index 100% rename from pkgs/tools/filesystems/xtreemfs/default.nix rename to pkgs/by-name/xt/xtreemfs/package.nix diff --git a/pkgs/tools/package-management/yarn-lock-converter/package-lock.json b/pkgs/by-name/ya/yarn-lock-converter/package-lock.json similarity index 100% rename from pkgs/tools/package-management/yarn-lock-converter/package-lock.json rename to pkgs/by-name/ya/yarn-lock-converter/package-lock.json diff --git a/pkgs/tools/package-management/yarn-lock-converter/default.nix b/pkgs/by-name/ya/yarn-lock-converter/package.nix similarity index 100% rename from pkgs/tools/package-management/yarn-lock-converter/default.nix rename to pkgs/by-name/ya/yarn-lock-converter/package.nix diff --git a/pkgs/tools/package-management/yarn-lock-converter/source.json b/pkgs/by-name/ya/yarn-lock-converter/source.json similarity index 100% rename from pkgs/tools/package-management/yarn-lock-converter/source.json rename to pkgs/by-name/ya/yarn-lock-converter/source.json diff --git a/pkgs/tools/package-management/yarn-lock-converter/update.sh b/pkgs/by-name/ya/yarn-lock-converter/update.sh similarity index 100% rename from pkgs/tools/package-management/yarn-lock-converter/update.sh rename to pkgs/by-name/ya/yarn-lock-converter/update.sh diff --git a/pkgs/shells/zsh/default.nix b/pkgs/by-name/zs/zsh/package.nix similarity index 100% rename from pkgs/shells/zsh/default.nix rename to pkgs/by-name/zs/zsh/package.nix diff --git a/pkgs/shells/zsh/tz_completion.patch b/pkgs/by-name/zs/zsh/tz_completion.patch similarity index 100% rename from pkgs/shells/zsh/tz_completion.patch rename to pkgs/by-name/zs/zsh/tz_completion.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5abb40e15acb..e40fe12a25a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -220,8 +220,6 @@ with pkgs; # addDriverRunpath is the preferred package name, as this enables # many more scenarios than just opengl now. - anime-downloader = callPackage ../applications/video/anime-downloader { }; - aocd = with python3Packages; toPythonApplication aocd; archipelago-minecraft = callPackage ../by-name/ar/archipelago/package.nix { extraPackages = [jdk17]; }; @@ -242,8 +240,6 @@ with pkgs; beebeep = libsForQt5.callPackage ../applications/office/beebeep { }; - binserve = callPackage ../servers/binserve { }; - bloodhound-py = with python3Packages; toPythonApplication bloodhound-py; # Zip file format only allows times after year 1980, which makes e.g. Python @@ -326,8 +322,6 @@ with pkgs; dnf4 = python3Packages.callPackage ../development/python-modules/dnf4/wrapper.nix { }; - dynein = callPackage ../development/tools/database/dynein { }; - ebpf-verifier = callPackage ../tools/networking/ebpf-verifier { catch2 = catch2_3; }; @@ -348,10 +342,6 @@ with pkgs; mumps_par = callPackage ../by-name/mu/mumps/package.nix { mpiSupport = true; }; - prisma-engines = callPackage ../development/tools/database/prisma-engines { }; - - protoc-gen-dart = callPackage ../development/tools/protoc-gen-dart { }; - protoc-gen-grpc-web = callPackage ../development/tools/protoc-gen-grpc-web { protobuf = protobuf_21; }; @@ -381,8 +371,6 @@ with pkgs; device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix { }; - didyoumean = callPackage ../tools/misc/didyoumean { }; - diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; dieHook = makeSetupHook { @@ -393,8 +381,6 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - gretl = callPackage ../applications/science/math/gretl { }; - devShellTools = callPackage ../build-support/dev-shell-tools { }; dockerTools = callPackage ../build-support/docker { @@ -435,8 +421,6 @@ with pkgs; inherit (dotnetCorePackages) buildDotnetModule buildDotnetGlobalTool mkNugetSource mkNugetDeps; - fable = callPackage ../development/tools/fable { }; - dotnetenv = callPackage ../build-support/dotnet/dotnetenv { dotnetfx = dotnetfx40; }; @@ -496,8 +480,6 @@ with pkgs; opendrop = python3Packages.callPackage ../tools/networking/opendrop { }; - perseus-cli = callPackage ../development/tools/perseus-cli { }; - pe-bear = libsForQt5.callPackage ../applications/misc/pe-bear { }; magika = with python3Packages; toPythonApplication magika; @@ -939,14 +921,10 @@ with pkgs; stdenv = gccStdenv; }; - honggfuzz = callPackage ../tools/security/honggfuzz { }; - aflplusplus = callPackage ../tools/security/aflplusplus { wine = null; }; libdislocator = callPackage ../tools/security/aflplusplus/libdislocator.nix { }; - afsctool = callPackage ../tools/filesystems/afsctool { }; - aioblescan = with python3Packages; toPythonApplication aioblescan; inherit (recurseIntoAttrs (callPackage ../tools/package-management/akku { })) @@ -962,8 +940,6 @@ with pkgs; auditwheel = with python3Packages; toPythonApplication auditwheel; - awsbck = callPackage ../tools/backup/awsbck { }; - bikeshed = python3Packages.callPackage ../applications/misc/bikeshed { }; davinci-resolve-studio = callPackage ../by-name/da/davinci-resolve/package.nix { studioVariant = true; }; @@ -1006,8 +982,6 @@ with pkgs; python3Packages = python311Packages; }); - gh-cal = callPackage ../tools/misc/gh-cal { }; - gp-saml-gui = python3Packages.callPackage ../tools/networking/gp-saml-gui { }; fwbuilder = libsForQt5.callPackage ../tools/security/fwbuilder { }; @@ -1044,8 +1018,6 @@ with pkgs; systemd = pkgs.systemd; }; - nominatim = callPackage ../servers/nominatim { }; - ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { }; openbugs = pkgsi686Linux.callPackage ../applications/science/machine-learning/openbugs { }; @@ -1055,8 +1027,6 @@ with pkgs; withUsdView = true; }; - osquery = callPackage ../tools/system/osquery { }; - pricehist = python3Packages.callPackage ../tools/misc/pricehist { }; py7zr = with python3Packages; toPythonApplication py7zr; @@ -1079,8 +1049,6 @@ with pkgs; jdk = jdk8; }; - stargazer = callPackage ../servers/gemini/stargazer { }; - supermin = callPackage ../tools/virtualization/supermin { ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; @@ -1108,8 +1076,6 @@ with pkgs; vprof = with python3Packages; toPythonApplication vprof; - vrc-get = callPackage ../tools/misc/vrc-get { }; - winbox = winbox3; winbox3 = callPackage ../tools/admin/winbox { wine = wineWowPackages.stable; @@ -1127,8 +1093,6 @@ with pkgs; stdenv = clangStdenv; }; - yarn-lock-converter = callPackage ../tools/package-management/yarn-lock-converter { }; - breitbandmessung = callPackage ../applications/networking/breitbandmessung { electron = electron_34; }; @@ -1189,16 +1153,10 @@ with pkgs; forgejo-lts = callPackage ../by-name/fo/forgejo/lts.nix { }; - gfold = callPackage ../applications/version-management/gfold { }; - gita = python3Packages.callPackage ../applications/version-management/gita { }; - gitoxide = callPackage ../applications/version-management/gitoxide { }; - github-cli = gh; - git-absorb = callPackage ../applications/version-management/git-absorb { }; - git-annex-metadata-gui = libsForQt5.callPackage ../applications/version-management/git-annex-metadata-gui { inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter; }; @@ -1215,14 +1173,6 @@ with pkgs; git-archive-all = python3.pkgs.callPackage ../applications/version-management/git-archive-all { }; - git-branchless = callPackage ../applications/version-management/git-branchless { }; - - git-cinnabar = callPackage ../applications/version-management/git-cinnabar { }; - - git-cliff = callPackage ../applications/version-management/git-cliff { }; - - git-credential-keepassxc = callPackage ../applications/version-management/git-credential-keepassxc { }; - git-credential-manager = callPackage ../applications/version-management/git-credential-manager { }; git-fame = callPackage ../applications/version-management/git-fame { }; @@ -1249,8 +1199,6 @@ with pkgs; util-linux = if stdenv.hostPlatform.isLinux then util-linuxMinimal else util-linux; }; - git-remote-codecommit = callPackage ../applications/version-management/git-remote-codecommit { }; - gitRepo = git-repo; git-repo-updater = python3Packages.callPackage ../applications/version-management/git-repo-updater { }; @@ -1260,8 +1208,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - git-trim = callPackage ../applications/version-management/git-trim { }; - git-up = callPackage ../applications/version-management/git-up { pythonPackages = python3Packages; }; @@ -1306,8 +1252,6 @@ with pkgs; ### APPLICATIONS/EMULATORS - _86Box = callPackage ../applications/emulators/86box { }; - _86Box-with-roms = _86Box.override { unfreeEnableRoms = true; unfreeEnableDiscord = true; @@ -1634,8 +1578,6 @@ with pkgs; azure-cli-extensions = recurseIntoAttrs azure-cli.extensions; - azure-static-sites-client = callPackage ../development/tools/azure-static-sites-client { }; - binocle = callPackage ../applications/misc/binocle { inherit (darwin.apple_sdk.frameworks) AppKit CoreFoundation CoreGraphics CoreVideo Foundation Metal QuartzCore; }; @@ -1764,8 +1706,6 @@ with pkgs; fluffychat-web = fluffychat.override { targetFlutterPlatform = "web"; }; - genpass = callPackage ../tools/security/genpass { }; - gammaray = qt6Packages.callPackage ../development/tools/gammaray { }; gams = callPackage ../tools/misc/gams (config.gams or {}); @@ -1982,8 +1922,6 @@ with pkgs; brasero = callPackage ../tools/cd-dvd/brasero/wrapper.nix { }; - ssdfs-utils = callPackage ../tools/filesystems/ssdfs-utils { }; - btlejack = python3Packages.callPackage ../applications/radio/btlejack { }; bsh = fetchurl { @@ -2128,8 +2066,6 @@ with pkgs; cot = with python3Packages; toPythonApplication cot; - crosvm = callPackage ../applications/virtualization/crosvm { }; - crossplane = with python3Packages; toPythonApplication crossplane; csv2md = with python3Packages; toPythonApplication csv2md; @@ -2223,8 +2159,6 @@ with pkgs; espanso = espanso-wayland; }; - esphome = callPackage ../tools/misc/esphome { }; - fastly = callPackage ../misc/fastly { # If buildGoModule is overridden, provide a matching version of the go attribute }; @@ -2402,8 +2336,6 @@ with pkgs; kaggle = with python3Packages; toPythonApplication kaggle; - maigret = callPackage ../tools/security/maigret { }; - maliit-framework = libsForQt5.callPackage ../applications/misc/maliit-framework { }; maliit-keyboard = libsForQt5.callPackage ../applications/misc/maliit-keyboard { }; @@ -2455,8 +2387,6 @@ with pkgs; mpd-sima = python3Packages.callPackage ../tools/audio/mpd-sima { }; - nix-output-monitor = callPackage ../tools/nix/nix-output-monitor { }; - nix-template = callPackage ../tools/package-management/nix-template { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -3058,8 +2988,6 @@ with pkgs; kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { }; - lychee = callPackage ../tools/networking/lychee { }; - mozwire = callPackage ../tools/networking/mozwire { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; @@ -3100,8 +3028,6 @@ with pkgs; vorta = qt6Packages.callPackage ../applications/backup/vorta { }; - worker-build = callPackage ../development/tools/worker-build { }; - wrangler_1 = callPackage ../development/tools/wrangler_1 { inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security; }; @@ -3445,8 +3371,6 @@ with pkgs; cudaSupport = true; }; - gpt2tc = callPackage ../tools/text/gpt2tc { }; - gptcommit = callPackage ../development/tools/gptcommit { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; @@ -3506,7 +3430,6 @@ with pkgs; gruut-ipa = with python3.pkgs; toPythonApplication gruut-ipa; - gx = callPackage ../tools/package-management/gx { }; gsmlib = callPackage ../development/libraries/gsmlib { autoreconfHook = buildPackages.autoreconfHook269; }; @@ -3526,8 +3449,6 @@ with pkgs; gvm-tools = with python3.pkgs; toPythonApplication gvm-tools; - gyroflow = callPackage ../applications/video/gyroflow { }; - gzip = callPackage ../tools/compression/gzip { }; plplot = callPackage ../development/libraries/plplot { @@ -3618,8 +3539,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - http-prompt = callPackage ../tools/networking/http-prompt { }; - httpie = with python3Packages; toPythonApplication httpie; hue-plus = libsForQt5.callPackage ../applications/misc/hue-plus { }; @@ -3742,8 +3661,6 @@ with pkgs; json-schema-for-humans = with python3Packages; toPythonApplication json-schema-for-humans; - jsonwatch = callPackage ../tools/misc/jsonwatch { }; - jupyter = callPackage ../applications/editors/jupyter { }; jupyter-all = jupyter.override { @@ -3899,8 +3816,6 @@ with pkgs; matrix-synapse-plugins = recurseIntoAttrs matrix-synapse-unwrapped.plugins; - matrix-appservice-discord = callPackage ../servers/matrix-appservice-discord { }; - maubot = with python3Packages; toPythonApplication maubot; mautrix-signal = recurseIntoAttrs (callPackage ../servers/mautrix-signal { }); @@ -3926,8 +3841,6 @@ with pkgs; hdf5 = hdf5.override { usev110Api = true; }; }; - meilisearch = callPackage ../servers/search/meilisearch { }; - mhonarc = perlPackages.MHonArc; mujmap = callPackage ../applications/networking/mujmap { @@ -4109,8 +4022,6 @@ with pkgs; sasl = gsasl; }; - matrix-sdk-crypto-nodejs = callPackage ../development/libraries/matrix-sdk-crypto-nodejs { }; - man = man-db; mangohud = callPackage ../tools/graphics/mangohud { @@ -4171,8 +4082,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - mtools = callPackage ../tools/filesystems/mtools { }; - mtr = callPackage ../tools/networking/mtr { }; mtr-gui = callPackage ../tools/networking/mtr { withGtk = true; }; @@ -4220,12 +4129,8 @@ with pkgs; nodejs = nodejs_20; }; - netpbm = callPackage ../tools/graphics/netpbm { }; - networkmanager = callPackage ../tools/networking/networkmanager { }; - libnma = callPackage ../tools/networking/networkmanager/libnma { }; - libnma-gtk4 = libnma.override { withGtk4 = true; }; nm-tray = libsForQt5.callPackage ../tools/networking/networkmanager/tray.nix { }; @@ -4311,8 +4216,6 @@ with pkgs; # ntfsprogs are merged into ntfs-3g ntfsprogs = pkgs.ntfs3g; - ntfy = callPackage ../tools/misc/ntfy { }; - ntfy-sh = callPackage ../tools/misc/ntfy-sh { }; nvfancontrol = callPackage ../tools/misc/nvfancontrol { @@ -4327,8 +4230,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - onetun = callPackage ../tools/networking/onetun { }; - ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim { }; ola = callPackage ../applications/misc/ola { @@ -4810,8 +4711,6 @@ with pkgs; ruby-lsp = rubyPackages.ruby-lsp; - ruplacer = callPackage ../tools/text/ruplacer { }; - rust-motd = callPackage ../tools/misc/rust-motd { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -4859,12 +4758,8 @@ with pkgs; seqdiag = with python3Packages; toPythonApplication seqdiag; - shadowsocks-rust = callPackage ../tools/networking/shadowsocks-rust { }; - shellify = haskellPackages.shellify.bin; - sharedown = callPackage ../tools/misc/sharedown { }; - shiv = with python3Packages; toPythonApplication shiv; sigil = qt6.callPackage ../applications/editors/sigil { }; @@ -5002,14 +4897,10 @@ with pkgs; t = callPackage ../tools/misc/t { }; - tabnine = callPackage ../development/tools/tabnine { }; - tab-rs = callPackage ../tools/misc/tab-rs { inherit (darwin.apple_sdk.frameworks) IOKit; }; - tandoor-recipes = callPackage ../applications/misc/tandoor-recipes { }; - tartube = callPackage ../applications/video/tartube { }; tartube-yt-dlp = callPackage ../applications/video/tartube { @@ -5086,8 +4977,6 @@ with pkgs; toybox = darwin.apple_sdk_11_0.callPackage ../tools/misc/toybox { }; - trackma = callPackage ../tools/misc/trackma { }; - trackma-curses = trackma.override { withCurses = true; }; trackma-gtk = trackma.override { withGTK = true; }; @@ -5122,8 +5011,6 @@ with pkgs; translatepy = with python3.pkgs; toPythonApplication translatepy; - trenchbroom = callPackage ../applications/misc/trenchbroom { }; - inherit (callPackage ../applications/office/trilium {}) trilium-desktop trilium-server @@ -5154,8 +5041,6 @@ with pkgs; twurl = callPackage ../tools/misc/twurl { }; - typesense = callPackage ../servers/search/typesense { }; - ubidump = python3Packages.callPackage ../tools/filesystems/ubidump { }; ubpm = libsForQt5.callPackage ../applications/misc/ubpm { }; @@ -5241,8 +5126,6 @@ with pkgs; whatweb = callPackage ../tools/security/whatweb { }; - wireguard-tools = callPackage ../tools/networking/wireguard-tools { }; - wg-netmanager = callPackage ../tools/networking/wg-netmanager { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -5311,8 +5194,6 @@ with pkgs; unrar-wrapper = python3Packages.callPackage ../tools/archivers/unrar-wrapper { }; - xdp-tools = callPackage ../tools/networking/xdp-tools { }; - ugarit = callPackage ../tools/backup/ugarit { inherit (chickenPackages_4) eggDerivation fetchegg; }; @@ -5407,8 +5288,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - xtreemfs = callPackage ../tools/filesystems/xtreemfs { }; - xorriso = libisoburn; xvfb-run = callPackage ../tools/misc/xvfb-run { @@ -5483,8 +5362,6 @@ with pkgs; fishPlugins = recurseIntoAttrs (callPackage ../shells/fish/plugins { }); - zsh = callPackage ../shells/zsh { }; - powerline = with python3Packages; toPythonApplication powerline; ### DEVELOPMENT / COMPILERS @@ -5672,8 +5549,6 @@ with pkgs; flutter326 = flutterPackages.v3_26; flutter324 = flutterPackages.v3_24; - fnm = callPackage ../development/tools/fnm { }; - fpc = callPackage ../development/compilers/fpc { }; gambit = callPackage ../development/compilers/gambit { }; @@ -6541,7 +6416,6 @@ with pkgs; cargo-edit = callPackage ../development/tools/rust/cargo-edit { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-outdated = callPackage ../development/tools/rust/cargo-outdated { }; inherit (callPackages ../development/tools/rust/cargo-pgrx { }) cargo-pgrx_0_12_0_alpha_1 cargo-pgrx_0_12_5 @@ -6558,7 +6432,6 @@ with pkgs; cargo-bazel = callPackage ../development/tools/rust/cargo-bazel { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-cache = callPackage ../development/tools/rust/cargo-cache { }; cargo-crev = callPackage ../development/tools/rust/cargo-crev { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration CoreFoundation; }; @@ -6588,8 +6461,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-zigbuild = callPackage ../development/tools/rust/cargo-zigbuild { }; - opensmalltalk-vm = callPackage ../development/compilers/opensmalltalk-vm { }; rustfmt = rustPackages.rustfmt; @@ -6667,8 +6538,6 @@ with pkgs; tinycc = darwin.apple_sdk_11_0.callPackage ../development/compilers/tinycc { }; - tinygo = callPackage ../development/compilers/tinygo { }; - urweb = callPackage ../development/compilers/urweb { icu = icu67; }; @@ -7370,8 +7239,6 @@ with pkgs; ### DEVELOPMENT / TOOLS / LANGUAGE-SERVERS - ccls = callPackage ../development/tools/language-servers/ccls { }; - fortls = python3.pkgs.callPackage ../development/tools/language-servers/fortls { }; fortran-language-server = python3.pkgs.callPackage ../development/tools/language-servers/fortran-language-server { }; @@ -7916,8 +7783,6 @@ with pkgs; lttng-ust_2_12 = callPackage ../development/tools/misc/lttng-ust/2.12.nix { }; - marksman = callPackage ../development/tools/marksman { }; - massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { }; maven3 = maven; @@ -8110,8 +7975,6 @@ with pkgs; buildDocs = false; }; - sauce-connect = callPackage ../development/tools/sauce-connect { }; - sbomnix = python3.pkgs.callPackage ../tools/security/sbomnix { }; seer = libsForQt5.callPackage ../development/tools/misc/seer { }; @@ -8122,8 +7985,6 @@ with pkgs; sbt-with-scala-native = callPackage ../development/tools/build-managers/sbt/scala-native.nix { }; simpleBuildTool = sbt; - scala-cli = callPackage ../development/tools/build-managers/scala-cli { }; - scss-lint = callPackage ../development/tools/scss-lint { }; shadowenv = callPackage ../tools/misc/shadowenv { @@ -8227,7 +8088,6 @@ with pkgs; tree-sitter-grammars = recurseIntoAttrs tree-sitter.builtGrammars; - uhd = callPackage ../applications/radio/uhd { }; uhdMinimal = uhd.override { enableUtils = false; enablePythonApi = false; @@ -8499,8 +8359,6 @@ with pkgs; certbot-dns-route53 ]); - cgal = callPackage ../development/libraries/CGAL { }; - check = callPackage ../development/libraries/check { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -8540,8 +8398,6 @@ with pkgs; cxxtest = python3Packages.callPackage ../development/libraries/cxxtest { }; - cypress = callPackage ../development/web/cypress { }; - # Make bdb5 the default as it is the last release under the custom # bsd-like license db = db5; @@ -8587,8 +8443,6 @@ with pkgs; vdpauinfo; }; - duckdb = callPackage ../development/libraries/duckdb { }; - eccodes = callPackage ../development/libraries/eccodes { pythonPackages = python3Packages; stdenv = if stdenv.hostPlatform.isDarwin then gccStdenv else stdenv; @@ -8958,8 +8812,6 @@ with pkgs; autoconf = buildPackages.autoconf269; }; - gpac = callPackage ../applications/video/gpac { }; - gpgme = callPackage ../development/libraries/gpgme { }; grantlee = libsForQt5.callPackage ../development/libraries/grantlee { }; @@ -9109,8 +8961,6 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - hpx = callPackage ../development/libraries/hpx { }; - hspell = callPackage ../development/libraries/hspell { }; hspellDicts = callPackage ../development/libraries/hspell/dicts.nix { }; @@ -9193,8 +9043,6 @@ with pkgs; isort = with python3Packages; toPythonApplication isort; - ispc = callPackage ../development/compilers/ispc { }; - isso = callPackage ../servers/isso { nodejs = nodejs_20; }; @@ -9423,8 +9271,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) IOKit Security; }; - libgcrypt = callPackage ../development/libraries/libgcrypt { }; - libgdiplus = callPackage ../development/libraries/libgdiplus { inherit (darwin.apple_sdk.frameworks) Carbon; }; @@ -9587,8 +9433,6 @@ with pkgs; stdenv = gccStdenv; # Required for darwin }) libprom libpromhttp; - libproxy = callPackage ../development/libraries/libproxy { }; - libpulsar = callPackage ../development/libraries/libpulsar { protobuf = protobuf_21; }; @@ -9894,8 +9738,6 @@ with pkgs; stdenv; }; - ndi = callPackage ../development/libraries/ndi { }; - nettle = import ../development/libraries/nettle { inherit callPackage fetchurl; }; newt = callPackage ../development/libraries/newt { python = python3; }; @@ -10131,8 +9973,6 @@ with pkgs; utils = true; }; - portaudio = callPackage ../development/libraries/portaudio { }; - portmidi = callPackage ../development/libraries/portmidi { inherit (darwin.apple_sdk.frameworks) Carbon CoreAudio CoreFoundation CoreMIDI CoreServices; }; @@ -10339,8 +10179,6 @@ with pkgs; rshell = python3.pkgs.callPackage ../development/embedded/rshell { }; - rure = callPackage ../development/libraries/rure { }; - schroedinger = callPackage ../development/libraries/schroedinger { autoreconfHook = buildPackages.autoreconfHook269; }; @@ -10508,8 +10346,6 @@ with pkgs; sqlite-interactive = (sqlite.override { interactive = true; }).bin; - standardnotes = callPackage ../applications/editors/standardnotes { }; - stlink = callPackage ../development/tools/misc/stlink { }; stlink-gui = callPackage ../development/tools/misc/stlink { withGUI = true; }; @@ -10608,9 +10444,6 @@ with pkgs; vulkan-caps-viewer = libsForQt5.callPackage ../tools/graphics/vulkan-caps-viewer { }; - vulkan-cts = callPackage ../tools/graphics/vulkan-cts { }; - - vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; vulkan-tools = callPackage ../tools/graphics/vulkan-tools { inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; @@ -11112,7 +10945,6 @@ with pkgs; dodgy = with python3Packages; toPythonApplication dodgy; - dovecot = callPackage ../servers/mail/dovecot { }; envoy = callPackage ../by-name/en/envoy/package.nix { jdk = openjdk11_headless; }; @@ -11193,22 +11025,10 @@ with pkgs; inspircdMinimal = inspircd.override { extraModules = []; }; - jboss = callPackage ../servers/http/jboss { }; - jetty = jetty_12; jetty_12 = callPackage ../servers/http/jetty/12.x.nix { }; jetty_11 = callPackage ../servers/http/jetty/11.x.nix { }; - jibri = callPackage ../servers/jibri { }; - - jicofo = callPackage ../servers/jicofo { }; - - jitsi-meet = callPackage ../servers/web-apps/jitsi-meet { }; - - jitsi-meet-prosody = callPackage ../misc/jitsi-meet-prosody { }; - - jitsi-videobridge = callPackage ../servers/jitsi-videobridge { }; - kanidm_1_4 = callPackage ../by-name/ka/kanidm/1_4.nix { }; kanidm_1_5 = callPackage ../by-name/ka/kanidm/1_5.nix { }; @@ -11674,14 +11494,10 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - tt-rss = callPackage ../servers/tt-rss { }; - unpackerr = callPackage ../servers/unpackerr { inherit (darwin.apple_sdk.frameworks) Cocoa WebKit; }; - unstructured-api = callPackage ../servers/unstructured-api { }; - virtualenv = with python3Packages; toPythonApplication virtualenv; virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone; @@ -12131,8 +11947,6 @@ with pkgs; qemu_test = lowPrio (qemu.override { hostCpuOnly = true; nixosTestRunner = true; }); - linux-firmware = callPackage ../os-specific/linux/firmware/linux-firmware { }; - raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi { }; raspberrypi-armstubs = callPackage ../os-specific/linux/firmware/raspberrypi/armstubs.nix { }; @@ -12386,8 +12200,6 @@ with pkgs; breath-theme = libsForQt5.callPackage ../data/themes/breath-theme { }; - cacert = callPackage ../data/misc/cacert { }; - cnspec = callPackage ../tools/security/cnspec { buildGoModule = buildGo123Module; }; @@ -12874,8 +12686,6 @@ with pkgs; cdparanoia = cdparanoiaIII; - cdparanoiaIII = callPackage ../applications/audio/cdparanoia { }; - brotab = callPackage ../tools/misc/brotab { python = python3; }; @@ -13122,7 +12932,6 @@ with pkgs; }; evolution-data-server-gtk4 = evolution-data-server.override { withGtk3 = false; withGtk4 = true; }; - evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { }; evolution = callPackage ../applications/networking/mailreaders/evolution/evolution { }; evolutionWithPlugins = callPackage ../applications/networking/mailreaders/evolution/evolution/wrapper.nix { plugins = [ evolution evolution-ews ]; }; @@ -13375,8 +13184,6 @@ with pkgs; inherit (xorg) xlsfonts; - xrdp = callPackage ../applications/networking/remote/xrdp { }; - inherit ({ freerdp = callPackage ../applications/networking/remote/freerdp { @@ -13462,8 +13269,6 @@ with pkgs; molsketch = libsForQt5.callPackage ../applications/editors/molsketch { }; - openutau = callPackage ../applications/audio/openutau { }; - pattypan = callPackage ../applications/misc/pattypan { jdk = jdk.override { enableJavaFX = true; }; }; @@ -13780,8 +13585,6 @@ with pkgs; lua5 = lua5_3; }; - irssi = callPackage ../applications/networking/irc/irssi { }; - ir.lv2 = callPackage ../applications/audio/ir.lv2 { }; jabcode = callPackage ../development/libraries/jabcode { }; @@ -14019,8 +13822,6 @@ with pkgs; ledger-web = callPackage ../applications/office/ledger-web { }; - lightburn = callPackage ../applications/graphics/lightburn { }; - lighthouse-steamvr = callPackage ../tools/misc/lighthouse-steamvr { inherit (darwin.apple_sdk.frameworks) AppKit; }; @@ -14211,8 +14012,6 @@ with pkgs; withConplay = false; }; - nbstripout = callPackage ../applications/version-management/nbstripout { }; - pragha = libsForQt5.callPackage ../applications/audio/pragha { }; rofi-emoji = (callPackage ../applications/misc/rofi-emoji { }).v3; @@ -14410,8 +14209,6 @@ with pkgs; mythtv = libsForQt5.callPackage ../applications/video/mythtv { }; - nano = callPackage ../applications/editors/nano { }; - ncdu = callPackage ../tools/misc/ncdu { }; ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { }; @@ -14498,8 +14295,6 @@ with pkgs; vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix { }; - libopenmpt = callPackage ../development/libraries/audio/libopenmpt { }; - openrazer-daemon = python3Packages.toPythonApplication python3Packages.openrazer-daemon; orpie = callPackage ../applications/misc/orpie { @@ -14690,8 +14485,6 @@ with pkgs; qtemu = libsForQt5.callPackage ../applications/virtualization/qtemu { }; - qtox = callPackage ../applications/networking/instant-messengers/qtox { }; - qtpass = libsForQt5.callPackage ../applications/misc/qtpass { }; quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { }; @@ -15182,8 +14975,6 @@ with pkgs; wlroots = wlroots_0_18; }; - treesheets = callPackage ../applications/office/treesheets { }; - trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { }; tunefish = callPackage ../applications/audio/tunefish { @@ -15374,8 +15165,6 @@ with pkgs; onlyLibVLC = true; }; - vmware-horizon-client = callPackage ../applications/networking/remote/vmware-horizon-client { }; - vorbis-tools = callPackage ../applications/audio/vorbis-tools { autoreconfHook = buildPackages.autoreconfHook269; }; @@ -15526,8 +15315,6 @@ with pkgs; x32edit = callPackage ../applications/audio/midas/x32edit.nix { }; - xaos = callPackage ../applications/graphics/xaos { }; - xbindkeys-config = callPackage ../tools/X11/xbindkeys-config { gtk = gtk2; }; @@ -16172,8 +15959,6 @@ with pkgs; enableServer = true; }; - minecraft = callPackage ../games/minecraft { }; - minecraftServers = import ../games/minecraft-servers { inherit callPackage lib javaPackages; }; minecraft-server = minecraftServers.vanilla; # backwards compatibility @@ -16347,8 +16132,6 @@ with pkgs; solarus-quest-editor = libsForQt5.callPackage ../development/tools/solarus-quest-editor { }; # You still can override by passing more arguments. - space-station-14-launcher = callPackage ../games/space-station-14-launcher { }; - spring = callPackage ../games/spring { asciidoc = asciidoc-full; }; springLobby = callPackage ../games/spring/springlobby.nix { }; @@ -16603,8 +16386,6 @@ with pkgs; pdb2pqr = with python3Packages; toPythonApplication pdb2pqr; - pymol = callPackage ../applications/science/chemistry/pymol { }; - quantum-espresso = callPackage ../applications/science/chemistry/quantum-espresso { hdf5 = hdf5-fortran; }; @@ -17103,8 +16884,6 @@ with pkgs; lisp-compiler = ecl; }; - mxnet = callPackage ../applications/science/math/mxnet { }; - wxmaxima = callPackage ../applications/science/math/wxmaxima { wxGTK = wxGTK32.override { withWebKit = true; @@ -17738,8 +17517,6 @@ with pkgs; tftui = python3Packages.callPackage ../applications/networking/cluster/tftui { }; - touchosc = callPackage ../applications/audio/touchosc { }; - trufflehog = callPackage ../tools/security/trufflehog { buildGoModule = buildGo123Module; }; @@ -17797,8 +17574,6 @@ with pkgs; pythonPackages = python3Packages; }; - wiki-js = callPackage ../servers/web-apps/wiki-js { }; - wiki-tui = callPackage ../misc/wiki-tui { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -17964,8 +17739,6 @@ with pkgs; compressDrvWeb = callPackage ../build-support/compress-drv/web.nix { }; - duti = callPackage ../os-specific/darwin/duti { }; - dnstracer = callPackage ../tools/networking/dnstracer { inherit (darwin) libresolv; }; @@ -18071,8 +17844,6 @@ with pkgs; duden = python3Packages.toPythonApplication python3Packages.duden; - tremotesf = callPackage ../applications/networking/p2p/tremotesf { }; - yazi-unwrapped = callPackage ../by-name/ya/yazi-unwrapped/package.nix { inherit (darwin.apple_sdk.frameworks) Foundation; }; animdl = python3Packages.callPackage ../applications/video/animdl { }; From 2346742068b870e9044eae6ca10fccc5bc2b339a Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 15 Mar 2025 11:56:41 +0100 Subject: [PATCH 54/61] ci/OWNERS: update due to by-name migration --- ci/OWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/OWNERS b/ci/OWNERS index 4c9fe35f738a..30b5c90ba2b4 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -220,7 +220,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza /nixos/tests/chromium.nix @emilylange @networkException # Certificate Authorities -pkgs/data/misc/cacert/ @ajs124 @lukegb @mweinelt +pkgs/by-name/ca/cacert @ajs124 @lukegb @mweinelt pkgs/development/libraries/nss/ @ajs124 @lukegb @mweinelt pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt @@ -275,7 +275,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /nixos/tests/home-assistant.nix @mweinelt /nixos/tests/zigbee2mqtt.nix @mweinelt /pkgs/servers/home-assistant @mweinelt -/pkgs/tools/misc/esphome @mweinelt +/pkgs/by-name/es/esphome @mweinelt # Network Time Daemons /pkgs/by-name/ch/chrony @thoughtpolice From b140839dd25520a907f1b002e1a9c3cdc529dacc Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 25 Mar 2025 19:34:45 +0300 Subject: [PATCH 55/61] nixosTests.misc: don't build docs They're not used, saves a statistically insignificant amount of Hydra time. --- nixos/tests/misc.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index 5734b900f152..55d719aeafbb 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -19,7 +19,6 @@ import ./make-test-python.nix ( } ]; environment.variables.EDITOR = lib.mkOverride 0 "emacs"; - documentation.nixos.enable = lib.mkOverride 0 true; systemd.tmpfiles.rules = [ "d /tmp 1777 root root 10d" ]; systemd.tmpfiles.settings."10-test"."/tmp/somefile".d = { }; virtualisation.fileSystems = { From b629839fff90514c42ef213b86e872cdd3321688 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 25 Mar 2025 19:02:39 +0200 Subject: [PATCH 56/61] Discord updates --- .../instant-messengers/discord/default.nix | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 26e1c0fb4ac7..528c544bc0aa 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -9,54 +9,54 @@ let versions = if stdenv.hostPlatform.isLinux then { - stable = "0.0.88"; - ptb = "0.0.134"; - canary = "0.0.608"; - development = "0.0.71"; + stable = "0.0.89"; + ptb = "0.0.135"; + canary = "0.0.619"; + development = "0.0.73"; } else { - stable = "0.0.341"; - ptb = "0.0.165"; - canary = "0.0.717"; - development = "0.0.82"; + stable = "0.0.342"; + ptb = "0.0.166"; + canary = "0.0.727"; + development = "0.0.84"; }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-lkphzS5Q7UH20rKJ4SfxyyqEGgoLlfO/hcGmoWWLcYY="; + hash = "sha256-74M2SAJLS8u37m2bEo/Yblq822EbWWZfpLf5emvTusE="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-KkyFFxg7yuvaj/V7r0ePB2mNz+GNqeoUVvjb9v2/PQY="; + hash = "sha256-tzStiIAP83+ns5ZJr2DCtgLhoPf49RBnZtx6+unXndk="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-Nh5CZyLo5Pf5PKV8LDeGH7KZuzQtQbdeKuVEJJqfTdA="; + hash = "sha256-2Jm0SjFMNw9Vlda9d2xywZlevxpay8DNx0krBr1sb4A="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-lxtkapeYRtKyp60YJC6lCvK0P8MSOlYRmQLR+hLuwws="; + hash = "sha256-zd8KpyBTdj+7jb1kRY99a48thdCRq3RNSC8oWKAQJXg="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-FXyF7uWwnNXPe5Qn2WZBXCr392RmHZR3Q2aQTojQ29o="; + hash = "sha256-4Z/Up7KRRTaWEMUjVPi/CXbdeoEka72ZG6r3AeVmVjg="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-M7ApSHRMZ8rzTHVZM32REPRTyaxUmbZfr9pj1uDlS9Y="; + hash = "sha256-/VvTAAeSS/hzdaLt9Fjj+g3lqRVwJ08nM6fJdP77L9c="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-k3iviK146CcitDIKm2huUgGkJy/Qki4z5/VW3EPuaxE="; + hash = "sha256-RRQyXgAKTkOweMM6FE9exRXZWiT13dFh8VioGp2z1KQ="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-3fPaqm9Tfr3t/96T9EX1oKCfVOw18DIiLWqBIiuSNIg="; + hash = "sha256-8qgWvcfWTL1FXSy5CeihpMxS3Ysa79ZFAlG1rAcoyUo="; }; }; aarch64-darwin = x86_64-darwin; From 3730c68cd49632a42d1e3fad4d43abfff29f967b Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 24 Mar 2025 23:42:47 +0000 Subject: [PATCH 57/61] python312Packages.pcodec: init at 0.4.2 Pcodec (or Pco) losslessly compresses and decompresses numerical sequences with high compression ratio and moderately fast speed. This adds the Python package. --- .../python-modules/pcodec/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/pcodec/default.nix diff --git a/pkgs/development/python-modules/pcodec/default.nix b/pkgs/development/python-modules/pcodec/default.nix new file mode 100644 index 000000000000..88f6c37cf308 --- /dev/null +++ b/pkgs/development/python-modules/pcodec/default.nix @@ -0,0 +1,57 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + rustPlatform, + pytestCheckHook, + + numpy, +}: + +buildPythonPackage rec { + pname = "pcodec"; + version = "0.4.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pcodec"; + repo = "pcodec"; + tag = "v${version}"; + hash = "sha256-xWGtTtjMz62LnZDpBtp3HWPW9JgDovObUVSxWM3t1Ng="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-91p0eoVRzc9S8pHRhAlRey4k4jW9IMttiH+9Joh91IQ="; + }; + + buildAndTestSubdir = "pco_python"; + + dependencies = [ numpy ]; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "pcodec" ]; + + meta = { + description = "Lossless codec for numerical data"; + homepage = "https://github.com/pcodec/pcodec"; + changelog = "https://github.com/pcodec/pcodec/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + flokli + ]; + badPlatforms = [ + # Illegal instruction: 4 + "x86_64-darwin" + ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9abac7174fad..d42500f8352e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11428,6 +11428,8 @@ self: super: with self; { pcffont = callPackage ../development/python-modules/pcffont { }; + pcodec = callPackage ../development/python-modules/pcodec { }; + pcodedmp = callPackage ../development/python-modules/pcodedmp { }; pcpp = callPackage ../development/python-modules/pcpp { }; From 22e7be86f4b51d19415089b04ded2d68f13598a7 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 25 Mar 2025 17:38:57 +0100 Subject: [PATCH 58/61] fwupd: 2.0.6 -> 2.0.7 Diff: https://github.com/fwupd/fwupd/compare/refs/tags/2.0.6...2.0.7 Changelog: https://github.com/fwupd/fwupd/releases/tag/2.0.7 --- pkgs/by-name/fw/fwupd/package.nix | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix index 7468ee58c715..e94c689b31c4 100644 --- a/pkgs/by-name/fw/fwupd/package.nix +++ b/pkgs/by-name/fw/fwupd/package.nix @@ -84,17 +84,6 @@ let isx86 = stdenv.hostPlatform.isx86; - # Dell isn't supported on Aarch64 - haveDell = isx86; - - # only redfish for x86_64 - haveRedfish = stdenv.hostPlatform.isx86_64; - - # only use msr if x86 (requires cpuid) - haveMSR = isx86; - - # # Currently broken on Aarch64 - # haveFlashrom = isx86; # Experimental haveFlashrom = isx86 && enableFlashrom; @@ -141,7 +130,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "2.0.6"; + version = "2.0.7"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -159,7 +148,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fwupd"; repo = "fwupd"; tag = finalAttrs.version; - hash = "sha256-//y2kkCrj6E3kKxZIEK2bBUiZezB9j4xzR6WrBdcpqQ="; + hash = "sha256-Rus/GaLdoxC1vZskcZeKYE26ys7iBq6szgl2dh1UPsM="; }; patches = [ @@ -262,7 +251,6 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "docs" true) # We are building the official releases. (lib.mesonEnable "supported_build" true) - (lib.mesonEnable "launchd" false) (lib.mesonOption "systemd_root_prefix" "${placeholder "out"}") (lib.mesonOption "installed_test_prefix" "${placeholder "installedTests"}") "--localstatedir=/var" @@ -281,17 +269,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (!enablePassim) [ (lib.mesonEnable "passim" false) ] - ++ lib.optionals (!haveDell) [ - (lib.mesonEnable "plugin_synaptics_mst" false) - ] - ++ lib.optionals (!haveRedfish) [ - (lib.mesonEnable "plugin_redfish" false) - ] ++ lib.optionals (!haveFlashrom) [ (lib.mesonEnable "plugin_flashrom" false) - ] - ++ lib.optionals (!haveMSR) [ - (lib.mesonEnable "plugin_msr" false) ]; # TODO: wrapGAppsHook3 wraps efi capsule even though it is not ELF From 6a2b2d08449ffc44c0e9afcf1a2e8de5a758d878 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Mar 2025 17:24:49 +0000 Subject: [PATCH 59/61] zoraxy: 3.1.8 -> 3.1.9 --- pkgs/by-name/zo/zoraxy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zo/zoraxy/package.nix b/pkgs/by-name/zo/zoraxy/package.nix index 9247c252102f..b93c2a2a7dce 100644 --- a/pkgs/by-name/zo/zoraxy/package.nix +++ b/pkgs/by-name/zo/zoraxy/package.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "zoraxy"; - version = "3.1.8"; + version = "3.1.9"; src = fetchFromGitHub { owner = "tobychui"; repo = "zoraxy"; tag = "v${version}"; - hash = "sha256-0BJuomRz/ZnvHQXPZBBrVv1nk2UFPGGdjsZ/FpUAtwk="; + hash = "sha256-zE8ksuZhoi/wPTpo/jq7c5sx0B6hwBr8djvzo9ea9DI="; }; sourceRoot = "${src.name}/src"; - vendorHash = "sha256-gqDgM+xyvzrpQEQz0fju8GEtQhJOaL6FeuwYxgeSRmo="; + vendorHash = "sha256-XHnDlGIb2K28udWHdkfXt0dPUGmGAjfULB9fykAlsJU="; checkFlags = let From 5e9d3661893cffc972dbfb9839d85c8ce1a0dba9 Mon Sep 17 00:00:00 2001 From: mangoiv Date: Mon, 24 Mar 2025 10:38:03 +0100 Subject: [PATCH 60/61] auto-cpufreq: relax bounds of ps-util for version 2.5.0 --- pkgs/by-name/au/auto-cpufreq/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/au/auto-cpufreq/package.nix b/pkgs/by-name/au/auto-cpufreq/package.nix index be9060cb18cd..595d5e34591d 100644 --- a/pkgs/by-name/au/auto-cpufreq/package.nix +++ b/pkgs/by-name/au/auto-cpufreq/package.nix @@ -2,6 +2,7 @@ lib, python3Packages, fetchFromGitHub, + fetchpatch, replaceVars, gobject-introspection, wrapGAppsHook3, @@ -57,6 +58,13 @@ python3Packages.buildPythonPackage rec { ./prevent-install-and-copy.patch # patch to prevent update ./prevent-update.patch + + # ps-util python package bounds are too strict for version 2.5.0 + (fetchpatch { + name = "auto-cpufreq-2.5.0-ps-util-relax-constraints.patch"; + url = "https://github.com/AdnanHodzic/auto-cpufreq/commit/8f026ac6497050c0e07c55b751c4b80401e932ec.patch"; + sha256 = "sha256-hcEcuy7oW4fZgfOLSap3pnWk7H1Q757tgfl7HIUyWiM="; + }) ]; postPatch = '' From 43b3261432b26159d42fd1b424b255ae7c7d670c Mon Sep 17 00:00:00 2001 From: Alec <87440159+AmazinAxel@users.noreply.github.com> Date: Tue, 25 Mar 2025 10:41:06 -0700 Subject: [PATCH 61/61] plasticity: fix build (#384389) --- pkgs/by-name/pl/plasticity/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix index c98b169d0c13..ddb3c8eb6ad4 100644 --- a/pkgs/by-name/pl/plasticity/package.nix +++ b/pkgs/by-name/pl/plasticity/package.nix @@ -112,6 +112,7 @@ stdenv.mkDerivation rec { rpmextract $src mv $out/usr/* $out rm -r $out/usr + rm -r $out/lib/.build-id runHook postInstall '';